diff options
| author | Tom Tromey <tom@tromey.com> | 2017-01-17 21:50:14 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-02-04 13:00:59 -0700 |
| commit | 394fc3fd030b8fa2f9b97c2ef3fa3b16e6f29474 (patch) | |
| tree | cdf13a4354bfe73828dfacbd5828d8f5cc411674 | |
| parent | caf31fb5f53aef47bea1cd2e741f5d9c254c1a81 (diff) | |
| download | emacs-394fc3fd030b8fa2f9b97c2ef3fa3b16e6f29474.tar.gz | |
Set comment-multi-line in js-mode
Bug#6806:
* lisp/progmodes/js.el (js-mode): Set comment-multi-line to t.
* test/lisp/progmodes/js-tests.el (js-mode-auto-fill): New test.
| -rw-r--r-- | lisp/progmodes/js.el | 1 | ||||
| -rw-r--r-- | test/lisp/progmodes/js-tests.el | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 74dd4add9e2..e42e01481b6 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3849,6 +3849,7 @@ If one hasn't been set, or if it's stale, prompt for a new one." comment-start-skip "\\(//+\\|/\\*+\\)\\s *") (setq-local comment-line-break-function #'c-indent-new-comment-line) (setq-local c-block-comment-start-regexp "/\\*") + (setq-local comment-multi-line t) (setq-local electric-indent-chars (append "{}():;," electric-indent-chars)) ;FIXME: js2-mode adds "[]*". diff --git a/test/lisp/progmodes/js-tests.el b/test/lisp/progmodes/js-tests.el index 84749efa45b..7cb737c30e2 100644 --- a/test/lisp/progmodes/js-tests.el +++ b/test/lisp/progmodes/js-tests.el @@ -85,6 +85,20 @@ if (!/[ (:,='\"]/.test(value)) { (should (= (current-column) x)) (forward-line)))) +(ert-deftest js-mode-auto-fill () + (with-temp-buffer + (js-mode) + (setq fill-column 70) + (insert "/* ") + (dotimes (_ 16) + (insert "test ")) + (do-auto-fill) + ;; The bug is that, after auto-fill, the second line starts with + ;; "/*", whereas it should start with " * ". + (goto-char (point-min)) + (forward-line) + (should (looking-at " \\* test")))) + (provide 'js-tests) ;;; js-tests.el ends here |