2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa0aa42ad3c..0ede6a0dad3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-16  Tom Tromey  <tom@tromey.com>
+
+        * files.el (auto-mode-alist): Use javascript-mode for .jsm
+        (bug #18719).
+
 2014-10-16  Eli Zaretskii  <eliz@gnu.org>
 
         * international/characters.el (bracket-type): Force pre-loading of
diff --git a/lisp/files.el b/lisp/files.el
index 84391c17164..be1b6c29d10 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2413,7 +2413,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode)
      ("\\.dbk\\'" . xml-mode)
      ("\\.dtd\\'" . sgml-mode)
      ("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
-     ("\\.js\\'" . javascript-mode)
+     ("\\.jsm?\\'" . javascript-mode)
      ("\\.json\\'" . javascript-mode)
      ("\\.[ds]?vh?\\'" . verilog-mode)
      ("\\.by\\'" . bovine-grammar-mode)