summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2008-02-09 13:22:35 +0000
committerEli Zaretskii <eliz@gnu.org>2008-02-09 13:22:35 +0000
commitd375705e3c31d18dd50474ec95ec84bc05c2b23d (patch)
treec7a317d15f1a205b2414ebc4773c05179178728a
parentf34cec5cc8d94718d2bdc87ac321b7535a942311 (diff)
downloademacs-d375705e3c31d18dd50474ec95ec84bc05c2b23d.tar.gz
(syms_of_fileio) <insert-default-directory>: Doc fix.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/fileio.c24
2 files changed, 19 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f7d6c07a086..3cf55438b83 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-09 Eli Zaretskii <eliz@gnu.org>
+
+ * fileio.c (syms_of_fileio) <insert-default-directory>: Doc fix.
+
2008-02-05 Jason Rumney <jasonr@gnu.org>
* w32term.c (w32_read_socket) <WM_CHAR>: Use locale-coding-system
diff --git a/src/fileio.c b/src/fileio.c
index ef2b0cfbb2e..c5bff5b8153 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6630,19 +6630,25 @@ of file names regardless of the current language environment. */);
DEFVAR_BOOL ("insert-default-directory", &insert_default_directory,
doc: /* *Non-nil means when reading a filename start with default dir in minibuffer.
-If the initial minibuffer contents are non-empty, you can usually
-request a default filename by typing RETURN without editing. For some
-commands, exiting with an empty minibuffer has a special meaning,
-such as making the current buffer visit no file in the case of
-`set-visited-file-name'.
+
+When the initial minibuffer contents show a name of a file or a directory,
+typing RETURN without editing the initial contents is equivalent to typing
+the default file name.
+
If this variable is non-nil, the minibuffer contents are always
-initially non-empty and typing RETURN without editing will fetch the
+initially non-empty, and typing RETURN without editing will fetch the
default name, if one is provided. Note however that this default name
-is not necessarily the name originally inserted in the minibuffer, if
-that is just the default directory.
+is not necessarily the same as initial contents inserted in the minibuffer,
+if the initial contents is just the default directory.
+
If this variable is nil, the minibuffer often starts out empty. In
that case you may have to explicitly fetch the next history element to
-request the default name. */);
+request the default name; typing RETURN without editing will leave
+the minibuffer empty.
+
+For some commands, exiting with an empty minibuffer has a special meaning,
+such as making the current buffer visit no file in the case of
+`set-visited-file-name'. */);
insert_default_directory = 1;
DEFVAR_BOOL ("vms-stmlf-recfm", &vms_stmlf_recfm,