aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/eshell/em-basic.el
diff options
context:
space:
mode:
authorAndrea Corallo2020-11-22 22:23:16 +0100
committerAndrea Corallo2020-11-22 22:23:16 +0100
commit033e96055cc172d8d84adc128aee7f7d9889bb00 (patch)
tree4e6e0a24c60f4c8776fb574bf31727dcaf4af4ba /lisp/eshell/em-basic.el
parent6781cd670d1487bbf0364d80de68ca9733342769 (diff)
parent9b6ad3107f93d40f82c3c53dc0984c6d70aded83 (diff)
downloademacs-033e96055cc172d8d84adc128aee7f7d9889bb00.tar.gz
emacs-033e96055cc172d8d84adc128aee7f7d9889bb00.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/eshell/em-basic.el')
-rw-r--r--lisp/eshell/em-basic.el9
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index 6cfc89cce62..e54eab50fc9 100644
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -90,11 +90,10 @@ or `eshell-printn' for display."
90 (car args)) 90 (car args))
91 (t 91 (t
92 (mapcar 92 (mapcar
93 (function 93 (lambda (arg)
94 (lambda (arg) 94 (if (stringp arg)
95 (if (stringp arg) 95 (set-text-properties 0 (length arg) nil arg))
96 (set-text-properties 0 (length arg) nil arg)) 96 arg)
97 arg))
98 args))))) 97 args)))))
99 (if output-newline 98 (if output-newline
100 (cond 99 (cond