aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-06-07 20:45:49 +0000
committerChong Yidong2009-06-07 20:45:49 +0000
commit62e8099cd382e50cd83c20cf56cadd17bc536ede (patch)
tree5768b99c80dd48599ca466bf10d9ea1339ffadf8
parent917b89a691a5d7c8ae442a6f2e7bc1230efded00 (diff)
downloademacs-62e8099cd382e50cd83c20cf56cadd17bc536ede.tar.gz
emacs-62e8099cd382e50cd83c20cf56cadd17bc536ede.zip
* minibuf.texi (Reading File Names): Fix introductory text.
Suggested by stan@derbycityprints.com. (High-Level Completion): Fix typo.
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/minibuf.texi10
2 files changed, 12 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a3b18d880a6..114b5db572c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
12009-06-07 Chong Yidong <cyd@stupidchicken.com>
2
3 * minibuf.texi (Reading File Names): Fix introductory text.
4 Suggested by stan@derbycityprints.com.
5 (High-Level Completion): Fix typo.
6
12009-05-28 Chong Yidong <cyd@stupidchicken.com> 72009-05-28 Chong Yidong <cyd@stupidchicken.com>
2 8
3 * frames.texi (Text Terminal Colors): Multi-tty is already 9 * frames.texi (Text Terminal Colors): Multi-tty is already
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index dbc4c0da33d..654cf1329b3 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1317,7 +1317,7 @@ invalid color name was specified, this function signals an error,
1317except that empty color names are allowed when @code{allow-empty} is 1317except that empty color names are allowed when @code{allow-empty} is
1318non-@code{nil} and the user enters null input. 1318non-@code{nil} and the user enters null input.
1319 1319
1320Interactively, or when @var{display} is non-@code{nill}, the return 1320Interactively, or when @var{display} is non-@code{nil}, the return
1321value is also displayed in the echo area. 1321value is also displayed in the echo area.
1322@end deffn 1322@end deffn
1323 1323
@@ -1330,9 +1330,11 @@ and @code{read-input-method-name}, in @ref{Input Methods}.
1330@cindex read file names 1330@cindex read file names
1331@cindex prompt for file name 1331@cindex prompt for file name
1332 1332
1333 Here is a couple of other high-level completion functions, designed 1333 The high-level completion functions @code{read-file-name},
1334for reading file names and shell commands. They provide special 1334@code{read-directory-name}, and @code{read-shell-command} are designed
1335features including automatic insertion of the default directory. 1335to read file names, directory names, and shell commands respectively.
1336They provide special features, including automatic insertion of the
1337default directory.
1336 1338
1337@defun read-file-name prompt &optional directory default require-match initial predicate 1339@defun read-file-name prompt &optional directory default require-match initial predicate
1338This function reads a file name in the minibuffer, prompting with 1340This function reads a file name in the minibuffer, prompting with