From e72f5197ea3bf314b491f52b02e54b7e4f590d70 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 16 Oct 2014 13:56:43 -0600 Subject: [PATCH] * files.el (auto-mode-alist): Use javascript-mode for .jsm (bug #18719). --- lisp/ChangeLog | 5 +++++ lisp/files.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * files.el (auto-mode-alist): Use javascript-mode for .jsm + (bug #18719). + 2014-10-16 Eli Zaretskii * 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) -- 2.39.5