From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Thu, 20 Apr 2006 21:24:19 +0000 (+0000)
Subject: (comment-start, comment-start-skip)
X-Git-Tag: emacs-pretest-22.0.90~3029
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be2c62b3c254747b5538e557dd74a7326c8b9037;p=emacs.git

(comment-start, comment-start-skip)
(comment-end-skip, comment-end): Mark as safe.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16b843967db..7ef6a1c3d54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* newcomment.el (comment-start, comment-start-skip)
+	(comment-end-skip, comment-end): Mark as safe.
+
 2006-04-20  Carsten Dominik  <dominik@science.uva.nl>
 
 	* textmodes/org.el: (org-deadline-announce): Face removed.
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 877d5c9f399..d5a2cea914a 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -108,21 +108,25 @@ not to go beyond `comment-fill-column'."
 ;;;###autoload
 (defvar comment-start nil
   "*String to insert to start a new comment, or nil if no comment syntax.")
+;;;###autoload(put 'comment-start 'safe-local-variable 'string-or-null-p)
 
 ;;;###autoload
 (defvar comment-start-skip nil
   "*Regexp to match the start of a comment plus everything up to its body.
 If there are any \\(...\\) pairs, the comment delimiter text is held to begin
 at the place matched by the close of the first pair.")
+;;;###autoload(put 'comment-start-skip 'safe-local-variable 'string-or-null-p)
 
 ;;;###autoload
 (defvar comment-end-skip nil
   "Regexp to match the end of a comment plus everything up to its body.")
+;;;###autoload(put 'comment-end-skip 'safe-local-variable 'string-or-null-p)
 
 ;;;###autoload
 (defvar comment-end ""
   "*String to insert to end a new comment.
 Should be an empty string if comments are terminated by end-of-line.")
+;;;###autoload(put 'comment-end 'safe-local-variable 'string-or-null-p)
 
 ;;;###autoload
 (defvar comment-indent-function 'comment-indent-default