[Emacs-diffs] /srv/bzr/emacs/trunk r110489: * lisp/newcomment.el (comment-start-skip, comment-end-skip, comment-end):

[Stefan Monnier]

------------------------------------------------------------
revno: 110489
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12583
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-09 12:37:51 -0400
message:
  * lisp/newcomment.el (comment-start-skip, comment-end-skip, comment-end):
  Don't document nil as a useful value.
modified:
  lisp/ChangeLog
  lisp/newcomment.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-09 16:30:12 +0000
+++ b/lisp/ChangeLog    2012-10-09 16:37:51 +0000
@@ -1,11 +1,16 @@
+2012-10-09  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
-       * 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

=== modified file 'lisp/newcomment.el'
--- a/lisp/newcomment.el        2012-10-09 16:30:12 +0000
+++ b/lisp/newcomment.el        2012-10-09 16:37:51 +0000
@@ -117,20 +117,20 @@
 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 @@
 ;;;###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: ")))