[Emacs-diffs] /srv/bzr/emacs/trunk r104412: * doc/lispref/minibuf.texi (Reading File Names): Clarify (Bug#8480).

[Chong Yidong]

------------------------------------------------------------
revno: 104412
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-05-28 15:58:43 -0400
message:
  * doc/lispref/minibuf.texi (Reading File Names): Clarify (Bug#8480).
modified:
  doc/lispref/ChangeLog
  doc/lispref/minibuf.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-05-28 19:05:36 +0000
+++ b/doc/lispref/ChangeLog     2011-05-28 19:58:43 +0000
@@ -1,5 +1,7 @@
 2011-05-28  Chong Yidong  <address@hidden>
 
+       * minibuf.texi (Reading File Names): Clarify (Bug#8480).
+
        * tips.texi (Coding Conventions): Remove antediluvian filename
        limit recommendation (Bug#8538).
 

=== modified file 'doc/lispref/minibuf.texi'
--- a/doc/lispref/minibuf.texi  2011-05-10 13:57:12 +0000
+++ b/doc/lispref/minibuf.texi  2011-05-28 19:58:43 +0000
@@ -1383,17 +1383,19 @@
 graphical file dialog is platform-dependent.  Here, we simply document
 the behavior when using the minibuffer.
 
address@hidden does not automatically expand the returned file
+name.  You must call @code{expand-file-name} yourself if an absolute
+file name is required.
+
 The optional argument @var{require-match} has the same meaning as in
address@hidden  @xref{Minibuffer Completion}.
-
address@hidden uses
address@hidden as the keymap if
address@hidden is @code{nil}, and uses
address@hidden if @var{require-match}
-is address@hidden  @xref{Completion Commands}.
address@hidden  @xref{Minibuffer Completion}.  If
address@hidden is @code{nil}, the local keymap in the minibuffer
+is @code{minibuffer-local-filename-completion-map}; otherwise, it is
address@hidden  @xref{Completion
+Commands}.
 
 The argument @var{directory} specifies the directory to use for
-completion of relative file names.  It should be an absolute directory
+completing relative file names.  It should be an absolute directory
 name.  If @code{insert-default-directory} is address@hidden,
 @var{directory} is also inserted in the minibuffer as initial input.
 It defaults to the current buffer's value of @code{default-directory}.
@@ -1441,11 +1443,7 @@
 possibilities.  A file name is an acceptable value if @var{predicate}
 returns address@hidden for it.
 
address@hidden does not automatically expand file names.  You
-must call @code{expand-file-name} yourself if an absolute file name is
-required.
-
-Here is an example:
+Here is an example of using @code{read-file-name}:
 
 @example
 @group