From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 4 Jul 2003 22:45:26 +0000 (+0000)
Subject: (uncomment-region): Remove padding coming from
X-Git-Tag: ttn-vms-21-2-B4~9502
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=79ca2b1157c027db726cfdd376538009adbbeb4f;p=emacs.git

(uncomment-region): Remove padding coming from
comment-start rather than just from comment-padding.
---

diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index c73f4ef644f..96c8f9cc41b 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -669,6 +669,7 @@ comment markers."
     (let* ((numarg (prefix-numeric-value arg))
            (ccs comment-continue)
            (srei (comment-padright ccs 're))
+           (csre (comment-padright comment-start 're))
            (sre (and srei (concat "^\\s-*?\\(" srei "\\)")))
            spt)
       (while (and (< (point) end)
@@ -697,8 +698,11 @@ comment markers."
 			   (> (- (point) (point-min) (length comment-start)) 7))
 		       (> (count-lines (point-min) (point-max)) 2))
 	      (setq box t))
-	    (when (looking-at (regexp-quote comment-padding))
-	      (goto-char (match-end 0)))
+	    ;; Skip the padding.  Padding can come from comment-padding and/or
+	    ;; from comment-start, so we first check comment-start.
+	    (if (or (save-excursion (goto-char (point-min)) (looking-at csre))
+		    (looking-at (regexp-quote comment-padding)))
+		(goto-char (match-end 0)))
 	    (when (and sre (looking-at (concat "\\s-*\n\\s-*" srei)))
 	      (goto-char (match-end 0)))
 	    (if (null arg) (delete-region (point-min) (point))