* master: (414 commits)
Don't export sketch if the underlying core does not support it. Fixes#3171
RSyntaxTextArea: using a modified version, tracked at https://github.com/arduino/RSyntaxTextArea. Fixes#3099
Updated keywords.txt
New editor on MacOSX: since CMD+J is known as "jump to selection" and the editor has no such feature, CMD+J is disabled on mac. See #3098
Old Preferences class remains for backwards compatibility as a delegate for PreferencesData
New Preferences window: renders fine on every OS and it's easier to adapt using NetBeans as visual editor. Fixes#3140
Remove spawn from exec command
Removed redundant call to File.deleteIfExists()
Removed buggy redundant check in FileUtils.deleteIfExists()
Restored current line/current selected lines display on lower left of the IDE. Fixes#3134
Updated cursor.ino
New editor on MacOSX: restored CMD+E for finding selected text
New editor on MacOSX: CMD+UP/DOWN moves cursor to start or end of sketch. See #3098
New editor on MacOSX: CMD+BACKSPACE deletes current line until cursor position, ALT+BACKSPACE deletes previous word. See #3098
ArduinoIDE is in the default package. Removed
Fixes #2969:
Fix Uncategorized warning message
New editor: ALT+ BACKSPACE deletes next word (OSX only). See #3098
New editor: ALT+ UP/DOWN move current line only if "editor.advanced" (hidden pref) is true. Fixes#3101
New editor: mark occurrences enable when "editor.advanced" (hidden pref) is true. Fixes#3102
...
Conflicts:
.gitignore
build/build.xml
hardware/esp8266com/esp8266/libraries/ESP8266WiFi/keywords.txt
hardware/esp8266com/esp8266/libraries/ESP8266WiFi/library.properties
hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h
libraries/WiFi/README.adoc
libraries/WiFi/src/WiFi.cpp
libraries/WiFi/src/WiFiClient.cpp
libraries/WiFi/src/WiFiClient.h
libraries/WiFi/src/WiFiServer.cpp
libraries/WiFi/src/WiFiUdp.cpp
[e86e3c2] attempt to fix deploy
[62a68fe] attempt to fix deploy
[e372d18] appveyor: specify artifact path
[89c30ab] fix ant call
[11ccf6d] fix esptool name on windows
[6ab7c73] add deploy to appveyor
[690fdb4] fix windows toolchain sha sum
[1106884] Unquote JAVA_HOME
[bb3dcd9] Shallow clone in appveyor
[b1ec7db] travis: deploy tags only, appveyor: set java_home
[9d790f2] disable repeated failure notifications in travis, attempt to fix appveyor.yml
[2d0a499] Run appveyor build in CMD
[11dd735] adding travis deploy, attempt to fix paths on appveyor
[208c1f1] fix toolchain sha sum path for linux
[1a92165] Temporary path hack for appveyor
[9caea0b] fix build.xml
[68eaaf1] linux components and sha sums
[485e457] fix ant bin path
[c6b6573] silent build
[5edd927] fix ant path, add travis
[36d1f17] appveyor: clone using https
[b758833] Add appveyor build script
This file is not installed by the ant build, but is intended for use by
Linux distributions.
The actual file was taken from the Debian package, version
1:1.0.5+dfsg2-1 and is licensed under the GPL-2+. The GenericName,
Comment and Categories fields were changed to better reflect the Arduino
program and Desktop specification.
This file is not installed by the ant build, but is intended for use by
Linux distributions.
The actual file was taken from the Debian package, version
1:1.0.5+dfsg2-1 and is licensed under the GPL-2+. It was only modified
to remove a FIXME comment that is no longer relevant.