diff options
author | Glenn Morris <rgm@gnu.org> | 2018-03-02 11:59:46 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2018-03-02 11:59:46 -0800 |
commit | 762ea10d7ff483d3528c2c85b42596178ccc2a34 (patch) | |
tree | 00154b726c2bd73c85d47f89a2912bd2ff389b92 /lisp/dired-aux.el | |
parent | e943b9b514fcc82a47364a35e4af9f46e30e7346 (diff) | |
parent | 0213c8bf472b196d995d92a52b44458ac8226e42 (diff) | |
download | emacs-762ea10d7ff483d3528c2c85b42596178ccc2a34.tar.gz |
Merge from origin/emacs-26
0213c8b (origin/emacs-26) mwheel minor consistency fix
82f12b2 * src/window.c (Frecenter): Improve commentary.
04da8f4 Fix downloading non-text files in EWW
832b9ec ; Spelling fixes
dd88499 ; Spelling fixes
3968f72 Rename some mwheel options, for consistency
d6e78de * lisp/vc/add-log.el (add-change-log-entry): Replace obsolete...
5fe0387 Improve the Emacs manual
56ab8e3 * lisp/dired-aux.el (dired-do-create-files): Doc fix. (Bug#3...
Conflicts:
etc/NEWS
lisp/mwheel.el
Diffstat (limited to 'lisp/dired-aux.el')
-rw-r--r-- | lisp/dired-aux.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index b837fb4e5ea..e8b5e6755ea 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1842,7 +1842,8 @@ Optional arg HOW-TO determines how to treat the target. rfn-list - list of the relative names for the marked files. fn-list - list of the absolute names for the marked files. target - the name of the target itself. - The rest of into-dir are optional arguments. + The rest of elements of the list returned by HOW-TO are optional + arguments for the function that is the first element of the list. For any other return value, TARGET is treated as a directory." (or op1 (setq op1 operation)) (let* ((fn-list (dired-get-marked-files nil arg nil nil t)) |