summaryrefslogtreecommitdiff
path: root/lisp/eshell/esh-util.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-10-04 19:45:05 +0200
committerAndrea Corallo <akrl@sdf.org>2020-10-04 19:45:05 +0200
commit44ef24342fd8a2ac876212124ebf38673acda35a (patch)
tree793dc4ba4197559b4bc65339d713c0807a7b2ca9 /lisp/eshell/esh-util.el
parentafb765ab3cab7b6582d0def543b23603cd076445 (diff)
parentd8665e6d3473403c90a0831e83439a013d0012d3 (diff)
downloademacs-44ef24342fd8a2ac876212124ebf38673acda35a.tar.gz
emacs-44ef24342fd8a2ac876212124ebf38673acda35a.tar.bz2
emacs-44ef24342fd8a2ac876212124ebf38673acda35a.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/eshell/esh-util.el')
-rw-r--r--lisp/eshell/esh-util.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 0122f9be488..9268921fadc 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -534,7 +534,7 @@ list."
string)))
(defun eshell-directory-files-and-attributes (dir &optional full match nosort id-format)
- "Make sure to use the handler for `directory-file-and-attributes'."
+ "Make sure to use the handler for `directory-files-and-attributes'."
(let* ((dir (expand-file-name dir)))
(if (string-equal (file-remote-p dir 'method) "ftp")
(let ((files (directory-files dir full match nosort)))