diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1e28cf025d9..05b94dff1af 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2009-08-14 Chong Yidong <cyd@stupidchicken.com> + * files.el (auto-mode-alist): Use js-mode for .js files. + * progmodes/js2-mode.el: File removed. * Makefile.in (ELCFILES): Add js.el, and remove js2-mode.el. diff --git a/lisp/files.el b/lisp/files.el index 5f256a016ca..9ca5761bae6 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2221,7 +2221,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode) ("\\.x[ms]l\\'" . xml-mode) ("\\.dtd\\'" . sgml-mode) ("\\.ds\\(ss\\)?l\\'" . dsssl-mode) - ("\\.js\\'" . java-mode) ; javascript-mode would be better + ("\\.js\\'" . js-mode) ; javascript-mode would be better ("\\.[ds]?v\\'" . verilog-mode) ;; .emacs or .gnus or .viper following a directory delimiter in ;; Unix, MSDOG or VMS syntax. |