aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/eshell
diff options
context:
space:
mode:
authorStefan Monnier2019-06-26 10:24:59 -0400
committerStefan Monnier2019-06-26 10:24:59 -0400
commit0b4e003766f15225dede9bdba4ead33e493856e2 (patch)
tree99de57fe8feeca540f398acb232b75e9c802418c /lisp/eshell
parent699fce296b13d7db386b1cb5cecf2710e5196691 (diff)
downloademacs-0b4e003766f15225dede9bdba4ead33e493856e2.tar.gz
emacs-0b4e003766f15225dede9bdba4ead33e493856e2.zip
Revert "* lisp/calc/calc-ext.el (math-scalarp): Fix typo"
This reverts commit 698ff554ac2699ec48fefc85a1307cbc4a183b0d.
Diffstat (limited to 'lisp/eshell')
-rw-r--r--lisp/eshell/esh-util.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 96e95365f5f..fe8eb35d366 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -306,7 +306,8 @@ Prepend remote identification of `default-directory', if any."
306 (setq m (cdr m)))) 306 (setq m (cdr m))))
307 l) 307 l)
308(define-obsolete-function-alias 308(define-obsolete-function-alias
309 'eshell-uniqify-list #'eshell-uniquify-list "27.1") 309 'eshell-uniqify-list
310 'eshell-uniquify-list "27.1")
310 311
311(defun eshell-stringify (object) 312(defun eshell-stringify (object)
312 "Convert OBJECT into a string value." 313 "Convert OBJECT into a string value."
@@ -325,11 +326,11 @@ Prepend remote identification of `default-directory', if any."
325 326
326(defsubst eshell-stringify-list (args) 327(defsubst eshell-stringify-list (args)
327 "Convert each element of ARGS into a string value." 328 "Convert each element of ARGS into a string value."
328 (mapcar #'eshell-stringify args)) 329 (mapcar 'eshell-stringify args))
329 330
330(defsubst eshell-flatten-and-stringify (&rest args) 331(defsubst eshell-flatten-and-stringify (&rest args)
331 "Flatten and stringify all of the ARGS into a single string." 332 "Flatten and stringify all of the ARGS into a single string."
332 (mapconcat #'eshell-stringify (flatten-tree args) " ")) 333 (mapconcat 'eshell-stringify (flatten-tree args) " "))
333 334
334(defsubst eshell-directory-files (regexp &optional directory) 335(defsubst eshell-directory-files (regexp &optional directory)
335 "Return a list of files in the given DIRECTORY matching REGEXP." 336 "Return a list of files in the given DIRECTORY matching REGEXP."
@@ -525,7 +526,7 @@ Unless optional argument INPLACE is non-nil, return a new string."
525 526
526(defsubst eshell-copy-environment () 527(defsubst eshell-copy-environment ()
527 "Return an unrelated copy of `process-environment'." 528 "Return an unrelated copy of `process-environment'."
528 (mapcar #'concat process-environment)) 529 (mapcar 'concat process-environment))
529 530
530(defun eshell-subgroups (groupsym) 531(defun eshell-subgroups (groupsym)
531 "Return all of the subgroups of GROUPSYM." 532 "Return all of the subgroups of GROUPSYM."