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

Fixes: debbugs:8933

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c82e4325ffee39c70958514e581f8da2ed2f1173..7613375bf5723302600e01bdec5540f8ee32eea0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
+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>
 
-       * progmodes/cc-engine.el (c-guess-continued-construct): Correct
-       the handling of template-args-cont, particularly for when font
+       * progmodes/cc-engine.el (c-guess-continued-construct):
+       Correct the handling of template-args-cont, particularly for when font
        lock is disabled.  Name this case as "CASE G".
 
 2011-06-30  Ken Manheimer  <ken.manheimer@gmail.com>
@@ -36,8 +40,8 @@
 
        * files.el (hack-local-variables-confirm): Use it.
 
-       * custom.el (load-theme): New arg NO-CONFIRM.  Use
-       customize-push-and-save (Bug#8720).
+       * custom.el (load-theme): New arg NO-CONFIRM.
+       Use customize-push-and-save (Bug#8720).
        (custom-enabled-themes): Doc fix.
 
        * cus-theme.el (customize-create-theme)
@@ -121,8 +125,8 @@
 
 2011-06-28  Deniz Dogan  <deniz@dogan.se>
 
-       * emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table): Unnest
-       `let'.
+       * emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table):
+       Unnest `let'.
 
        * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped
        selectors (Bug#5732).

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index a0437ccf9aee201a6a8a3c2065edaaef59260f7c..1bdcb4cfa891a18267d82bee3760bbc4e30da820 100644 (file)
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3306,8 +3306,8 @@ If one hasn't been set, or if it's stale, prompt for a new one."
        #'js--which-func-joiner)
 
   ;; Comments
-  (setq comment-start "// ")
-  (setq comment-end "")
+  (set (make-local-variable 'comment-start) "// ")
+  (set (make-local-variable 'comment-end) "")
   (set (make-local-variable 'fill-paragraph-function)
        'js-c-fill-paragraph)