[Emacs-diffs] /srv/bzr/emacs/trunk r103514: outline.el fix for bug#7619.

[Glenn Morris]

------------------------------------------------------------
revno: 103514
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-03-04 00:40:00 -0800
message:
  outline.el fix for bug#7619.
  
  It turns out the use of nil in the :type of outline regexp was for
  very hysterical raisons.  Prior to CVS rev 1.49, 2001-09-12, the
  default value was nil, then it was initialized afterwards.
  Everywhere in the code assumes it cannot be nil, so no need to allow
  that any more.
  
  * lisp/outline.el (outline-regexp): No longer allow nil.
  (outline-heading-end-regexp): Add safety predicate.
modified:
  lisp/ChangeLog
  lisp/outline.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-04 08:21:56 +0000
+++ b/lisp/ChangeLog    2011-03-04 08:40:00 +0000
@@ -1,5 +1,8 @@
 2011-03-04  Glenn Morris  <address@hidden>
 
+       * outline.el (outline-regexp): No longer allow nil.
+       (outline-heading-end-regexp): Add safety predicate.  (Bug#7619)
+
        * net/browse-url.el (browse-url):
        Handle deleted default-directory.  (Bug#6077)
 

=== modified file 'lisp/outline.el'
--- a/lisp/outline.el   2011-01-25 04:08:28 +0000
+++ b/lisp/outline.el   2011-03-04 08:40:00 +0000
@@ -50,9 +50,9 @@
 so the regexp need not (and usually does not) start with `^'.
 The recommended way to set this is with a Local Variables: list
 in the file it applies to.  See also `outline-heading-end-regexp'."
-  :type '(choice regexp (const nil))
+  :type 'regexp
   :group 'outlines)
-;;;###autoload(put 'outline-regexp 'safe-local-variable 'string-or-null-p)
+;;;###autoload(put 'outline-regexp 'safe-local-variable 'stringp)
 
 (defcustom outline-heading-end-regexp "\n"
   "Regular expression to match the end of a heading line.
@@ -62,6 +62,7 @@
 in the file it applies to."
   :type 'regexp
   :group 'outlines)
+;;;###autoload(put 'outline-heading-end-regexp 'safe-local-variable 'stringp)
 
 (defvar outline-mode-prefix-map
   (let ((map (make-sparse-keymap)))