aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-09-18 14:10:01 -0400
committerChong Yidong2011-09-18 14:10:01 -0400
commitd473dce83055a56fed39293a0ab5e9023b955862 (patch)
treee93632a0ba4986950866ad490744cfa10ff23a23
parentc02dcedf1b2ab40e4d1ea55bac6923c3c5249e86 (diff)
downloademacs-d473dce83055a56fed39293a0ab5e9023b955862.tar.gz
emacs-d473dce83055a56fed39293a0ab5e9023b955862.zip
Fix for uncommentin in Fundamental mode.
* newcomment.el (comment-normalize-vars): If prompting for comment-start, set comment-start-skip too. Fixes: debbugs:8424
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/newcomment.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a08e8c2f91b..459e360c8d7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-09-18 Chong Yidong <cyd@stupidchicken.com>
2
3 * newcomment.el (comment-normalize-vars): If prompting for
4 comment-start, set comment-start-skip too (Bug#8424).
5
12011-09-18 Johan Bockgård <bojohan@gnu.org> 62011-09-18 Johan Bockgård <bojohan@gnu.org>
2 7
3 * icomplete.el: Fix previous fix of Bug#5849. 8 * icomplete.el: Fix previous fix of Bug#5849.
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 8c0d7b25939..3f2338b3a4c 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -316,7 +316,8 @@ the variables are properly set."
316 (let ((cs (read-string "No comment syntax is defined. Use: "))) 316 (let ((cs (read-string "No comment syntax is defined. Use: ")))
317 (if (zerop (length cs)) 317 (if (zerop (length cs))
318 (error "No comment syntax defined") 318 (error "No comment syntax defined")
319 (set (make-local-variable 'comment-start) cs)))) 319 (set (make-local-variable 'comment-start) cs)
320 (set (make-local-variable 'comment-start-skip) cs))))
320 ;; comment-use-syntax 321 ;; comment-use-syntax
321 (when (eq comment-use-syntax 'undecided) 322 (when (eq comment-use-syntax 'undecided)
322 (set (make-local-variable 'comment-use-syntax) 323 (set (make-local-variable 'comment-use-syntax)