aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorJoakim Verona2013-01-19 00:03:30 +0100
committerJoakim Verona2013-01-19 00:03:30 +0100
commit19ea867b2ed4dca4e460d1f347a4ff39d31705f1 (patch)
treefbc1bfd2714bd7fff8d3cb5d0d2295f6f8902c9d /lisp/progmodes
parent9206508b76f73ceeb87c72496d1c40cec83dac21 (diff)
parentb117094709e34befa5a9486584f870d3e84d8f38 (diff)
downloademacs-19ea867b2ed4dca4e460d1f347a4ff39d31705f1.tar.gz
emacs-19ea867b2ed4dca4e460d1f347a4ff39d31705f1.zip
auto upstream
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/js.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 96e6039a8c2..5f76cb4bbc5 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3405,8 +3405,7 @@ If one hasn't been set, or if it's stale, prompt for a new one."
3405 ;; calls to syntax-propertize wherever it's really needed. 3405 ;; calls to syntax-propertize wherever it's really needed.
3406 (syntax-propertize (point-max))) 3406 (syntax-propertize (point-max)))
3407 3407
3408;;;###autoload 3408;;;###autoload (defalias 'javascript-mode 'js-mode)
3409(defalias 'javascript-mode 'js-mode)
3410 3409
3411(eval-after-load 'folding 3410(eval-after-load 'folding
3412 '(when (fboundp 'folding-add-to-marks-list) 3411 '(when (fboundp 'folding-add-to-marks-list)