[Emacs-diffs] trunk r118134: * files.el (auto-mode-alist): Use javascript-mode for .jsm

[Tom Tromey]

------------------------------------------------------------
revno: 118134
revision-id: address@hidden
parent: address@hidden
committer: Tom Tromey <address@hidden>
branch nick: trunk
timestamp: Thu 2014-10-16 13:56:43 -0600
message:
        * files.el (auto-mode-alist): Use javascript-mode for .jsm
        (bug #18719).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/files.el                  files.el-20091113204419-o5vbwnq5f7feedwu-265

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-16 16:42:59 +0000
+++ b/lisp/ChangeLog    2014-10-16 19:56:43 +0000
@@ -1,3 +1,8 @@
+2014-10-16  Tom Tromey  <address@hidden>
+
+       * files.el (auto-mode-alist): Use javascript-mode for .jsm
+       (bug #18719).
+
 2014-10-16  Eli Zaretskii  <address@hidden>
 
        * international/characters.el (bracket-type): Force pre-loading of

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2014-10-04 07:27:10 +0000
+++ b/lisp/files.el     2014-10-16 19:56:43 +0000
@@ -2413,7 +2413,7 @@
      ("\\.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)