aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-07 21:15:31 -0800
committerLars Ingebrigtsen2014-02-07 21:15:31 -0800
commitdd7aafbbf013a3153dd092889a10f00baa2f18ed (patch)
tree33d81e7c3da2960fc1202a43b5ebb8512d36642e
parent8acaaad7bd292795f4ac04a639af2d1284b875ba (diff)
downloademacs-dd7aafbbf013a3153dd092889a10f00baa2f18ed.tar.gz
emacs-dd7aafbbf013a3153dd092889a10f00baa2f18ed.zip
* minibuffer.el (read-file-name): Doc clarification.
Fixes: debbugs:15096
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/minibuffer.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b7ae9cbe66..0b005640250 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12014-02-08 Lars Ingebrigtsen <larsi@gnus.org> 12014-02-08 Lars Ingebrigtsen <larsi@gnus.org>
2 2
3 * minibuffer.el (read-file-name): Doc clarification (bug#15096).
4
3 * files.el (file-relative-name): Doc fix (bug#15159). 5 * files.el (file-relative-name): Doc fix (bug#15159).
4 6
5 * fringe.el (fringe-styles): Doc fix (bug#15239). 7 * fringe.el (fringe-styles): Doc fix (bug#15239).
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 105075524bf..edc4c950104 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2395,7 +2395,7 @@ such as making the current buffer visit no file in the case of
2395 2395
2396(defun read-file-name (prompt &optional dir default-filename mustmatch initial predicate) 2396(defun read-file-name (prompt &optional dir default-filename mustmatch initial predicate)
2397 "Read file name, prompting with PROMPT and completing in directory DIR. 2397 "Read file name, prompting with PROMPT and completing in directory DIR.
2398Value is not expanded---you must call `expand-file-name' yourself. 2398The return value is not expanded---you must call `expand-file-name' yourself.
2399 2399
2400DIR is the directory to use for completing relative file names. 2400DIR is the directory to use for completing relative file names.
2401It should be an absolute directory name, or nil (which means the 2401It should be an absolute directory name, or nil (which means the