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

Martin Rudalics <rudalics at gmx.at>

Browse Source 
(comment-region-internal): Fix newline insertion in `block' case.
This commit is contained in:
Glenn Morris 2007-11-28 05:20:33 +00:00
parent d0aa78bc6e
commit 53dd1d5387
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2007-11-28 Martin Rudalics <rudalics@gmx.at>
* newcomment.el (comment-region-internal): Fix newline insertion
in `block' case.
2007-11-28 Stefan Monnier <monnier@iro.umontreal.ca>
* pcvs-parse.el (cvs-parse-table): Adjust regexp for resurrections.

6
lisp/newcomment.el
View File

@ -969,9 +969,11 @@ INDENT indicates to put CS and CCS at the current indentation of
the region rather than at left margin."
;;(assert (< beg end))
(let ((no-empty (not (or (eq comment-empty-lines t)
(and comment-empty-lines (zerop (length ce)))))))
(and comment-empty-lines (zerop (length ce))))))
ce-sanitized)
;; Sanitize CE and CCE.
(if (and (stringp ce) (string= "" ce)) (setq ce nil))
(setq ce-sanitized ce)
(if (and (stringp cce) (string= "" cce)) (setq cce nil))
;; If CE is empty, multiline cannot be used.
(unless ce (setq ccs nil cce nil))
@ -988,7 +990,7 @@ the region rather than at left margin."
(goto-char end)
;; If the end is not at the end of a line and the comment-end
;; is implicit (i.e. a newline), explicitly insert a newline.
(unless (or ce (eolp)) (insert "\n") (indent-according-to-mode))
(unless (or ce-sanitized (eolp)) (insert "\n") (indent-according-to-mode))
(comment-with-narrowing beg end
(let ((min-indent (point-max))
(max-indent 0))