From: Glenn Morris <rgm@gnu.org>
Date: Wed, 28 Nov 2007 05:20:33 +0000 (+0000)
Subject: Martin Rudalics  <rudalics at gmx.at>
X-Git-Tag: emacs-pretest-23.0.90~9288
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=53dd1d5387118581452983cefee8ed801c4e8079;p=emacs.git

Martin Rudalics  <rudalics at gmx.at>

(comment-region-internal): Fix newline insertion in `block' case.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec3b5cdd686..de6d85c7f8b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 2de4fa025fd..1841b51e305 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -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))