(comment-normalize-vars): Use " \t" rather than

"\\s-" when defining comment-end-skip.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6734f3..9f05a63 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,15 @@
+2001-09-27  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * newcomment.el (comment-normalize-vars): Use " \t" rather than
+       "\\s-" when defining comment-end-skip.
+
 2001-09-27  Gerd Moellmann  <gerd@gnu.org>
 
-       * mail/feedmail.el (feedmail-queue-send-edit-prompt-help): 
+       * mail/feedmail.el (feedmail-queue-send-edit-prompt-help):
        Call get-buffer-window first second arg `visible'.
 
-       * international/mule-diag.el (list-input-methods-1): Output 
-       something that's independent of Emacs' version.
+       * international/mule-diag.el (list-input-methods-1):
+       Output something that's independent of Emacs' version.
 
        * tar-mode.el (tar-mode-write-file): Don't signal an error by
        calling byte-to-position with a nil tar-header-offset.

diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 2a889e6..0ed7bb4 100644 (file)
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -5,7 +5,7 @@
 ;; Author: code extracted from Emacs-20's simple.el
 ;; Maintainer: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: comment uncomment
-;; Revision: $Id: newcomment.el,v 1.33 2001/09/01 21:19:45 monnier Exp $
+;; Revision: $Id: newcomment.el,v 1.34 2001/09/01 21:23:17 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -241,7 +241,9 @@ This is obsolete because you might as well use \\[newline-and-indent]."
       (let ((ce (if (string= "" comment-end) "\n"
                  (comment-string-strip comment-end t t))))
        (set (make-local-variable 'comment-end-skip)
-            (concat "\\s-*\\(\\s>" (if comment-quote-nested "" "+")
+            ;; We use [ \t] rather than \s- because we don't want to
+            ;; remove ^L in C mode when uncommenting.
+            (concat "[ \t]*\\(\\s>" (if comment-quote-nested "" "+")
                     "\\|" (regexp-quote (substring ce 0 1))
                     (if (and comment-quote-nested (<= (length ce) 1)) "" "+")
                     (regexp-quote (substring ce 1))