[Emacs-diffs] emacs/lisp ChangeLog files.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/08/14 23:40:23

Modified files:
        lisp           : ChangeLog files.el 

Log message:
        * files.el (auto-mode-alist): Use js-mode for .js files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15936&r2=1.15937
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1065&r2=1.1066

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15936
retrieving revision 1.15937
diff -u -b -r1.15936 -r1.15937
--- ChangeLog   14 Aug 2009 23:02:38 -0000      1.15936
+++ ChangeLog   14 Aug 2009 23:40:20 -0000      1.15937
@@ -1,5 +1,7 @@
 2009-08-14  Chong Yidong  <address@hidden>
 
+       * 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.

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1065
retrieving revision 1.1066
diff -u -b -r1.1065 -r1.1066
--- files.el    12 Aug 2009 20:30:31 -0000      1.1065
+++ files.el    14 Aug 2009 23:40:23 -0000      1.1066
@@ -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.