From: npostavs@users.sourceforge.net
To: Tom Tromey <tom@tromey.com>
Cc: 6806@debbugs.gnu.org
Subject: bug#6806: another reason for the patch
Date: Sat, 11 Feb 2017 23:21:02 -0500 [thread overview]
Message-ID: <87o9y8kpjl.fsf@users.sourceforge.net> (raw)
In-Reply-To: <87a89s69hz.fsf@tromey.com> (Tom Tromey's message of "Sat, 11 Feb 2017 08:19:04 -0700")
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
Tom Tromey <tom@tromey.com> writes:
> Noam> So the opened comment was correctly terminated, and a new one started,
> Noam> just as documented. Perhaps you don't like that `comment-multi-line' is
> Noam> nil by default, but it doesn't look like a bug to me.
>
> I'm not sure what to do about this now.
> Should I revert the patch?
>
> If it were solely up to me I would leave the patch in, since I think
> non-nil comment-multi-line is more normal in JS code. And, if the patch
> is reverted then I think comment-multi-line needs a :safe setting so it
> can by set in .dir-locals.el.
I don't really have much of an opinion regarding the best value for
comment-multi-line. But we should test that filling works correctly
regardless of its value, and we should add a :safe setting anyway. Here
is a patch:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 2160 bytes --]
From cbf522f2446035bcd34a676c2ef3e641b4f20f90 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
Date: Sat, 11 Feb 2017 23:15:13 -0500
Subject: [PATCH] Test comment-multi-line = nil auto fill case too
* test/lisp/progmodes/js-tests.el (js-mode-auto-fill): Test with
`comment-multi-line' both nil and non-nil.
* lisp/newcomment.el (comment-multi-line): Mark safe if it's a
boolean.
---
| 1 +
test/lisp/progmodes/js-tests.el | 22 ++++++++++++----------
2 files changed, 13 insertions(+), 10 deletions(-)
--git a/lisp/newcomment.el b/lisp/newcomment.el
index 1af89293b6..4b261c34c6 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -309,6 +309,7 @@ comment-multi-line
It also affects \\[indent-new-comment-line]. However, if you want this
behavior for explicit filling, you might as well use \\[newline-and-indent]."
:type 'boolean
+ :safe #'booleanp
:group 'comment)
(defcustom comment-empty-lines nil
diff --git a/test/lisp/progmodes/js-tests.el b/test/lisp/progmodes/js-tests.el
index d61f084e0d..99f5898525 100644
--- a/test/lisp/progmodes/js-tests.el
+++ b/test/lisp/progmodes/js-tests.el
@@ -89,16 +89,18 @@
(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"))))
+ (let ((fill-column 10)
+ (comment-multi-line t))
+ (insert "/* test test")
+ (do-auto-fill)
+ ;; Filling should continue the multi line comment.
+ (should (equal (buffer-string) "/* test\n * test"))
+ (erase-buffer)
+ (insert "/* test test")
+ (setq comment-multi-line nil)
+ (do-auto-fill)
+ ;; Filling should start a new comment on the next line.
+ (should (equal (buffer-string) "/* test */\n/* test")))))
(ert-deftest js-mode-regexp-syntax-bug-25529 ()
(dolist (regexp-contents '("[^[]"
--
2.11.1
[-- Attachment #3: Type: text/plain, Size: 500 bytes --]
Perhaps we should also revert the js-mode comment-multi-line setting,
not sure.
--- i/lisp/progmodes/js.el
+++ w/lisp/progmodes/js.el
@@ -3856,7 +3856,6 @@ js-mode
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 "[]*".
next prev parent reply other threads:[~2017-02-12 4:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-05 18:36 bug#6806: Set comment-multi-line in js-mode Nathan Weizenbaum
2010-08-08 20:40 ` Chong Yidong
2010-08-09 0:14 ` Nathan Weizenbaum
2010-08-09 11:33 ` Stefan Monnier
2010-08-09 17:56 ` Nathan Weizenbaum
2010-09-11 13:54 ` Stefan Monnier
2010-09-28 18:11 ` Chong Yidong
2017-01-18 4:56 ` bug#6806: another reason for the patch Tom Tromey
2017-02-04 21:21 ` npostavs
2017-02-04 21:34 ` npostavs
2017-02-11 15:19 ` Tom Tromey
2017-02-12 4:21 ` npostavs [this message]
2017-02-12 6:16 ` Tom Tromey
2017-02-15 4:50 ` npostavs
2017-02-04 20:29 ` bug#6806: checked in " Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o9y8kpjl.fsf@users.sourceforge.net \
--to=npostavs@users.sourceforge.net \
--cc=6806@debbugs.gnu.org \
--cc=tom@tromey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.