Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/emacs into emacs-30
This commit is contained in:
commit
b0d927e1dc
1 changed files with 2 additions and 2 deletions
|
@ -483,7 +483,7 @@ output."
|
||||||
;; here. However, remote processes don't currently
|
;; here. However, remote processes don't currently
|
||||||
;; support that, and not all systems have SIGPIPE in
|
;; support that, and not all systems have SIGPIPE in
|
||||||
;; the first place (e.g. MS Windows). In these
|
;; the first place (e.g. MS Windows). In these
|
||||||
;; cases, just delete the process; this is
|
;; cases, just kill the process; this is
|
||||||
;; reasonably close to the right behavior, since the
|
;; reasonably close to the right behavior, since the
|
||||||
;; default action for SIGPIPE is to terminate the
|
;; default action for SIGPIPE is to terminate the
|
||||||
;; process. For use cases where SIGPIPE is truly
|
;; process. For use cases where SIGPIPE is truly
|
||||||
|
@ -493,7 +493,7 @@ output."
|
||||||
(eshell-pipe-broken
|
(eshell-pipe-broken
|
||||||
(if (or (process-get proc 'remote-pid)
|
(if (or (process-get proc 'remote-pid)
|
||||||
(eq system-type 'windows-nt))
|
(eq system-type 'windows-nt))
|
||||||
(delete-process proc)
|
(kill-process proc)
|
||||||
(signal-process proc 'SIGPIPE))))))
|
(signal-process proc 'SIGPIPE))))))
|
||||||
(process-put proc :eshell-busy nil))))))
|
(process-put proc :eshell-busy nil))))))
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue