diff options
| author | Jim Porter <jporterbugs@gmail.com> | 2024-08-28 19:12:29 -0700 |
|---|---|---|
| committer | Jim Porter <jporterbugs@gmail.com> | 2024-08-28 19:14:30 -0700 |
| commit | b6f4ffcc106fdbc21dfea45c75fdc4f217d8f201 (patch) | |
| tree | 08693bf3b13a8dbe871183d053541b579ffa72a8 /lisp/eshell | |
| parent | e269cf63a67d529740d0ec2382ae7c3a982cd064 (diff) | |
Support "/dev/null" as a target when creating Eshell handles
Previously, you could only use this when setting the handle afterwards.
* lisp/eshell/esh-io.el (eshell-set-output-handle): Don't catch
'eshell-null-device' here...
(eshell-get-target): ... catch it here.
* test/lisp/eshell/eshell-tests.el
(eshell-test/eshell-command/output-dev-null): New test (bug#72857).
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/esh-io.el | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el index 0fcba9b1474..feb4bf8959f 100644 --- a/lisp/eshell/esh-io.el +++ b/lisp/eshell/esh-io.el @@ -429,11 +429,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) @@ -609,11 +608,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))) |