aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-08-25 03:02:09 +0000
committerGlenn Morris2009-08-25 03:02:09 +0000
commit0706c025672b03ae8a2d646c9bd25a8edaaa695f (patch)
tree8eba400484037c326c6b77cea9c38163f6be6a21
parent664d56b8b47160bd9422af714cf97bb8d686b29a (diff)
downloademacs-0706c025672b03ae8a2d646c9bd25a8edaaa695f.tar.gz
emacs-0706c025672b03ae8a2d646c9bd25a8edaaa695f.zip
(Format Conversion Round-Trip): Mention nil regexp.
-rw-r--r--doc/lispref/ChangeLog2
-rw-r--r--doc/lispref/files.texi2
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3af7a823ac0..5989793d2c6 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -2,6 +2,8 @@
2 2
3 * display.texi (Fontsets): Fix typo. 3 * display.texi (Fontsets): Fix typo.
4 4
5 * files.texi (Format Conversion Round-Trip): Mention nil regexp.
6
52009-08-19 Stefan Monnier <monnier@iro.umontreal.ca> 72009-08-19 Stefan Monnier <monnier@iro.umontreal.ca>
6 8
7 * processes.texi (Asynchronous Processes): Adjust arglist of 9 * processes.texi (Asynchronous Processes): Adjust arglist of
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index ff225e0230b..cbba096c7b9 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2901,7 +2901,7 @@ A documentation string for the format.
2901 2901
2902@item regexp 2902@item regexp
2903A regular expression which is used to recognize files represented in 2903A regular expression which is used to recognize files represented in
2904this format. 2904this format. If @code{nil}, the format is never applied automatically.
2905 2905
2906@item from-fn 2906@item from-fn
2907A shell command or function to decode data in this format (to convert 2907A shell command or function to decode data in this format (to convert