(comment-add): If EXTRA, double `comment-add' value.

2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c62f586ace..c9b13c2e9ff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-20  Richard Stallman  <rms@gnu.org>
+
+        * newcomment.el (comment-add): If EXTRA, double `comment-add' value.
+
 2007-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * add-log.el (add-log-current-defun): Fix thinko w.r.t derived-mode-p.
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index abe97c9efbe..6b0589da43d 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -942,11 +942,11 @@ indentation to be kept as it was before narrowing."
 ;; Compute the number of extra semicolons to add to the comment starter
 ;; in Lisp mode, extra stars in C mode, etc.
 ;; If ARG is non-nil, just follow ARG.
-;; If the comment-starter is mult-char, just follow ARG.
-;; Otherwise obey comment-add, and add one more if EXTRA is non-nil.
+;; If the comment-starter is multi-char, just follow ARG.
+;; Otherwise obey comment-add, and double it if EXTRA is non-nil.
 (defun comment-add (arg &optional extra)
   (if (and (null arg) (= (string-match "[ \t]*\\'" comment-start) 1))
-      (+ comment-add (if extra 1 0))
+      (* comment-add (if extra 2 1))
     (1- (prefix-numeric-value arg))))
 
 (defun comment-region-internal (beg end cs ce
@@ -1088,7 +1088,7 @@ The strings used as comment starts are built from
      (t
       ;; Add an extra semicolon in Lisp and similar modes.
       ;; If STYLE doesn't specify indenting the comments,
-      ;; then add yet one more semicolon.
+      ;; then double the value of `comment-add'.
       (setq numarg (comment-add arg (null (nth 3 style))))
       (comment-region-internal
        beg end