Fix for uncommentin in Fundamental mode.

* newcomment.el (comment-normalize-vars): If prompting for
comment-start, set comment-start-skip too.

Fixes: debbugs:8424

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a08e8c2f91bce8e8253714e788e8bedfdaeb7d29..459e360c8d71baefa1d9f36c0b15ac75b6230128 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
+
+       * newcomment.el (comment-normalize-vars): If prompting for
+       comment-start, set comment-start-skip too (Bug#8424).
+
 2011-09-18  Johan Bockgård  <bojohan@gnu.org>
 
        * icomplete.el: Fix previous fix of Bug#5849.

diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 8c0d7b25939764ec71b7af7055fc8223fd7e7647..3f2338b3a4c4d83bb1651d34ff321ae4433dc5ef 100644 (file)
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -316,7 +316,8 @@ the variables are properly set."
       (let ((cs (read-string "No comment syntax is defined.  Use: ")))
        (if (zerop (length cs))
            (error "No comment syntax defined")
-         (set (make-local-variable 'comment-start) cs))))
+         (set (make-local-variable 'comment-start) cs)
+         (set (make-local-variable 'comment-start-skip) cs))))
     ;; comment-use-syntax
     (when (eq comment-use-syntax 'undecided)
       (set (make-local-variable 'comment-use-syntax)