GNOME.org
 

[gnome-shell] *.js: Make emacs modelines consistent

commit 75b824d032234fe0eb852892fba14741664aaa4b
Author: Dan Winship <danw gnome org>
Date:   Wed Sep 28 09:16:26 2011 -0400

    *.js: Make emacs modelines consistent
    
    js2-mode is no longer developed and we recommend js-mode these days,
    so switch the modelines to specify that, and make them consistent
    across all files.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=660358

 js/gdm/batch.js                         |    4 ++--
 js/gdm/consoleKit.js                    |    2 +-
 js/gdm/fingerprint.js                   |    2 +-
 js/gdm/loginDialog.js                   |    4 ++--
 js/gdm/powerMenu.js                     |    4 ++--
 js/misc/config.js.in                    |    3 ++-
 js/misc/docInfo.js                      |    2 +-
 js/misc/fileUtils.js                    |    2 ++
 js/misc/format.js                       |    2 +-
 js/misc/gnomeSession.js                 |    2 +-
 js/misc/history.js                      |    2 +-
 js/misc/modemManager.js                 |    2 +-
 js/misc/params.js                       |    2 +-
 js/misc/screenSaver.js                  |    2 +-
 js/misc/util.js                         |    2 +-
 js/perf/core.js                         |    2 +-
 js/ui/altTab.js                         |    2 +-
 js/ui/appDisplay.js                     |    2 +-
 js/ui/appFavorites.js                   |    2 +-
 js/ui/automountManager.js               |    2 +-
 js/ui/autorunManager.js                 |    2 +-
 js/ui/boxpointer.js                     |    2 +-
 js/ui/calendar.js                       |    2 +-
 js/ui/contactDisplay.js                 |    2 +-
 js/ui/ctrlAltTab.js                     |    2 +-
 js/ui/dash.js                           |    2 +-
 js/ui/dateMenu.js                       |    2 +-
 js/ui/dnd.js                            |    2 +-
 js/ui/docDisplay.js                     |    2 +-
 js/ui/endSessionDialog.js               |    4 ++--
 js/ui/environment.js                    |    2 +-
 js/ui/extensionSystem.js                |    2 +-
 js/ui/iconGrid.js                       |    2 +-
 js/ui/keyboard.js                       |    2 +-
 js/ui/layout.js                         |    2 +-
 js/ui/lightbox.js                       |    2 +-
 js/ui/link.js                           |    2 +-
 js/ui/lookingGlass.js                   |    2 +-
 js/ui/magnifier.js                      |    2 +-
 js/ui/magnifierDBus.js                  |    2 +-
 js/ui/main.js                           |    2 +-
 js/ui/messageTray.js                    |    2 +-
 js/ui/modalDialog.js                    |    2 +-
 js/ui/networkAgent.js                   |    4 ++--
 js/ui/notificationDaemon.js             |    2 +-
 js/ui/overview.js                       |    2 +-
 js/ui/panel.js                          |    2 +-
 js/ui/panelMenu.js                      |    2 +-
 js/ui/placeDisplay.js                   |    2 +-
 js/ui/polkitAuthenticationAgent.js      |    4 ++--
 js/ui/popupMenu.js                      |    2 +-
 js/ui/runDialog.js                      |    2 +-
 js/ui/scripting.js                      |    2 +-
 js/ui/search.js                         |    2 +-
 js/ui/searchDisplay.js                  |    2 +-
 js/ui/shellDBus.js                      |    2 +-
 js/ui/shellMountOperation.js            |    2 +-
 js/ui/status/accessibility.js           |    2 +-
 js/ui/status/bluetooth.js               |    2 +-
 js/ui/status/keyboard.js                |    2 +-
 js/ui/status/network.js                 |    2 +-
 js/ui/status/power.js                   |    2 +-
 js/ui/status/volume.js                  |    2 +-
 js/ui/statusIconDispatcher.js           |    2 +-
 js/ui/telepathyClient.js                |    2 +-
 js/ui/tweener.js                        |    2 +-
 js/ui/userMenu.js                       |    2 +-
 js/ui/viewSelector.js                   |    2 +-
 js/ui/windowAttentionHandler.js         |    2 +-
 js/ui/windowManager.js                  |    2 +-
 js/ui/workspace.js                      |    2 +-
 js/ui/workspaceSwitcherPopup.js         |    2 +-
 js/ui/workspaceThumbnail.js             |    2 +-
 js/ui/workspacesView.js                 |    2 +-
 js/ui/xdndHandler.js                    |    2 +-
 tests/interactive/border-radius.js      |    2 +-
 tests/interactive/border-width.js       |    2 +-
 tests/interactive/borders.js            |    2 +-
 tests/interactive/box-layout.js         |    2 +-
 tests/interactive/box-shadows.js        |    2 +-
 tests/interactive/calendar.js           |    2 +-
 tests/interactive/css-fonts.js          |    2 +-
 tests/interactive/entry.js              |    2 +-
 tests/interactive/icons.js              |    2 +-
 tests/interactive/inline-style.js       |    2 +-
 tests/interactive/scroll-view-sizing.js |    2 +-
 tests/interactive/scrolling.js          |    2 +-
 tests/interactive/table.js              |    2 +-
 tests/interactive/transitions.js        |    2 +-
 tests/testcommon/ui.js                  |    2 +-
 tests/unit/format.js                    |    2 +-
 tests/unit/markup.js                    |    2 +-
 tests/unit/url.js                       |    2 +-
 93 files changed, 101 insertions(+), 98 deletions(-)
