procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure 'eshell-output-object' always returns nil for consistency

Browse source 
This prevents functions like 'eshell-print' from writing doubled
output when run in Eshell.  Previously, the result would be:

  ~ $ eshell-print hi
  hihi

* lisp/eshell/esh-io.el (eshell-output-object): Always return nil.
This commit is contained in:
Jim Porter 2022-01-19 21:57:38 -08:00 • committed by Lars Ingebrigtsen
parent 76b91671a1
commit 76429f4d17
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lisp/eshell/esh-io.el
View file

@ -491,14 +491,19 @@ Returns what was actually sent, or nil if nothing was sent."
object)
(defun eshell-output-object (object &optional handle-index handles)
"Insert OBJECT, using HANDLE-INDEX specifically)."
"Insert OBJECT, using HANDLE-INDEX specifically.
If HANDLE-INDEX is nil, output to `eshell-output-handle'.
HANDLES is the set of file handles to use; if nil, use
`eshell-current-handles'."
(let ((target (car (aref (or handles eshell-current-handles)
(or handle-index eshell-output-handle)))))
(if (and target (not (listp target)))
(eshell-output-object-to-target object target)
(while target
(eshell-output-object-to-target object (car target))
(setq target (cdr target))))))
(if (listp target)
(while target
(eshell-output-object-to-target object (car target))
(setq target (cdr target)))
(eshell-output-object-to-target object target)
;; Explicitly return nil to match the list case above.
nil)))
(provide 'esh-io)
;;; esh-io.el ends here