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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 610b3f5..a7df32a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 6bd22e4..6bd8fbc 100644 (file)
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3327,6 +3327,13 @@ Key bindings:
         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)