changeset 108363:642b031fce0f

Make paragraph vars local for js-mode (Bug#6071). * progmodes/js.el (js-mode): Make paragraph variables local before calling c-setup-paragraph-variables (Bug#6071).
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 02 May 2010 11:15:29 -0400
parents e9328d74ba23
children 243bfb706af1
files lisp/ChangeLog lisp/progmodes/js.el
diffstat 2 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat May 01 21:50:20 2010 +0300
+++ b/lisp/ChangeLog	Sun May 02 11:15:29 2010 -0400
@@ -1,3 +1,8 @@
+2010-05-02  Chong Yidong  <cyd@stupidchicken.com>
+
+	* progmodes/js.el (js-mode): Make paragraph variables local before
+	calling c-setup-paragraph-variables (Bug#6071).
+
 2010-05-01  Eli Zaretskii  <eliz@gnu.org>
 
 	* composite.el (compose-region, reference-point-alist): Fix typos
--- a/lisp/progmodes/js.el	Sat May 01 21:50:20 2010 +0300
+++ b/lisp/progmodes/js.el	Sun May 02 11:15:29 2010 -0400
@@ -3327,6 +3327,13 @@
         comment-start-skip "\\(//+\\|/\\*+\\)\\s *")
 
   (let ((c-buffer-is-cc-mode t))
+    ;; FIXME: These are normally set by `c-basic-common-init'.  Should
+    ;; we call it instead?  (Bug#6071)
+    (make-local-variable 'paragraph-start)
+    (make-local-variable 'paragraph-separate)
+    (make-local-variable 'paragraph-ignore-fill-prefix)
+    (make-local-variable 'adaptive-fill-mode)
+    (make-local-variable 'adaptive-fill-regexp)
     (c-setup-paragraph-variables))
 
   (set (make-local-variable 'syntax-begin-function)