diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
| commit | 4dd1f56f29fc598a8339a345c2f8945250600602 (patch) | |
| tree | af341efedffe027e533b1bcc0dbf270532e48285 /lisp/newcomment.el | |
| parent | 4c49ec7f865bdad1629d2f125f71f4e506b258f2 (diff) | |
| parent | 810fa21d26453f898de9747ece7205dfe6de9d08 (diff) | |
| download | emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.gz | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/newcomment.el')
| -rw-r--r-- | lisp/newcomment.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/newcomment.el b/lisp/newcomment.el index 57a52effd14..52e7f09b693 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el @@ -161,11 +161,11 @@ comments always start in column zero.") (defvar-local comment-combine-change-calls t "If non-nil (the default), use `combine-change-calls' around - calls of `comment-region-function' and - `uncomment-region-function'. This Substitutes a single call to - each of the hooks `before-change-functions' and - `after-change-functions' in place of those hooks being called - for each individual buffer change.") +calls of `comment-region-function' and +`uncomment-region-function'. This Substitutes a single call to +each of the hooks `before-change-functions' and +`after-change-functions' in place of those hooks being called +for each individual buffer change.") (defvar comment-region-function 'comment-region-default "Function to comment a region. @@ -932,7 +932,8 @@ This function is the default value of `uncomment-region-function'." (setq end (copy-marker end)) (let* ((numarg (prefix-numeric-value arg)) (ccs comment-continue) - (srei (comment-padright ccs 're)) + (srei (or (comment-padright ccs 're) + (and (stringp comment-continue) comment-continue))) (csre (comment-padright comment-start 're)) (sre (and srei (concat "^\\s-*?\\(" srei "\\)"))) spt) |