Merge branch 'master' of https://github.com/MoonchildProductions/UXP into caret_color

17 files changed, 0 insertions, 17 deletions

diff --git a/devtools/client/sourceeditor/test/browser_codemirror.js b/devtools/client/sourceeditor/test/browser_codemirror.js
index 381a6530f9..70eec52ec5 100644
--- a/devtools/client/sourceeditor/test/browser_codemirror.js
+++ b/devtools/client/sourceeditor/test/browser_codemirror.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_css_autocompletion.js b/devtools/client/sourceeditor/test/browser_css_autocompletion.js
index e988031130..57a5ae345b 100644
--- a/devtools/client/sourceeditor/test/browser_css_autocompletion.js
+++ b/devtools/client/sourceeditor/test/browser_css_autocompletion.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_css_getInfo.js b/devtools/client/sourceeditor/test/browser_css_getInfo.js
index 21b0b92b96..ffbc863222 100644
--- a/devtools/client/sourceeditor/test/browser_css_getInfo.js
+++ b/devtools/client/sourceeditor/test/browser_css_getInfo.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_css_statemachine.js b/devtools/client/sourceeditor/test/browser_css_statemachine.js
index f69d602786..140cd127fe 100644
--- a/devtools/client/sourceeditor/test/browser_css_statemachine.js
+++ b/devtools/client/sourceeditor/test/browser_css_statemachine.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_editor_autocomplete_basic.js b/devtools/client/sourceeditor/test/browser_editor_autocomplete_basic.js
index 03cdc2a4a6..cfd71c3910 100644
--- a/devtools/client/sourceeditor/test/browser_editor_autocomplete_basic.js
+++ b/devtools/client/sourceeditor/test/browser_editor_autocomplete_basic.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_editor_autocomplete_events.js b/devtools/client/sourceeditor/test/browser_editor_autocomplete_events.js
index e2f976afe5..e260472054 100644
--- a/devtools/client/sourceeditor/test/browser_editor_autocomplete_events.js
+++ b/devtools/client/sourceeditor/test/browser_editor_autocomplete_events.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_editor_autocomplete_js.js b/devtools/client/sourceeditor/test/browser_editor_autocomplete_js.js
index 31fa6878f0..4c34fc55c6 100644
--- a/devtools/client/sourceeditor/test/browser_editor_autocomplete_js.js
+++ b/devtools/client/sourceeditor/test/browser_editor_autocomplete_js.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_editor_basic.js b/devtools/client/sourceeditor/test/browser_editor_basic.js
index 503b06afed..10093400e5 100644
--- a/devtools/client/sourceeditor/test/browser_editor_basic.js
+++ b/devtools/client/sourceeditor/test/browser_editor_basic.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_editor_cursor.js b/devtools/client/sourceeditor/test/browser_editor_cursor.js
index 236b3d152e..b911e54284 100644
--- a/devtools/client/sourceeditor/test/browser_editor_cursor.js
+++ b/devtools/client/sourceeditor/test/browser_editor_cursor.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_editor_find_again.js b/devtools/client/sourceeditor/test/browser_editor_find_again.js
index f3d80095bb..e478b22080 100644
--- a/devtools/client/sourceeditor/test/browser_editor_find_again.js
+++ b/devtools/client/sourceeditor/test/browser_editor_find_again.js
@@ -1,5 +1,4 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2; fill-column: 80 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_editor_goto_line.js b/devtools/client/sourceeditor/test/browser_editor_goto_line.js
index eedde41ddd..635c3a66af 100644
--- a/devtools/client/sourceeditor/test/browser_editor_goto_line.js
+++ b/devtools/client/sourceeditor/test/browser_editor_goto_line.js
@@ -1,5 +1,4 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2; fill-column: 80 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_editor_history.js b/devtools/client/sourceeditor/test/browser_editor_history.js
index 9098afdf49..63d0758aeb 100644
--- a/devtools/client/sourceeditor/test/browser_editor_history.js
+++ b/devtools/client/sourceeditor/test/browser_editor_history.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_editor_markers.js b/devtools/client/sourceeditor/test/browser_editor_markers.js
index 64a78d510c..1a042614b1 100644
--- a/devtools/client/sourceeditor/test/browser_editor_markers.js
+++ b/devtools/client/sourceeditor/test/browser_editor_markers.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_editor_movelines.js b/devtools/client/sourceeditor/test/browser_editor_movelines.js
index 60a7f6865a..92227a1a22 100644
--- a/devtools/client/sourceeditor/test/browser_editor_movelines.js
+++ b/devtools/client/sourceeditor/test/browser_editor_movelines.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/browser_editor_prefs.js b/devtools/client/sourceeditor/test/browser_editor_prefs.js
index 0c8c7782fc..c952d72e76 100644
--- a/devtools/client/sourceeditor/test/browser_editor_prefs.js
+++ b/devtools/client/sourceeditor/test/browser_editor_prefs.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/sourceeditor/test/head.js b/devtools/client/sourceeditor/test/head.js
index 4f8473eaf8..dfaebe944a 100644
--- a/devtools/client/sourceeditor/test/head.js
+++ b/devtools/client/sourceeditor/test/head.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 /* import-globals-from ../../framework/test/shared-head.js */
diff --git a/devtools/client/sourceeditor/test/helper_codemirror_runner.js b/devtools/client/sourceeditor/test/helper_codemirror_runner.js
index b9e458472b..29a1e044f5 100644
--- a/devtools/client/sourceeditor/test/helper_codemirror_runner.js
+++ b/devtools/client/sourceeditor/test/helper_codemirror_runner.js
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 /* globals codemirrorSetStatus */