Make the invocation of combine-change-calls in comment-region valid

This fixes bug #44581.  The problem was that whitespace outside of the (BEG
END) region was being deleted, and this made the invocation of
combine-change-calls with (BEG END) invalid.

* lisp/newcomment.el (comment-region-default): Amend the second argument to
combine-change-calls.
This commit is contained in:
Alan Mackenzie 2020-11-15 13:23:15 +00:00
parent 66bcec8838
commit 4ec740866a

View file

@ -1292,7 +1292,15 @@ changed with `comment-style'."
(defun comment-region-default (beg end &optional arg)
(if comment-combine-change-calls
(combine-change-calls beg end (comment-region-default-1 beg end arg))
(combine-change-calls beg
;; A new line might get inserted and whitespace deleted
;; after END for line comments. Ensure the next argument is
;; after any and all changes.
(save-excursion
(goto-char end)
(forward-line)
(point))
(comment-region-default-1 beg end arg))
(comment-region-default-1 beg end arg)))
;;;###autoload