diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-05-02 11:15:29 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-05-02 11:15:29 -0400 |
| commit | f5d6ff44b773b013502ad4de8715654c6c757407 (patch) | |
| tree | d119ac97fc9b573980efc6fe1788d76071de6e7d | |
| parent | aa4d4e4a1de042777eb665db4548916e4dbb2c8e (diff) | |
| download | emacs-f5d6ff44b773b013502ad4de8715654c6c757407.tar.gz | |
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).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/js.el | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 610b3f5046b..a7df32a3463 100644 --- 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 6bd22e4e6fa..6bd8fbc2442 100644 --- 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) |