---
diff --git a/js/gdm/batch.js b/js/gdm/batch.js
index cd310d8..bc9642e 100644
--- a/js/gdm/batch.js
+++ b/js/gdm/batch.js
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2011 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/js/gdm/consoleKit.js b/js/gdm/consoleKit.js
index d5eeb89..99465cb 100644
--- a/js/gdm/consoleKit.js
+++ b/js/gdm/consoleKit.js
@@ -1,4 +1,4 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 
diff --git a/js/gdm/fingerprint.js b/js/gdm/fingerprint.js
index ee08a3a..9892ef8 100644
--- a/js/gdm/fingerprint.js
+++ b/js/gdm/fingerprint.js
@@ -1,4 +1,4 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index bde2e49..4a8a9e6 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2011 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/js/gdm/powerMenu.js b/js/gdm/powerMenu.js
index 10e832e..b590d75 100644
--- a/js/gdm/powerMenu.js
+++ b/js/gdm/powerMenu.js
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2011 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/js/misc/config.js.in b/js/misc/config.js.in
index 85ab7b5..a35fe28 100644
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -1,4 +1,5 @@
-/* mode: js2; indent-tabs-mode: nil; tab-size: 4 */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
 /* The name of this package (not localized) */
 const PACKAGE_NAME = '@PACKAGE_NAME@';
 /* The version of this package */
