diff options
| author | Lawrence Mitchell <wence@gmx.li> | 2012-02-17 10:44:32 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-02-17 10:44:32 -0500 |
| commit | eb864a71bd9a3ecf02dc994dcefd561aca0fdd4d (patch) | |
| tree | 99cc5a3229c8e6379e03ed5f703a50b0fbfae64d /lisp/newcomment.el | |
| parent | 7b926f3f3db5d9a22260209547fb3e60df919ecf (diff) | |
| download | emacs-eb864a71bd9a3ecf02dc994dcefd561aca0fdd4d.tar.gz | |
* lisp/newcomment.el (uncomment-region-default): Don't leave extra space
when an arg is provided.
Fixes: debbugs:8150
Diffstat (limited to 'lisp/newcomment.el')
| -rw-r--r-- | lisp/newcomment.el | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/newcomment.el b/lisp/newcomment.el index e2be4829a9b..16282af6409 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el @@ -872,14 +872,15 @@ comment markers." (when (and sre (looking-at (concat "\\s-*\n\\s-*" srei))) (goto-char (match-end 0))) (if (null arg) (delete-region (point-min) (point)) - (skip-syntax-backward " ") - (delete-char (- numarg)) - (unless (or (bobp) - (save-excursion (goto-char (point-min)) - (looking-at comment-start-skip))) - ;; If there's something left but it doesn't look like - ;; a comment-start any more, just remove it. - (delete-region (point-min) (point)))) + (let* ((opoint (point-marker)) + (nchar (skip-syntax-backward " "))) + (delete-char (- numarg)) + (unless (and (not (bobp)) + (save-excursion (goto-char (point-min)) + (looking-at comment-start-skip))) + ;; If there's something left but it doesn't look like + ;; a comment-start any more, just remove it. + (delete-region (point-min) opoint)))) ;; Remove the end-comment (and leading padding and such). (goto-char (point-max)) (comment-enter-backward) |