From f76d165a5067d65d37bbc9c0c0a9e73943ab92ec Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Wed, 28 Aug 2024 19:12:29 -0700 Subject: [PATCH 2/2] Support "/dev/null" as a target when creating Eshell handles 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. --- lisp/eshell/esh-io.el | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el index 570ace2ebb8..18fd1cdb0ec 100644 --- a/lisp/eshell/esh-io.el +++ b/lisp/eshell/esh-io.el @@ -431,11 +431,10 @@ eshell-set-output-handle (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 @@ eshell-get-target 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))) -- 2.25.1