Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Fixes: debbugs:8933
This commit is contained in:
Lawrence Mitchell 2011-06-30 12:22:33 -04:00 committed by Stefan Monnier
parent e6597158c0
commit 1fa280a3de
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/ChangeLog
View file

@ -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).

4
lisp/progmodes/js.el
View file

@ -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)