aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-09 23:13:14 -0800
committerLars Ingebrigtsen2014-02-09 23:13:14 -0800
commit7602b5c379f4176ea05285b05b57ba4e41d5204d (patch)
tree51743aaac0cbdceabdfc3c6c1f53ae1784a428c0
parente3692ee0348f19dfc4b5376a34af0e229b60bd5c (diff)
downloademacs-7602b5c379f4176ea05285b05b57ba4e41d5204d.tar.gz
emacs-7602b5c379f4176ea05285b05b57ba4e41d5204d.zip
* dired.el (dired-get-marked-files): Doc fix.
Fixes: debbugs:11534
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/dired.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27b313d7c78..6a2cdabc1f1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12014-02-10 Lars Ingebrigtsen <larsi@gnus.org> 12014-02-10 Lars Ingebrigtsen <larsi@gnus.org>
2 2
3 * dired.el (dired-get-marked-files): Doc fix (bug#11534).
4
3 * simple.el (choose-completion): Doc fix (bug#14160). 5 * simple.el (choose-completion): Doc fix (bug#14160).
4 6
5 * subr.el (event-start): Say what a nil EVENT value means. 7 * subr.el (event-start): Say what a nil EVENT value means.
diff --git a/lisp/dired.el b/lisp/dired.el
index ab5611b1d66..a1a67547717 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -634,7 +634,7 @@ 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 non-nil value means to use the current file instead. 637 Any other value means to use the current file instead.
638Optional third argument FILTER, if non-nil, is a function to select 638Optional 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. 639 some of the files--those for which (funcall FILTER FILENAME) is non-nil.
640 640