From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 18 Jun 2002 17:58:18 +0000 (+0000)
Subject: (comment-normalize-vars): Refresh the comment-foo-skip
X-Git-Tag: ttn-vms-21-2-B4~14548
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f23a0f3a2fcd3d9f7125c70d4a4262304c22bd98;p=emacs.git

(comment-normalize-vars): Refresh the comment-foo-skip
regexp when they don't match comment-foo any more.
---

diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 3e20679afef..b161b0c7779 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -5,7 +5,6 @@
 ;; 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.47 2002/04/29 23:43:11 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -240,14 +239,18 @@ This is obsolete because you might as well use \\[newline-and-indent]."
       ;; 	(kill-local-variable 'comment-continue))
       )
     ;; comment-skip regexps
-    (unless comment-start-skip
+    (unless (and comment-start-skip
+		 ;; In case comment-start has changed since last time.
+		 (string-match comment-start-skip comment-start))
       (set (make-local-variable 'comment-start-skip)
 	   (concat "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(\\s<+\\|"
 		   (regexp-quote (comment-string-strip comment-start t t))
 		   ;; Let's not allow any \s- but only [ \t] since \n
 		   ;; might be both a comment-end marker and \s-.
 		   "+\\)[ \t]*")))
-    (unless comment-end-skip
+    (unless (and comment-end-skip
+		 ;; In case comment-end has changed since last time.
+		 (string-match comment-end-skip comment-end))
       (let ((ce (if (string= "" comment-end) "\n"
 		  (comment-string-strip comment-end t t))))
 	(set (make-local-variable 'comment-end-skip)