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

Support "/dev/null" as a target when creating Eshell handles

Browse source 
Previously, you could only use this when setting the handle afterwards.

Do not merge to master.

* lisp/eshell/esh-io.el (eshell-set-output-handle): Don't catch
'eshell-null-device' here...
(eshell-get-target): ... catch it here.
This commit is contained in:
Jim Porter 2024-08-28 19:12:29 -07:00
parent 4af1dc83ae
commit 5fbbc3d0cd
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -431,11 +431,10 @@ current list of targets."
(when defaultp
(cl-decf (cdar handle))
(setcar handle (cons nil 1)))
(catch 'eshell-null-device
(let ((current (caar handle))
(where (eshell-get-target target mode)))
(unless (member where current)
(setcar (car handle) (append current (list where))))))
(let ((current (caar handle))
(where (eshell-get-target target mode)))
(when (and where (not (member where current)))
(setcar (car handle) (append current (list where)))))
(setcar (cdr handle) nil))))
(defun eshell-copy-output-handle (index index-to-copy &optional handles)
@ -611,11 +610,13 @@ return an `eshell-generic-target' instance; otherwise, return a
marker for a file named TARGET."
(setq mode (or mode 'insert))
(if-let ((redir (assoc raw-target eshell-virtual-targets)))
(let ((target (if (nth 2 redir)
(funcall (nth 1 redir) mode)
(nth 1 redir))))
(unless (eshell-generic-target-p target)
(setq target (eshell-function-target-create target)))
(let (target)
(catch 'eshell-null-device
(setq target (if (nth 2 redir)
(funcall (nth 1 redir) mode)
(nth 1 redir)))
(unless (eshell-generic-target-p target)
(setq target (eshell-function-target-create target))))
target)
(let ((exists (get-file-buffer raw-target))
(buf (find-file-noselect raw-target t)))