diff --git a/common/components/commandline-handler.js b/common/components/commandline-handler.js
index 0f4f386e..1190a87b 100644
--- a/common/components/commandline-handler.js
+++ b/common/components/commandline-handler.js
@@ -47,4 +47,4 @@ if (XPCOMUtils.generateNSGetFactory)
 else
     const NSGetModule = XPCOMUtils.generateNSGetModule([CommandLineHandler]);
 
-// vim: set ft=javascript fdm=marker sw=4 ts=4 et:
+// vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/buffer.js b/common/content/buffer.js
index 1301d030..630de47a 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1035,12 +1035,12 @@ const Buffer = Module("buffer", {
             return null;
         },
 
-        destroy: function() {
+        destroy: function () {
             if (this.docShell)
                 this.docShell.destroy();
         },
 
-        onStateChange: function(progress, request, flag, status) {
+        onStateChange: function (progress, request, flag, status) {
             // once it's done loading...
             if ((flag & Ci.nsIWebProgressListener.STATE_STOP) && status == 0) {
                 try {
@@ -1050,7 +1050,8 @@ const Buffer = Module("buffer", {
                     }
                     try {
                         this.callback(this.file);
-                    } finally {
+                    }
+                    finally {
                         this.file.remove(false);
                     }
                 }
@@ -1352,7 +1353,8 @@ const Buffer = Module("buffer", {
                             function (tmpFile) {
                                 try {
                                     file.write(tmpFile.read(), ">>");
-                                } catch (e) {
+                                }
+                                catch (e) {
                                     dactyl.echoerr(file.path.quote() + ": E212: Can't open file for writing");
                                 }
                             });
diff --git a/common/content/editor.js b/common/content/editor.js
index 83986854..f8229cf3 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -362,7 +362,8 @@ const Editor = Module("editor", {
 
                 try {
                     this.editFileExternally(tmpfile.path);
-                } finally {
+                }
+                finally {
                     timer.cancel();
                 }
 
diff --git a/common/content/finder.js b/common/content/finder.js
index 3284f2fc..9981f1e1 100644
--- a/common/content/finder.js
+++ b/common/content/finder.js
@@ -632,10 +632,11 @@ const RangeFind = Class("RangeFind", {
         get selection() {
             try {
                 return this.selectionController.getSelection(Ci.nsISelectionController.SELECTION_NORMAL)
-            } catch (e) {
+            }
+            catch (e) {
                 return null;
-            }}
-
+            }
+        }
     }),
 	contains: function (range, r)
 		range.compareBoundaryPoints(range.START_TO_END, r) >= 0 &&
diff --git a/common/content/javascript.js b/common/content/javascript.js
index 3698e4ce..5bf6c230 100644
--- a/common/content/javascript.js
+++ b/common/content/javascript.js
@@ -668,4 +668,6 @@ const JavaScript = Module("javascript", {
                 getter: function () services.get("debugger").isOn
             });
     }
-})
+});
+
+// vim: set fdm=marker sw=4 ts=4 et: