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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/08/25 03:03:31

Modified files:
        lisp           : ChangeLog format.el 

Log message:
        (format-alist): Doc fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16004&r2=1.16005
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/format.el?cvsroot=emacs&r1=1.66&r2=1.67

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16004
retrieving revision 1.16005
diff -u -b -r1.16004 -r1.16005
--- ChangeLog   24 Aug 2009 19:12:46 -0000      1.16004
+++ ChangeLog   25 Aug 2009 03:03:27 -0000      1.16005
@@ -1,3 +1,7 @@
+2009-08-25  Glenn Morris  <address@hidden>
+
+       * format.el (format-alist): Doc fix.
+
 2009-08-24  Dmitry Dzhus  <address@hidden>
 
        * progmodes/gdb-mi.el (gdb-mapcar*): Replacement for `mapcar*'

Index: format.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/format.el,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- format.el   22 Jan 2009 04:54:35 -0000      1.66
+++ format.el   25 Aug 2009 03:03:31 -0000      1.67
@@ -1,7 +1,7 @@
 ;;; format.el --- read and save files in multiple formats
 
-;; Copyright (C) 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <address@hidden>
 
@@ -106,9 +106,9 @@
         the user if they ask for more information.
 
 REGEXP  is a regular expression to match against the beginning of the file;
-        it should match only files in that format.  Use nil to avoid
-        matching at all for formats for which it isn't appropriate to
-        require explicit encoding/decoding.
+        it should match only files in that format.  REGEXP may be nil, in
+        which case the format will never be applied automatically to a file.
+        Use this for formats that you only ever want to apply manually.
 
 FROM-FN is called to decode files in that format; it takes two args, BEGIN
         and END, and can make any modifications it likes, returning the new
@@ -136,6 +136,7 @@
 
 PRESERVE, if non-nil, means that `format-write-file' should not remove
           this format from `buffer-file-format'.")
+;;;###autoload(put 'format-alist 'risky-local-variable t)
 
 ;;; Basic Functions (called from Lisp)