# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1001625224 0
# Node ID 54fe59ee8057ef878acad0778afcf19159d7472a
# Parent  5e20b8bbcc453770f5e658ce986d73274dec6aaa
(comment-normalize-vars): Use " \t" rather than
"\\s-" when defining comment-end-skip.

diff -r 5e20b8bbcc45 -r 54fe59ee8057 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Sep 27 13:37:26 2001 +0000
+++ b/lisp/ChangeLog	Thu Sep 27 21:13:44 2001 +0000
@@ -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 -r 5e20b8bbcc45 -r 54fe59ee8057 lisp/newcomment.el
--- a/lisp/newcomment.el	Thu Sep 27 13:37:26 2001 +0000
+++ b/lisp/newcomment.el	Thu Sep 27 21:13:44 2001 +0000
@@ -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 @@
       (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))