From b605a60ad353518cc072bc0f4cad78dfed6364a2 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 16 Aug 2006 05:05:56 +0000 Subject: [PATCH] (comment-indent): Fully update INDENT before checking to see if it will change the text. --- lisp/newcomment.el | 11 ++++++++--- 1 file 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)))) -- 2.39.5