diff lisp/newcomment.el @ 112069:17134f58ba8a

merge emacs-23
author Kenichi Handa <handa@m17n.org>
date Wed, 13 Oct 2010 22:40:51 +0900
parents 43a857ac456c
children b799d38f522a 376148b31b5e
line wrap: on
line diff
--- a/lisp/newcomment.el	Sun Aug 29 14:22:52 2010 +0900
+++ b/lisp/newcomment.el	Wed Oct 13 22:40:51 2010 +0900
@@ -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)