summaryrefslogtreecommitdiff
path: root/lisp/newcomment.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2006-08-16 05:05:56 +0000
committerRichard M. Stallman <rms@gnu.org>2006-08-16 05:05:56 +0000
commitb605a60ad353518cc072bc0f4cad78dfed6364a2 (patch)
treed48c46070b5b0ae8529bd6de5a24530a1971ce77 /lisp/newcomment.el
parent19f0515adac3bc3b0ffa371fb92350bdb0b5fd15 (diff)
downloademacs-b605a60ad353518cc072bc0f4cad78dfed6364a2.tar.gz
(comment-indent): Fully update INDENT
before checking to see if it will change the text.
Diffstat (limited to 'lisp/newcomment.el')
-rw-r--r--lisp/newcomment.el11
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 5dfa1eb8959..358c834de73 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -599,11 +599,16 @@ If CONTINUE is non-nil, use the `comment-continue' markers if any."
(if (and other (<= other max) (> other min))
;; There is a comment and it's in the range: bingo.
(setq indent other))))))))
+ ;; Update INDENT to leave at least one space
+ ;; after other nonwhite text on the line.
+ (save-excursion
+ (skip-chars-backward " \t")
+ (unless (bolp)
+ (setq indent (max indent (1+ (current-column))))))
+ ;; If that's different from comment's current position, change it.
(unless (= (current-column) indent)
- ;; If that's different from current, change it.
(delete-region (point) (progn (skip-chars-backward " \t") (point)))
- (indent-to (if (bolp) indent
- (max indent (1+ (current-column)))))))
+ (indent-to indent)))
(goto-char cpos)
(set-marker cpos nil))))