2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94c647b4b6f..31736838097 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-11  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * dired.el (dired-get-marked-files): Clarify doc (bug#11534).
+
 2014-02-10  Glenn Morris  <rgm@gnu.org>
 
         * jit-lock.el (jit-lock-force-redisplay): Doc fix.  (Bug#14394)
diff --git a/lisp/dired.el b/lisp/dired.el
index 0d66a78ee30..faa39ab5d6c 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -634,7 +634,8 @@ Optional second argument ARG, if non-nil, specifies files near
  point instead of marked files.  It usually comes from the prefix
  argument.
   If ARG is an integer, use the next ARG files.
-  Any other value means to use the current file instead.
+  If ARG is any other non-nil value, return the current file name.
+  If no files are marked, and ARG is nil, also return the current file name.
 Optional third argument FILTER, if non-nil, is a function to select
   some of the files--those for which (funcall FILTER FILENAME) is non-nil.