diff --git a/js/misc/docInfo.js b/js/misc/docInfo.js
index 8ec375a..d4499a0 100644
--- a/js/misc/docInfo.js
+++ b/js/misc/docInfo.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
diff --git a/js/misc/fileUtils.js b/js/misc/fileUtils.js
index ea80dc3..cd7339c 100644
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@@ -1,3 +1,5 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 
diff --git a/js/misc/format.js b/js/misc/format.js
index dcebf7e..54320c0 100644
--- a/js/misc/format.js
+++ b/js/misc/format.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 /*
  * This function is intended to extend the String object and provide
diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js
index b3dc068..a2b61fd 100644
--- a/js/misc/gnomeSession.js
+++ b/js/misc/gnomeSession.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;
diff --git a/js/misc/history.js b/js/misc/history.js
index fa655cf..2c127c3 100644
--- a/js/misc/history.js
+++ b/js/misc/history.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Signals = imports.signals;
diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js
index f330238..6fb2e2c 100644
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@@ -1,4 +1,4 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;
diff --git a/js/misc/params.js b/js/misc/params.js
index 88596ce..2b9dc0c 100644
--- a/js/misc/params.js
+++ b/js/misc/params.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 // parse:
 // @params: caller-provided parameter object, or %null
diff --git a/js/misc/screenSaver.js b/js/misc/screenSaver.js
index f9d6af8..c471856 100644
--- a/js/misc/screenSaver.js
+++ b/js/misc/screenSaver.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;
diff --git a/js/misc/util.js b/js/misc/util.js
index ee3c27f..4d9a7c4 100644
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
diff --git a/js/perf/core.js b/js/perf/core.js
index 4fb4fab..6b3b274 100644
--- a/js/perf/core.js
+++ b/js/perf/core.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;
diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index b8c002b..09ffcbb 100644
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index e348555..ec86c37 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
diff --git a/js/ui/appFavorites.js b/js/ui/appFavorites.js
index bbb8914..5faca55 100644
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Shell = imports.gi.Shell;
 const Lang = imports.lang;
diff --git a/js/ui/automountManager.js b/js/ui/automountManager.js
index edcdd80..9a73da2 100644
--- a/js/ui/automountManager.js
+++ b/js/ui/automountManager.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const DBus = imports.dbus;
diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js
index 5843db4..71e51e6 100644
--- a/js/ui/autorunManager.js
+++ b/js/ui/autorunManager.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const DBus = imports.dbus;
diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
index 989a089..4f6a2fb 100644
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 612c903..cec7b25 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Clutter = imports.gi.Clutter;
diff --git a/js/ui/contactDisplay.js b/js/ui/contactDisplay.js
index 8cc46e0..adeeb0c 100644
--- a/js/ui/contactDisplay.js
+++ b/js/ui/contactDisplay.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Folks = imports.gi.Folks
 const Lang = imports.lang;
diff --git a/js/ui/ctrlAltTab.js b/js/ui/ctrlAltTab.js
index 8662ff8..64b029d 100644
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
diff --git a/js/ui/dash.js b/js/ui/dash.js
index 7f23cc6..91c63e9 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Signals = imports.signals;
diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 7196f0c..224d2bc 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index c8c8d07..3c762f2 100644
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
diff --git a/js/ui/docDisplay.js b/js/ui/docDisplay.js
index 10646fb..9c8fe33 100644
--- a/js/ui/docDisplay.js
+++ b/js/ui/docDisplay.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DocInfo = imports.misc.docInfo;
 const Params = imports.misc.params;
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index c68a867..8ebe913 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2010 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/js/ui/environment.js b/js/ui/environment.js
index d499219..95bdc5f 100644
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 imports.gi.versions.Clutter = '1.0';
 imports.gi.versions.Gio = '2.0';
diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index 446fe72..d1f53ef 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Signals = imports.signals;
diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index c2c3620..765bd2b 100644
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Shell = imports.gi.Shell;
diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index b5e14f0..77ce244 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Caribou = imports.gi.Caribou;
 const Clutter = imports.gi.Clutter;
diff --git a/js/ui/layout.js b/js/ui/layout.js
index 0fe255e..aad4bbb 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
diff --git a/js/ui/lightbox.js b/js/ui/lightbox.js
index 426308d..58bce89 100644
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
diff --git a/js/ui/link.js b/js/ui/link.js
index d535311..4ad9baa 100644
--- a/js/ui/link.js
+++ b/js/ui/link.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Signals = imports.signals;
diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index ca827d8..e3be685 100644
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Cogl = imports.gi.Cogl;
diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index 33d05a8..e932e00 100644
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
diff --git a/js/ui/magnifierDBus.js b/js/ui/magnifierDBus.js
index 76cd629..aefeb49 100644
--- a/js/ui/magnifierDBus.js
+++ b/js/ui/magnifierDBus.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Main = imports.ui.main;
diff --git a/js/ui/main.js b/js/ui/main.js
index 7e2588f..4c97440 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index fa7efc2..a45fae4 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 270423a..faea995 100644
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
diff --git a/js/ui/networkAgent.js b/js/ui/networkAgent.js
index fad9cd1..f5c9524 100644
--- a/js/ui/networkAgent.js
+++ b/js/ui/networkAgent.js
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2011 Giovanni Campagna <scampa giovanni gmail com>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index d3321d7..4ec556a 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;
diff --git a/js/ui/overview.js b/js/ui/overview.js
index 1f6d366..567775c 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
diff --git a/js/ui/panel.js b/js/ui/panel.js
index 2146874..2f78db9 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
diff --git a/js/ui/panelMenu.js b/js/ui/panelMenu.js
index 9dbf594..1f7b87e 100644
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
diff --git a/js/ui/placeDisplay.js b/js/ui/placeDisplay.js
index 28f27f8..4864f2c 100644
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
diff --git a/js/ui/polkitAuthenticationAgent.js b/js/ui/polkitAuthenticationAgent.js
index f5b027b..92117fc 100644
--- a/js/ui/polkitAuthenticationAgent.js
+++ b/js/ui/polkitAuthenticationAgent.js
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2010 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 3ee3c17..d5048a2 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index bd6fc25..c20a3de 100644
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
diff --git a/js/ui/scripting.js b/js/ui/scripting.js
index db7f58d..3b8e445 100644
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Gio = imports.gi.Gio;
diff --git a/js/ui/search.js b/js/ui/search.js
index 055bf0f..20c5f81 100644
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
diff --git a/js/ui/searchDisplay.js b/js/ui/searchDisplay.js
index 42c1a26..3151f09 100644
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index ebf0c76..1fcfb0c 100644
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;
diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index 9ccaaea..b6281f3 100644
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Signals = imports.signals;
diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index 4ded5a3..dd5c85a 100644
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const GConf = imports.gi.GConf;
diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index 77be89d..f2d95f5 100644
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index e344425..231f0c7 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GdkPixbuf = imports.gi.GdkPixbuf;
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 9730afc..4f368e3 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1,4 +1,4 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 const ByteArray = imports.byteArray;
 const DBus = imports.dbus;
 const GLib = imports.gi.GLib;
diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index 72e47a1..aee22e9 100644
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
 const DBus = imports.dbus;
diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index 5dc2507..f2132d8 100644
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;
diff --git a/js/ui/statusIconDispatcher.js b/js/ui/statusIconDispatcher.js
index 8b69e7d..33bd47b 100644
--- a/js/ui/statusIconDispatcher.js
+++ b/js/ui/statusIconDispatcher.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index 7578d5a..e9eb3ad 100644
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Gio = imports.gi.Gio;
diff --git a/js/ui/tweener.js b/js/ui/tweener.js
index 8a633bd..d68d666 100644
--- a/js/ui/tweener.js
+++ b/js/ui/tweener.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index d6e30af..40ca2f3 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const AccountsService = imports.gi.AccountsService;
 const DBus = imports.dbus;
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 939fd4c..4791d0b 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
diff --git a/js/ui/windowAttentionHandler.js b/js/ui/windowAttentionHandler.js
index 0dc35db..b8dd2e3 100644
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 13f6e0a..473e9ba 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 97e784b..cf22acd 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GConf = imports.gi.GConf;
diff --git a/js/ui/workspaceSwitcherPopup.js b/js/ui/workspaceSwitcherPopup.js
index 3bd35ca..a4883d4 100644
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 7a239ef..0369c38 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 8cc1ee6..d994885 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
diff --git a/js/ui/xdndHandler.js b/js/ui/xdndHandler.js
index fe8633a..08f0b47 100644
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
diff --git a/tests/interactive/border-radius.js b/tests/interactive/border-radius.js
index 714dc71..d3ab718 100644
--- a/tests/interactive/border-radius.js
+++ b/tests/interactive/border-radius.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
diff --git a/tests/interactive/border-width.js b/tests/interactive/border-width.js
index 60f7606..988166c 100644
--- a/tests/interactive/border-width.js
+++ b/tests/interactive/border-width.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
diff --git a/tests/interactive/borders.js b/tests/interactive/borders.js
index 8419ffb..d5253d6 100644
--- a/tests/interactive/borders.js
+++ b/tests/interactive/borders.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
diff --git a/tests/interactive/box-layout.js b/tests/interactive/box-layout.js
index 547b128..8d38826 100644
--- a/tests/interactive/box-layout.js
+++ b/tests/interactive/box-layout.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
diff --git a/tests/interactive/box-shadows.js b/tests/interactive/box-shadows.js
index 74759df..a1ae568 100644
--- a/tests/interactive/box-shadows.js
+++ b/tests/interactive/box-shadows.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
diff --git a/tests/interactive/calendar.js b/tests/interactive/calendar.js
index f8f50b9..0f04199 100644
--- a/tests/interactive/calendar.js
+++ b/tests/interactive/calendar.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
diff --git a/tests/interactive/css-fonts.js b/tests/interactive/css-fonts.js
index 2731776..6dcec50 100644
--- a/tests/interactive/css-fonts.js
+++ b/tests/interactive/css-fonts.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
diff --git a/tests/interactive/entry.js b/tests/interactive/entry.js
index 470770b..ed4b5bd 100644
--- a/tests/interactive/entry.js
+++ b/tests/interactive/entry.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
diff --git a/tests/interactive/icons.js b/tests/interactive/icons.js
index 5ccd9ab..25d1dfc 100644
--- a/tests/interactive/icons.js
+++ b/tests/interactive/icons.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
diff --git a/tests/interactive/inline-style.js b/tests/interactive/inline-style.js
index e06082c..c9cf9c7 100644
--- a/tests/interactive/inline-style.js
+++ b/tests/interactive/inline-style.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
diff --git a/tests/interactive/scroll-view-sizing.js b/tests/interactive/scroll-view-sizing.js
index e4dffa2..1f795b7 100644
--- a/tests/interactive/scroll-view-sizing.js
+++ b/tests/interactive/scroll-view-sizing.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
diff --git a/tests/interactive/scrolling.js b/tests/interactive/scrolling.js
index fe28b9e..e03a4ed 100644
--- a/tests/interactive/scrolling.js
+++ b/tests/interactive/scrolling.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
diff --git a/tests/interactive/table.js b/tests/interactive/table.js
index 308ae91..31771db 100644
--- a/tests/interactive/table.js
+++ b/tests/interactive/table.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
diff --git a/tests/interactive/transitions.js b/tests/interactive/transitions.js
index 7c8e0d3..0409245 100644
--- a/tests/interactive/transitions.js
+++ b/tests/interactive/transitions.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
diff --git a/tests/testcommon/ui.js b/tests/testcommon/ui.js
index 82d5861..56a8aec 100644
--- a/tests/testcommon/ui.js
+++ b/tests/testcommon/ui.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
diff --git a/tests/unit/format.js b/tests/unit/format.js
index 80ada20..d1064d0 100644
--- a/tests/unit/format.js
+++ b/tests/unit/format.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 /*
  * Test cases for the Format module
diff --git a/tests/unit/markup.js b/tests/unit/markup.js
index 5a19500..5862582 100644
--- a/tests/unit/markup.js
+++ b/tests/unit/markup.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 // Test cases for MessageTray markup parsing
 
diff --git a/tests/unit/url.js b/tests/unit/url.js
index 9dae556..251725c 100644
--- a/tests/unit/url.js
+++ b/tests/unit/url.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 // Test cases for MessageTray URLification
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]