Mercurial > emacs
changeset 104274:a1d28970bfc5
* files.el (auto-mode-alist): Use js-mode for .js files.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 14 Aug 2009 23:40:20 +0000 |
| parents | 5565b37343b9 |
| children | 3bf815184a6c |
| files | lisp/ChangeLog lisp/files.el |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Aug 14 23:03:50 2009 +0000 +++ b/lisp/ChangeLog Fri Aug 14 23:40:20 2009 +0000 @@ -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.
--- a/lisp/files.el Fri Aug 14 23:03:50 2009 +0000 +++ b/lisp/files.el Fri Aug 14 23:40:20 2009 +0000 @@ -2221,7 +2221,7 @@ ("\\.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.