Commit 1fa280a3 authored by Lawrence Mitchell's avatar Lawrence Mitchell Committed by Stefan Monnier
Browse files

* lisp/progmodes/js.el (js-mode): Don't stomp on global settings.

Fixes: debbugs:8933
parent e6597158
2011-06-30 Lawrence Mitchell <wence@gmx.li>
* progmodes/js.el (js-mode): Don't stomp on global settings (bug#8933).
2011-06-30 Alan Mackenzie <acm@muc.de> 2011-06-30 Alan Mackenzie <acm@muc.de>
* progmodes/cc-engine.el (c-guess-continued-construct): Correct * progmodes/cc-engine.el (c-guess-continued-construct):
the handling of template-args-cont, particularly for when font Correct the handling of template-args-cont, particularly for when font
lock is disabled. Name this case as "CASE G". lock is disabled. Name this case as "CASE G".
2011-06-30 Ken Manheimer <ken.manheimer@gmail.com> 2011-06-30 Ken Manheimer <ken.manheimer@gmail.com>
...@@ -36,8 +40,8 @@ ...@@ -36,8 +40,8 @@
* files.el (hack-local-variables-confirm): Use it. * files.el (hack-local-variables-confirm): Use it.
* custom.el (load-theme): New arg NO-CONFIRM. Use * custom.el (load-theme): New arg NO-CONFIRM.
customize-push-and-save (Bug#8720). Use customize-push-and-save (Bug#8720).
(custom-enabled-themes): Doc fix. (custom-enabled-themes): Doc fix.
* cus-theme.el (customize-create-theme) * cus-theme.el (customize-create-theme)
...@@ -121,8 +125,8 @@ ...@@ -121,8 +125,8 @@
2011-06-28 Deniz Dogan <deniz@dogan.se> 2011-06-28 Deniz Dogan <deniz@dogan.se>
* emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table): Unnest * emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table):
`let'. Unnest `let'.
* textmodes/css-mode.el (css-font-lock-keywords): Fix grouped * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped
selectors (Bug#5732). selectors (Bug#5732).
......
...@@ -3306,8 +3306,8 @@ If one hasn't been set, or if it's stale, prompt for a new one." ...@@ -3306,8 +3306,8 @@ If one hasn't been set, or if it's stale, prompt for a new one."
#'js--which-func-joiner) #'js--which-func-joiner)
;; Comments ;; Comments
(setq comment-start "// ") (set (make-local-variable 'comment-start) "// ")
(setq comment-end "") (set (make-local-variable 'comment-end) "")
(set (make-local-variable 'fill-paragraph-function) (set (make-local-variable 'fill-paragraph-function)
'js-c-fill-paragraph) 'js-c-fill-paragraph)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment