(colon-double-space): Tighten up a bit the safety predicate.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b5d9bf58d50b75bc3ffa320d8449a9a72085656..045bae9ed60da974d1a8a09e34d890ff0ea77828 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,11 @@
 2006-04-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * textmodes/fill.el (colon-double-space): Tighten up the safety pred.
+
        * progmodes/python.el (python-continuation-line-p)
        (python-beginning-of-statement): syntax-ppss may return
        a negative depth.
+       (python-mode): Don't forcefully enable font-lock.
 
        * time-stamp.el (time-stamp-start, time-stamp-end)
        (time-stamp-inserts-lines): Tighten up a bit the safety predicate.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 312c73a380b5dea4500398651364b990c27deae8..545e9fe14b5abb4317b2e509bb7aa42c3e325907 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -48,7 +48,7 @@ A value of nil means that any change in indentation starts a new paragraph."
   "*Non-nil means put two spaces after a colon when filling."
   :type 'boolean
   :group 'fill)
-;;;###autoload(put 'colon-double-space 'safe-local-variable t)
+;;;###autoload(put 'colon-double-space 'safe-local-variable 'symbolp)
 
 (defvar fill-paragraph-function nil
   "Mode-specific function to fill a paragraph, or nil if there is none.