summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/js.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4767738210b..87b70778312 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-11 Chong Yidong <cyd@stupidchicken.com>
+
+ * progmodes/js.el: Autoload javascript-mode alias.
+
2010-01-11 Juanma Barranquero <lekktu@gmail.com>
* ffap.el (ffap-shell-prompt-regexp, ffap-all-subdirs, ffap-url-p)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index cba315ac2d4..f26433cc66e 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3320,6 +3320,7 @@ Key bindings:
(let (font-lock-keywords) ; leaves syntactic keywords intact
(font-lock-fontify-buffer)))
+;;;###autoload
(defalias 'javascript-mode 'js-mode)
(eval-after-load 'folding