From 5055880d396c98f9bacfd4d19aa4a9ae85d3a87c Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Wed, 25 Apr 2012 22:47:33 +0800 Subject: [PATCH] * lisp/files.el (auto-mode-alist): Use javascript-mode instead. --- lisp/ChangeLog | 4 ++++ lisp/files.el | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 533c1775ea9..cad73c2e2e7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-04-25 Leo Liu + + * files.el (auto-mode-alist): Use javascript-mode instead. + 2012-04-25 Alex Harsanyi Sync with soap-client repository. Support SOAP simpleType. (Bug#10331) diff --git a/lisp/files.el b/lisp/files.el index d757e1a277c..703b443765d 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2340,8 +2340,8 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode) ("\\.dbk\\'" . xml-mode) ("\\.dtd\\'" . sgml-mode) ("\\.ds\\(ss\\)?l\\'" . dsssl-mode) - ("\\.js\\'" . js-mode) ; javascript-mode would be better - ("\\.json\\'" . js-mode) + ("\\.js\\'" . javascript-mode) + ("\\.json\\'" . javascript-mode) ("\\.[ds]?vh?\\'" . verilog-mode) ;; .emacs or .gnus or .viper following a directory delimiter in ;; Unix, MSDOG or VMS syntax. -- 2.39.2