[Emacs-diffs] /srv/bzr/emacs/trunk r104814: * lisp/progmodes/js.el (js-mode): Don't stomp on global settings.

[Stefan Monnier]

------------------------------------------------------------
revno: 104814
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8933
author: Lawrence Mitchell <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2011-06-30 12:22:33 -0400
message:
  * lisp/progmodes/js.el (js-mode): Don't stomp on global settings.
modified:
  lisp/ChangeLog
  lisp/progmodes/js.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-30 15:12:59 +0000
+++ b/lisp/ChangeLog    2011-06-30 16:22:33 +0000
@@ -1,7 +1,11 @@
+2011-06-30  Lawrence Mitchell  <address@hidden>
+
+       * progmodes/js.el (js-mode): Don't stomp on global settings (bug#8933).
+
 2011-06-30  Alan Mackenzie  <address@hidden>
 
-       * 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  <address@hidden>
@@ -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  <address@hidden>
 
-       * 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).

=== modified file 'lisp/progmodes/js.el'
--- a/lisp/progmodes/js.el      2011-05-10 13:57:12 +0000
+++ b/lisp/progmodes/js.el      2011-06-30 16:22:33 +0000
@@ -3306,8 +3306,8 @@
        #'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)