Merge branch 'master' of github.com:arduino/Arduino

facchinm · facchinm · commit 662d66594d5a · 2018-03-02T12:05:33.000+01:00
diff --git a/app/src/processing/app/syntax/PdeKeywords.java b/app/src/processing/app/syntax/PdeKeywords.java
@@ -115,7 +115,7 @@ private void parseKeywordsTxt(File input) throws Exception {
           continue;
         }
 
-        String pieces[] = line.split("\\s+", 4);
+        String pieces[] = line.split("\t");
 
         String keyword = pieces[0].trim();
         if (keyword.startsWith("\\#")) {
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
@@ -5,7 +5,6 @@ ARDUINO 1.8.6
 * Added scroller in programmers menu.
 * Added "accelerator" in scrollable menu, press "a" key while scrolling
 * Keep "Board Manager" menu item always as first in the menu
-* keyword.txt now allows any whitespace. Thanks @bhagman
 
 [wifi101-firmware]
 * SECURITY FIX: Released fix for WPA2 KRACK vulnerability (latest WINC1500 firmware 19.5.2).

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ private void parseKeywordsTxt(File input) throws Exception {`
`115`	`115`	`continue;`
`116`	`116`	`}`
`117`	`117`
`118`		`- String pieces[] = line.split("\\s+", 4);`
	`118`	`+ String pieces[] = line.split("\t");`
`119`	`119`
`120`	`120`	`String keyword = pieces[0].trim();`
`121`	`121`	`if (keyword.startsWith("\\#")) {`