diff options
| author | Chong Yidong | 2010-01-11 11:18:06 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-01-11 11:18:06 -0500 |
| commit | 92b1c41682b7bc139fddb19acc7824ecf779fea5 (patch) | |
| tree | 7bc78bf99b740971df44b625494beaddcd3b3d7b | |
| parent | 4454adabedc7c66987d169835991e8233ee16af7 (diff) | |
| download | emacs-92b1c41682b7bc139fddb19acc7824ecf779fea5.tar.gz emacs-92b1c41682b7bc139fddb19acc7824ecf779fea5.zip | |
* progmodes/js.el: Autoload javascript-mode alias.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/js.el | 1 |
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 @@ | |||
| 1 | 2010-01-11 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * progmodes/js.el: Autoload javascript-mode alias. | ||
| 4 | |||
| 1 | 2010-01-11 Juanma Barranquero <lekktu@gmail.com> | 5 | 2010-01-11 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * ffap.el (ffap-shell-prompt-regexp, ffap-all-subdirs, ffap-url-p) | 7 | * 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: | |||
| 3320 | (let (font-lock-keywords) ; leaves syntactic keywords intact | 3320 | (let (font-lock-keywords) ; leaves syntactic keywords intact |
| 3321 | (font-lock-fontify-buffer))) | 3321 | (font-lock-fontify-buffer))) |
| 3322 | 3322 | ||
| 3323 | ;;;###autoload | ||
| 3323 | (defalias 'javascript-mode 'js-mode) | 3324 | (defalias 'javascript-mode 'js-mode) |
| 3324 | 3325 | ||
| 3325 | (eval-after-load 'folding | 3326 | (eval-after-load 'folding |