* lisp/newcomment.el (comment-start-skip, comment-end-skip, comment-end):

Don't document nil as a useful value.

Fixes: debbugs:12583

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ffff9d6da8e6cc7731f1ccc97f229a16f2fcff2..69371cec518ff0a4148422e537e0d223a4fa6ab4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,16 @@
+2012-10-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * newcomment.el (comment-start-skip, comment-end-skip, comment-end):
+       Don't document nil as a useful value (bug#12583).
+
 2012-10-09  Michael Albinus  <michael.albinus@gmx.de>
 
-       * net/tramp.el (tramp-debug-message): Remove
-       "tramp-with-progress-reporter" from regexp of ignored functions.
+       * net/tramp.el (tramp-debug-message):
+       Remove "tramp-with-progress-reporter" from regexp of ignored functions.
        (with-tramp-progress-reporter): Rename from
        `tramp-with-progress-reporter'.
-       (with-tramp-file-property, with-tramp-connection-property): Move
-       from tramp-cache.el, rename from `with-file-property' and
+       (with-tramp-file-property, with-tramp-connection-property):
+       Move from tramp-cache.el, rename from `with-file-property' and
        `with-connection-property', respectively.
 
        * net/tramp-cache.el: Remove `with-file-property' and

diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 6d2eed7194874142e957ddaa30ee11957f36bfac..a754c89c4ae81b3d928a4046addfedd99f7c2c5c 100644 (file)
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -117,20 +117,20 @@ Comments might be indented to a different value in order not to go beyond
 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)
+(put 'comment-start-skip 'safe-local-variable 'stringp)
 
 ;;;###autoload
 (defvar comment-end-skip nil
   "Regexp to match the end of a comment plus everything back to its body.")
 ;;;###autoload
-(put 'comment-end-skip 'safe-local-variable 'string-or-null-p)
+(put 'comment-end-skip 'safe-local-variable 'stringp)
 
 ;;;###autoload
 (defvar comment-end (purecopy "")
   "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)
+(put 'comment-end 'safe-local-variable 'stringp)
 
 ;;;###autoload
 (defvar comment-indent-function 'comment-indent-default
@@ -327,9 +327,9 @@ terminated by the end of line (i.e. `comment-end' is empty)."
 ;;;###autoload
 (defun comment-normalize-vars (&optional noerror)
   "Check and setup the variables needed by other commenting functions.
-Any command calling functions from newcomment.el, being entry points, should
-call this function before any other, so the rest of the code can assume that
-the variables are properly set."
+Any command calling functions from newcomment.el should call this function
+before any other, so the rest of the code can assume that the variables are
+properly set."
   (unless (and (not comment-start) noerror)
     (unless comment-start
       (let ((cs (read-string "No comment syntax is defined.  Use: ")))