aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2009-08-25 03:02:09 +0000
committerGlenn Morris <[email protected]>2009-08-25 03:02:09 +0000
commit0706c025672b03ae8a2d646c9bd25a8edaaa695f (patch)
tree8eba400484037c326c6b77cea9c38163f6be6a21 /doc
parent664d56b8b47160bd9422af714cf97bb8d686b29a (diff)
(Format Conversion Round-Trip): Mention nil regexp.
Diffstat (limited to 'doc')
-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 3af7a823ac..5989793d2c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -2,6 +2,8 @@
* display.texi (Fontsets): Fix typo.
+ * files.texi (Format Conversion Round-Trip): Mention nil regexp.
+
2009-08-19 Stefan Monnier <[email protected]>
* processes.texi (Asynchronous Processes): Adjust arglist of
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index ff225e0230..cbba096c7b 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2901,7 +2901,7 @@ A documentation string for the format.
@item regexp
A regular expression which is used to recognize files represented in
-this format.
+this format. If @code{nil}, the format is never applied automatically.
@item from-fn
A shell command or function to decode data in this format (to convert