mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

Handle single-line comments correctly (Bug#26049)

Browse Source 
* lisp/newcomment.el (comment-region-internal): Previously, the
comment text had to contain at least one line break character for the
ending extra line to be added.  Make the behavior more consistent by
looking for end of line instead.
(comment-region-internal): Remove trailing white space from the
comment's initial line.

Copyright-paperwork-exempt: yes
This commit is contained in:
Antonin Houska 2017-11-06 09:59:07 +01:00 committed by Noam Postavsky
parent 795bb233a5
commit db949166ec
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/newcomment.el
View File

@ -69,6 +69,9 @@
;;; Code:
(eval-when-compile
(require 'subr-x))
;;;###autoload
(defalias 'indent-for-comment 'comment-indent)
;;;###autoload
@ -1141,6 +1144,9 @@ the region rather than at left margin."
;; make the leading and trailing lines if requested
(when lines
;; Trim trailing whitespace from cs if there's some.
(setq cs (string-trim-right cs))
(let ((csce
(comment-make-extra-lines
cs ce ccs cce min-indent max-indent block)))
@ -1211,7 +1217,7 @@ changed with `comment-style'."
(progn (goto-char end) (end-of-line) (skip-syntax-backward " ")
(<= (point) end))
(or block (not (string= "" comment-end)))
(or block (progn (goto-char beg) (search-forward "\n" end t)))))
(or block (progn (goto-char beg) (re-search-forward "$" end t)))))
;; don't add end-markers just because the user asked for `block'
(unless (or lines (string= "" comment-end)) (setq block nil))