aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-11-02 02:30:04 +0000
committerChong Yidong2009-11-02 02:30:04 +0000
commit0f063651e220bcb450d760e9e365a05acf1aed30 (patch)
tree7bc7cbe84afd596007870459945aeeb2568ada5b
parent8368c14e1768f87ac40b6996dd1a5b9e3f9d5ffc (diff)
downloademacs-0f063651e220bcb450d760e9e365a05acf1aed30.tar.gz
emacs-0f063651e220bcb450d760e9e365a05acf1aed30.zip
* minibuf.texi (Reading File Names): Note that read-file-name may
use a graphical file dialog.
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/minibuf.texi16
2 files changed, 18 insertions, 3 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 31b4f7fc255..e455d15edc0 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12009-11-02 Chong Yidong <cyd@stupidchicken.com>
2
3 * minibuf.texi (Reading File Names): Note that read-file-name may
4 use a graphical file dialog.
5
12009-10-31 Glenn Morris <rgm@gnu.org> 62009-10-31 Glenn Morris <rgm@gnu.org>
2 7
3 * nonascii.texi (User-Chosen Coding Systems): Minor reword. (Bug#4817) 8 * nonascii.texi (User-Chosen Coding Systems): Minor reword. (Bug#4817)
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index c28ab70e2d8..2702cf7916e 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1337,8 +1337,19 @@ They provide special features, including automatic insertion of the
1337default directory. 1337default directory.
1338 1338
1339@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
1340This function reads a file name in the minibuffer, prompting with 1340This function reads a file name, prompting with @var{prompt} and
1341@var{prompt} and providing completion. 1341providing completion.
1342
1343As an exception, this function reads a file name using a graphical
1344file dialog instead of the minibuffer, if (i) it is invoked via a
1345mouse command, and (ii) the selected frame is on a graphical display
1346supporting such dialogs, and (iii) the variable @code{use-dialog-box}
1347is non-@code{nil} (@pxref{Dialog Boxes,, Dialog Boxes, emacs, The GNU
1348Emacs Manual}), and (iv) the @var{directory} argument, described
1349below, does not specify a remote file (@pxref{Remote Files,, Remote
1350Files, emacs, The GNU Emacs Manual}). The exact behavior when using a
1351graphical file dialog is platform-dependent. Here, we simply document
1352the behavior when using the minibuffer.
1342 1353
1343The optional argument @var{require-match} has the same meaning as in 1354The optional argument @var{require-match} has the same meaning as in
1344@code{completing-read}. @xref{Minibuffer Completion}. 1355@code{completing-read}. @xref{Minibuffer Completion}.
@@ -1355,7 +1366,6 @@ name. If @code{insert-default-directory} is non-@code{nil},
1355@var{directory} is also inserted in the minibuffer as initial input. 1366@var{directory} is also inserted in the minibuffer as initial input.
1356It defaults to the current buffer's value of @code{default-directory}. 1367It defaults to the current buffer's value of @code{default-directory}.
1357 1368
1358@c Emacs 19 feature
1359If you specify @var{initial}, that is an initial file name to insert 1369If you specify @var{initial}, that is an initial file name to insert
1360in the buffer (after @var{directory}, if that is inserted). In this 1370in the buffer (after @var{directory}, if that is inserted). In this
1361case, point goes at the beginning of @var{initial}. The default for 1371case, point goes at the beginning of @var{initial}. The default for