[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99791: Make paragraph vars local for js-mode (Bug#6071).

[Chong Yidong]

------------------------------------------------------------
revno: 99791
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-05-02 11:15:29 -0400
message:
  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).
modified:
  lisp/ChangeLog
  lisp/progmodes/js.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-01 18:50:20 +0000
+++ b/lisp/ChangeLog    2010-05-02 15:15:29 +0000
@@ -1,3 +1,8 @@
+2010-05-02  Chong Yidong  <address@hidden>
+
+       * progmodes/js.el (js-mode): Make paragraph variables local before
+       calling c-setup-paragraph-variables (Bug#6071).
+
 2010-05-01  Eli Zaretskii  <address@hidden>
 
        * composite.el (compose-region, reference-point-alist): Fix typos

=== modified file 'lisp/progmodes/js.el'
--- a/lisp/progmodes/js.el      2010-03-28 20:41:37 +0000
+++ b/lisp/progmodes/js.el      2010-05-02 15:15:29 +0000
@@ -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)