diff options
author | Leo Liu <sdl.web@gmail.com> | 2012-04-25 22:47:33 +0800 |
---|---|---|
committer | Leo Liu <sdl.web@gmail.com> | 2012-04-25 22:47:33 +0800 |
commit | 5055880d396c98f9bacfd4d19aa4a9ae85d3a87c (patch) | |
tree | a9dce8342bda9a8e0d972640af68d1cff7a701d0 | |
parent | db9b177bcc4aabebebf604de7a0efc5b32981c5b (diff) | |
download | emacs-5055880d396c98f9bacfd4d19aa4a9ae85d3a87c.tar.gz emacs-5055880d396c98f9bacfd4d19aa4a9ae85d3a87c.tar.bz2 emacs-5055880d396c98f9bacfd4d19aa4a9ae85d3a87c.zip |
* lisp/files.el (auto-mode-alist): Use javascript-mode instead.
-rw-r--r-- | lisp/ChangeLog | 4 | ||||
-rw-r--r-- | 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 <sdl.web@gmail.com> + + * files.el (auto-mode-alist): Use javascript-mode instead. + 2012-04-25 Alex Harsanyi <AlexHarsanyi@gmail.com> 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. |