aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-11 03:16:38 -0800
committerLars Ingebrigtsen2014-02-11 03:16:38 -0800
commitfcd58a02997196462fa93cb2fab0ea998006c1b4 (patch)
treeb22c735143b78e99eed826e70c5140816faafdd6
parent581d24e701655c70bf318f00d270fb6f3aad2cc7 (diff)
downloademacs-fcd58a02997196462fa93cb2fab0ea998006c1b4.tar.gz
emacs-fcd58a02997196462fa93cb2fab0ea998006c1b4.zip
* dired.el (dired-get-marked-files): Clarify doc.
Fixes: debbugs:11534
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/dired.el3
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 @@
12014-02-11 Lars Ingebrigtsen <larsi@gnus.org>
2
3 * dired.el (dired-get-marked-files): Clarify doc (bug#11534).
4
12014-02-10 Glenn Morris <rgm@gnu.org> 52014-02-10 Glenn Morris <rgm@gnu.org>
2 6
3 * jit-lock.el (jit-lock-force-redisplay): Doc fix. (Bug#14394) 7 * 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
634 point instead of marked files. It usually comes from the prefix 634 point instead of marked files. It usually comes from the prefix
635 argument. 635 argument.
636 If ARG is an integer, use the next ARG files. 636 If ARG is an integer, use the next ARG files.
637 Any other value means to use the current file instead. 637 If ARG is any other non-nil value, return the current file name.
638 If no files are marked, and ARG is nil, also return the current file name.
638Optional third argument FILTER, if non-nil, is a function to select 639Optional third argument FILTER, if non-nil, is a function to select
639 some of the files--those for which (funcall FILTER FILENAME) is non-nil. 640 some of the files--those for which (funcall FILTER FILENAME) is non-nil.
640 641