[Emacs-diffs] emacs/lisp ChangeLog simple.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/04/02 01:56:47

Modified files:
        lisp           : ChangeLog simple.el 

Log message:
        (auto-fill-function): Mark it as safe for nil.
        Suggested by Leo <address@hidden>.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15539&r2=1.15540
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/simple.el?cvsroot=emacs&r1=1.982&r2=1.983

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15539
retrieving revision 1.15540
diff -u -b -r1.15539 -r1.15540
--- ChangeLog   1 Apr 2009 20:01:14 -0000       1.15539
+++ ChangeLog   2 Apr 2009 01:56:43 -0000       1.15540
@@ -1,18 +1,21 @@
+2009-04-02  Stefan Monnier  <address@hidden>
+
+       * simple.el (auto-fill-function): Mark it as safe for nil.
+       Suggested by Leo <address@hidden>.
+
 2009-04-01  Dan Nicolaescu  <address@hidden>
 
        * vc-mtn.el (vc-mtn-register): Fix optional arguments.
 
        * vc-hooks.el (vc-name): Avoid calling vc-backend twice.
-       (vc-mode-line): Accept and use an optional argument for the
-       backend.
+       (vc-mode-line): Accept and use an optional argument for the backend.
        (vc-find-file-hook): Use when instead of if.  Avoid calling
-       vc-backend multiple times, pass down the value computed the first
-       time.
+       vc-backend multiple times, pass down the value computed the first time.
 
 2009-03-30  Andreas Schwab  <address@hidden>
 
-       * ansi-color.el (ansi-color-get-face): Use
-       ansi-color-parameter-regexp to match parameters.
+       * ansi-color.el (ansi-color-get-face):
+       Use ansi-color-parameter-regexp to match parameters.
        (ansi-color-regexp): Include final `m' in first group.
 
 2009-03-30  Jason Rumney  <address@hidden>

Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.982
retrieving revision 1.983
diff -u -b -r1.982 -r1.983
--- simple.el   28 Mar 2009 21:17:46 -0000      1.982
+++ simple.el   2 Apr 2009 01:56:46 -0000       1.983
@@ -5008,6 +5008,10 @@
 Some major modes set this.")
 
 (put 'auto-fill-function :minor-mode-function 'auto-fill-mode)
+;; `functions' and `hooks' are usually unsafe to set, but setting
+;; auto-fill-function to nil in a file-local setting is safe and
+;; can be useful to prevent auto-filling.
+(put 'auto-fill-function 'safe-local-variable 'null)
 ;; FIXME: turn into a proper minor mode.
 ;; Add a global minor mode version of it.
 (defun auto-fill-mode (&optional arg)