# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1285074562 -7200
# Node ID 43a857ac456c2a2dac1d52f6d6a6aa2935a7cab4
# Parent  a4f29934ad86566c29567bf9581e458f2e1ffb1d
* lisp/newcomment.el (comment-normalize-vars): Better test validity of
comment-end-skip.

diff -r a4f29934ad86 -r 43a857ac456c lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Sep 20 20:11:34 2010 -0700
+++ b/lisp/ChangeLog	Tue Sep 21 15:09:22 2010 +0200
@@ -1,3 +1,8 @@
+2010-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* newcomment.el (comment-normalize-vars): Better test validity of
+	comment-end-skip.
+
 2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/float-sup.el (float-pi): New name for `pi'.
diff -r a4f29934ad86 -r 43a857ac456c lisp/newcomment.el
--- a/lisp/newcomment.el	Mon Sep 20 20:11:34 2010 -0700
+++ b/lisp/newcomment.el	Tue Sep 21 15:09:22 2010 +0200
@@ -318,7 +318,8 @@
 		   "+\\)[ \t]*")))
     (unless (and comment-end-skip
 		 ;; In case comment-end has changed since last time.
-		 (string-match comment-end-skip comment-end))
+		 (string-match comment-end-skip
+                               (if (string= "" comment-end) "\n" comment-end)))
       (let ((ce (if (string= "" comment-end) "\n"
 		  (comment-string-strip comment-end t t))))
 	(set (make-local-variable 'comment-end-skip)