mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-04 19:10:37 -08:00
* lisp/subr.el (if-let*, when-let*, if-let, when-let): Mark if-let and when-let obsolete (bug#73853 and elsewhere). Move docstring text around so that if-let* and when-let* descriptions no longer refer to if-let and when-let. * etc/NEWS: Announce the change. * admin/admin.el (reminder-for-release-blocking-bugs): * doc/misc/erc.texi (display-buffer): * lisp/ansi-color.el (ansi-color-apply) (ansi-color--face-vec-face): * lisp/ansi-osc.el (ansi-osc-apply-on-region) (ansi-osc-hyperlink): * lisp/arc-mode.el (archive-goto-file) (archive-next-file-displayer): * lisp/auth-source-pass.el (auth-source-pass-search) (auth-source-pass--parse-data) (auth-source-pass--find-match-many): * lisp/autorevert.el (auto-revert-notify-rm-watch): * lisp/buff-menu.el (Buffer-menu-unmark-all-buffers) (Buffer-menu-group-by-root): * lisp/calendar/parse-time.el (parse-iso8601-time-string): * lisp/cedet/pulse.el (pulse-tick): * lisp/comint.el (comint--fontify-input-ppss-flush-indirect) (comint--intersect-regions): * lisp/completion-preview.el (completion-preview--try-table) (completion-preview--capf-wrapper, completion-preview--update): * lisp/cus-edit.el (setopt--set) (custom-dirlocals-maybe-update-cons, custom-dirlocals-validate): * lisp/custom.el (load-theme): * lisp/descr-text.el (describe-char): * lisp/desktop.el (desktop--emacs-pid-running-p): * lisp/dired-x.el (menu): * lisp/dired.el (dired-font-lock-keywords) (dired-insert-directory, dired--insert-disk-space, dired-mode): * lisp/dnd.el (dnd-handle-multiple-urls): * lisp/dom.el (dom-remove-attribute): * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): * lisp/emacs-lisp/bytecomp.el (bytecomp--custom-declare): * lisp/emacs-lisp/comp-common.el (comp-function-type-spec): * lisp/emacs-lisp/comp-cstr.el (comp--all-classes) (comp-cstr-set-range-for-arithm, comp--cstr-union-1-no-mem) (comp-cstr-intersection-no-mem, comp-cstr-fixnum-p) (comp-cstr-type-p): * lisp/emacs-lisp/comp-run.el (comp-subr-trampoline-install) (native--compile-async): * lisp/emacs-lisp/comp.el (comp--get-function-cstr) (comp--function-pure-p, comp--intern-func-in-ctxt) (comp--addr-to-bb-name, comp--emit-assume, comp--maybe-add-vmvar) (comp--add-call-cstr, comp--compute-dominator-tree) (comp--dom-tree-walker, comp--ssa-rename) (comp--function-call-maybe-fold, comp--fwprop-call) (comp--call-optim-func): * lisp/emacs-lisp/edebug.el (edebug-global-prefix) (edebug-remove-instrumentation): * lisp/emacs-lisp/eieio.el (initialize-instance): * lisp/emacs-lisp/ert-x.el (ert-resource-directory): * lisp/emacs-lisp/ert.el (ert--expand-should-1) (ert-test-location, ert-write-junit-test-report) (ert-test--erts-test): * lisp/emacs-lisp/icons.el (icon-complete-spec, icon-string) (icons--create): * lisp/emacs-lisp/lisp-mode.el (lisp--local-defform-body-p): * lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload) (loaddefs-generate--parse-file): * lisp/emacs-lisp/multisession.el (multisession-edit-mode--revert, multisession-edit-value): * lisp/emacs-lisp/package-vc.el (package-vc--read-archive-data) (package-vc--version, package-vc--clone): * lisp/emacs-lisp/package.el (package--reload-previously-loaded): * lisp/emacs-lisp/pp.el (pp--insert-lisp): * lisp/emacs-lisp/subr-x.el (add-display-text-property): * lisp/emacs-lisp/tabulated-list.el (tabulated-list-print): * lisp/emacs-lisp/timer.el (run-at-time): * lisp/emacs-lisp/vtable.el (vtable-goto-table) (vtable-goto-column, vtable-update-object, vtable--insert-line) (vtable--compute-widths, vtable--make-keymap): * lisp/emacs-lisp/warnings.el (display-warning): * lisp/epa-file.el (epa-file-insert-file-contents): * lisp/epa.el (epa-show-key): * lisp/erc/erc-backend.el (erc--split-line, erc--conceal-prompt) (PRIVMSG, erc--get-isupport-entry): * lisp/erc/erc-button.el (erc-button-add-nickname-buttons) (erc--button-next): * lisp/erc/erc-common.el (erc--find-group): * lisp/erc/erc-fill.el (erc-fill, erc-fill-static) (erc-fill--wrap-escape-hidden-speaker) (erc-fill--wrap-unmerge-on-date-stamp) (erc-fill--wrap-massage-initial-message-post-clear) (erc-fill-wrap, erc-fill--wrap-rejigger-region): * lisp/erc/erc-goodies.el (erc--scrolltobottom-all) (erc--keep-place-indicator-on-window-buffer-change) (keep-place-indicator, erc--keep-place-indicator-adjust-on-clear) (erc-keep-place-move, erc--command-indicator-display): * lisp/erc/erc-ibuffer.el (erc-members): * lisp/erc/erc-join.el (erc-join--remove-requested-channel) (erc-autojoin--join): * lisp/erc/erc-networks.el (erc-networks--id-qualifying-init-parts, erc-networks--id-reload) (erc-networks--id-ensure-comparable) (erc-networks--reclaim-orphaned-target-buffers) (erc-networks--server-select): * lisp/erc/erc-nicks.el (erc-nicks-invert) (erc-nicks--redirect-face-widget-link, erc-nicks--highlight) (erc-nicks--highlight-button) (erc-nicks--list-faces-help-button-action, erc-nicks-list-faces) (erc-nicks-refresh, erc-nicks--colors-from-faces) (erc-nicks--track-prioritize) (erc-nicks--remember-face-for-track): * lisp/erc/erc-notify.el (querypoll, erc--querypoll-get-next) (erc--querypoll-on-352, erc--querypoll-send): * lisp/erc/erc-sasl.el (erc-sasl--read-password): * lisp/erc/erc-services.el (erc-services-issue-ghost-and-retry-nick): * lisp/erc/erc-speedbar.el (erc-speedbar--ensure, nickbar) (erc-speedbar-toggle-nicknames-window-lock) (erc-speedbar--compose-nicks-face): * lisp/erc/erc-stamp.el (erc-stamp--recover-on-reconnect) (erc-stamp-prefix-log-filter, erc--conceal-prompt) (erc--insert-timestamp-left, erc-insert-timestamp-right) (erc-stamp--defer-date-insertion-on-post-modify) (erc-insert-timestamp-left-and-right) (erc-stamp--redo-right-stamp-post-clear) (erc-stamp--reset-on-clear, erc-stamp--dedupe-date-stamps): * lisp/erc/erc-status-sidebar.el (bufbar) (erc-status-sidebar-prefer-target-as-name) (erc-status-sidebar-default-allsort, erc-status-sidebar-click): * lisp/erc/erc-track.el (erc-track--shortened-names-get) (erc-track--setup, erc-track--select-mode-line-face) (erc-track-modified-channels, erc-track--collect-faces-in) (erc-track--switch-buffer, erc-track--replace-killed-buffer): * lisp/erc/erc-truncate.el (erc-truncate--setup) (erc-truncate-buffer): * lisp/erc/erc.el (erc--ensure-query-member) (erc--ensure-query-members, erc--remove-channel-users-but) (erc--cusr-change-status, erc--find-mode, erc--update-modules) (erc-log-irc-protocol, erc--refresh-prompt) (erc--restore-important-text-props) (erc--order-text-properties-from-hash, erc-send-input-line) (erc-cmd-IGNORE, erc--unignore-user, erc-cmd-QUERY) (erc-cmd-BANLIST, erc--speakerize-nick) (erc--format-speaker-input-message, erc-channel-receive-names) (erc-send-current-line, erc-format-target-and/or-network) (erc-kill-buffer-function, erc-restore-text-properties) (erc--get-eq-comparable-cmd): * lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias--which) (eshell-maybe-replace-by-alias): * lisp/eshell/em-glob.el (eshell-glob-convert): * lisp/eshell/em-pred.el (eshell-pred-user-or-group) (eshell-pred-file-time, eshell-pred-file-type) (eshell-pred-file-mode, eshell-pred-file-links) (eshell-pred-file-size): * lisp/eshell/em-prompt.el (eshell-forward-paragraph) (eshell-next-prompt): * lisp/eshell/esh-arg.el (eshell-resolve-current-argument): * lisp/eshell/esh-cmd.el (eshell-do-eval, eshell/which) (eshell-plain-command--which, eshell-plain-command): * lisp/eshell/esh-io.el (eshell-duplicate-handles) (eshell-protect-handles, eshell-get-target, eshell-close-target): * lisp/eshell/esh-proc.el (eshell-sentinel): * lisp/eshell/esh-var.el (eshell-parse-variable-ref) (eshell-get-variable, eshell-set-variable): * lisp/faces.el (face-at-point): * lisp/ffap.el (ffap-in-project): * lisp/filenotify.el (file-notify--rm-descriptor): * lisp/files-x.el (read-dir-locals-file) (connection-local-update-profile-variables) (connection-local-value): * lisp/files.el (file-remote-p, abbreviate-file-name) (set-auto-mode, hack-local-variables) (revert-buffer-restore-read-only): * lisp/find-dired.el (find-dired-sort-by-filename): * lisp/font-lock.el (font-lock--filter-keywords): * lisp/gnus/gnus-art.el (article-emojize-symbols): * lisp/gnus/gnus-int.el (gnus-close-server): * lisp/gnus/gnus-search.el (gnus-search-transform) (gnus-search-indexed-parse-output, gnus-search-server-to-engine): * lisp/gnus/gnus-sum.el (gnus-collect-urls, gnus-shorten-url): * lisp/gnus/gnus.el (gnus-check-backend-function): * lisp/gnus/message.el (message-send-mail): * lisp/gnus/mml.el (mml-generate-mime, mml-insert-mime-headers): * lisp/gnus/nnatom.el (nnatom--read-feed, nnatom--read-article) (nnatom--read-article-or-group-authors, nnatom--read-publish) (nnatom--read-update, nnatom--read-links): * lisp/gnus/nnfeed.el (nnfeed--read-server, nnfeed--write-server) (nnfeed--parse-feed, nnfeed--group-data, nnfeed-retrieve-article) (nnfeed-retrieve-headers, nnfeed--print-part) (nnfeed-request-article, nnfeed-request-group) (nnfeed-request-list, nnfeed--group-description) (nnfeed-request-group-description) (nnfeed-request-list-newsgroups, nnfeed-request-rename-group): * lisp/gnus/nnmh.el (nnmh-update-gnus-unreads): * lisp/help-fns.el (help-find-source) (help-fns--insert-menu-bindings, help-fns--mention-first-release) (help-fns--mention-shortdoc-groups) (help-fns--customize-variable-version) (help-fns--face-custom-version-info, describe-mode): * lisp/help-mode.el (help-make-xrefs): * lisp/help.el (help-key-description, help--describe-command): * lisp/hfy-cmap.el (htmlfontify-load-rgb-file): * lisp/ibuf-ext.el (ibuffer-jump-to-filter-group) (ibuffer-kill-filter-group, ibuffer-kill-line) (ibuffer-save-filter-groups, ibuffer-save-filters, filename) (basename, file-extension, ibuffer-diff-buffer-with-file-1) (ibuffer-mark-by-file-name-regexp) (ibuffer-mark-by-content-regexp): * lisp/ibuf-macs.el (ibuffer-aif, ibuffer-awhen): * lisp/ibuffer.el (ibuffer-mouse-toggle-mark) (ibuffer-toggle-marks, ibuffer-mark-interactive) (ibuffer-compile-format, process, ibuffer-map-lines): * lisp/image.el (image--compute-map) (image--compute-original-map): * lisp/image/exif.el (exif-parse-buffer): * lisp/image/image-converter.el (image-convert-p, image-convert) (image-converter--find-converter): * lisp/image/image-dired-util.el (image-dired-file-name-at-point): * lisp/image/image-dired.el (image-dired-track-original-file) (image-dired--on-file-in-dired-buffer) (image-dired--with-thumbnail-buffer) (image-dired-jump-original-dired-buffer) (image-dired--slideshow-step, image-dired-display-image): * lisp/image/wallpaper.el (wallpaper--init-action-kill) (wallpaper--find-setter, wallpaper--find-command) (wallpaper--find-command-args, wallpaper--x-monitor-name): * lisp/info-look.el (info-lookup-interactive-arguments) (info-complete)::(:mode): * lisp/info.el (info-pop-to-buffer, Info-read-node-name-1): * lisp/international/emoji.el (emoji--adjust-displayable-1) (emoji--add-recent): * lisp/jsonrpc.el (jsonrpc--call-deferred) (jsonrpc--process-sentinel, jsonrpc--remove): * lisp/keymap.el (keymap-local-lookup): * lisp/mail/emacsbug.el (report-emacs-bug-hook) (submit-emacs-patch): * lisp/mail/ietf-drums.el (ietf-drums-parse-addresses): * lisp/mail/mailclient.el (mailclient-send-it): * lisp/mail/rfc6068.el (rfc6068-parse-mailto-url): * lisp/mail/undigest.el (rmail-digest-parse-mixed-mime): * lisp/minibuffer.el (completion-metadata-get) (completions--after-change) (minibuffer-visible-completions--filter): * lisp/net/browse-url.el (browse-url-url-at-point) (browse-url-file-url, browse-url-emacs): * lisp/net/dbus.el (dbus-byte-array-to-string) (dbus-monitor-goto-serial): * lisp/net/dictionary.el (dictionary-search): * lisp/net/eww.el (eww--download-directory) (eww-auto-rename-buffer, eww-open-in-new-buffer, eww-submit) (eww-follow-link, eww-read-alternate-url) (eww-copy-alternate-url): * lisp/net/goto-addr.el (goto-address-at-point): * lisp/net/mailcap.el (mailcap-mime-info): * lisp/net/rcirc.el (rcirc, rcirc-connect, rcirc-send-string) (rcirc-kill-buffer-hook, rcirc-print, rcirc-when) (rcirc-color-attributes, rcirc-handler-NICK) (rcirc-handler-TAGMSG, rcirc-handler-BATCH): * lisp/net/shr.el (shr-descend, shr-adaptive-fill-function) (shr-correct-dom-case, shr-tag-a): * lisp/net/sieve.el (sieve-manage-quit): * lisp/outline.el (outline-cycle-buffer): * lisp/pcmpl-git.el (pcmpl-git--tracked-file-predicate): * lisp/proced.el (proced-auto-update-timer): * lisp/progmodes/bug-reference.el (bug-reference-try-setup-from-vc): * lisp/progmodes/c-ts-common.el (c-ts-common--fill-paragraph): * lisp/progmodes/c-ts-mode.el (c-ts-mode--preproc-offset) (c-ts-mode--anchor-prev-sibling, c-ts-mode-indent-defun): * lisp/progmodes/compile.el (compilation-error-properties) (compilation-find-file-1): * lisp/progmodes/eglot.el (eglot--check-object) (eglot--read-server, eglot-upgrade-eglot) (eglot-handle-notification, eglot--CompletionParams) (eglot-completion-at-point, eglot--sig-info) (eglot-register-capability): * lisp/progmodes/elisp-mode.el (emacs-lisp-native-compile-and-load) (elisp-eldoc-var-docstring-with-value): * lisp/progmodes/erts-mode.el (erts-mode--goto-start-of-test): * lisp/progmodes/flymake.el (flymake--update-eol-overlays) (flymake-eldoc-function): * lisp/progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom) (gdb-frame-handler): * lisp/progmodes/go-ts-mode.el (go-ts-mode-docstring) (go-ts-mode--comment-on-previous-line-p) (go-ts-mode--get-test-regexp-at-point) (go-ts-mode-test-this-file): * lisp/progmodes/grep.el (lgrep, rgrep-default-command) (grep-file-at-point): * lisp/progmodes/perl-mode.el (perl--end-of-format-p): * lisp/progmodes/php-ts-mode.el (php-ts-mode--anchor-prev-sibling, php-ts-mode--indent-defun): * lisp/progmodes/project.el (project--other-place-command) (project--find-default-from, project--transplant-file-name) (project-prefixed-buffer-name, project--remove-from-project-list) (project-prompt-project-name, project-remember-projects-under) (project--switch-project-command) (project-uniquify-dirname-transform, project-mode-line-format): * lisp/progmodes/python.el (python-font-lock-keywords-maximum-decoration) (python--treesit-fontify-union-types) (python-shell-get-process-name, python-shell-restart) (python-shell-completion-at-point, python-ffap-module-path) (python-util-comint-end-of-output-p, python--import-sources) (python-add-import, python-remove-import, python-fix-imports): * lisp/progmodes/xref.el (xref--add-log-current-defun): * lisp/repeat.el (repeat-echo-message-string): * lisp/saveplace.el (save-place-dired-hook): * lisp/server.el (server-save-buffers-kill-terminal): * lisp/shadowfile.el (shadow-make-fullname) (shadow-contract-file-name, shadow-define-literal-group): * lisp/shell.el (shell-highlight-undef-mode): * lisp/simple.el (command-completion-using-modes-p) (command-execute, file-user-uid, file-group-gid) (first-completion, last-completion, switch-to-completions): * lisp/startup.el (startup--load-user-init-file): * lisp/tab-line.el (tab-line-tabs-buffer-group-by-project): * lisp/tar-mode.el (tar-goto-file, tar-next-file-displayer): * lisp/term/android-win.el (android-encode-select-string) (gui-backend-set-selection): * lisp/term/haiku-win.el (haiku-dnd-convert-string) (haiku-select-encode-xstring, haiku-select-encode-utf-8-string): * lisp/textmodes/emacs-news-mode.el (emacs-news--buttonize): * lisp/textmodes/ispell.el (ispell-completion-at-point): * lisp/textmodes/sgml-mode.el (sgml-validate) (html-mode--complete-at-point): * lisp/textmodes/tex-mode.el (tex-recenter-output-buffer) (xref-backend-references): * lisp/thingatpt.el (thing-at-point-file-at-point) (thing-at-point-face-at-point): * lisp/thread.el (thread-list--get-status): * lisp/time.el (world-clock-copy-time-as-kill, world-clock): * lisp/touch-screen.el (touch-screen-handle-touch): * lisp/treesit.el (treesit-language-at, treesit-node-at) (treesit-node-on, treesit-buffer-root-node) (treesit-node-field-name, treesit-local-parsers-at) (treesit-local-parsers-on, treesit--cleanup-local-range-overlays) (treesit-font-lock-recompute-features) (treesit-font-lock-fontify-region, treesit-transpose-sexps) (treesit-add-log-current-defun, treesit-major-mode-setup) (treesit--explorer-refresh, treesit-install-language-grammar): * lisp/url/url.el (url-retrieve-synchronously): * lisp/vc/smerge-mode.el (smerge-diff): * lisp/vc/vc-dir.el (vc-dir): * lisp/vc/vc-dispatcher.el (vc-do-async-command): * lisp/vc/vc-git.el (vc-git-dir--branch-headers) (vc-git-dir--stash-headers, vc-git--log-edit-summary-check) (vc-git-stash-list): * lisp/vc/vc.el (vc-responsible-backend, vc-buffer-sync-fileset) (vc-clone): * lisp/visual-wrap.el (visual-wrap--apply-to-line): * lisp/wid-edit.el (widget-text) (widget-editable-list-insert-before): * lisp/window-tool-bar.el (window-tool-bar--keymap-entry-to-string): * lisp/window.el (display-buffer, display-buffer-full-frame) (window-point-context-set, window-point-context-use) (window-point-context-use-default-function): * lisp/xdg.el (xdg-current-desktop): * lisp/xwidget.el (xwidget-webkit-callback): * lisp/yank-media.el (yank-media--get-selection) (yank-media-types): * test/lisp/comint-tests.el (comint-tests/test-password-function): * test/lisp/completion-preview-tests.el (completion-preview-tests--capf): * test/lisp/cus-edit-tests.el (with-cus-edit-test): * test/lisp/erc/erc-scenarios-base-local-modules.el (-phony-sblm-): * test/lisp/erc/erc-scenarios-stamp.el (erc-scenarios-stamp--on-post-modify): * test/lisp/erc/erc-services-tests.el (erc-services-tests--asp-parse-entry): * test/lisp/erc/erc-tests.el (erc-modules--internal-property) (erc--find-mode, erc-tests--update-modules): * test/lisp/erc/resources/erc-d/erc-d-i.el (erc-d-i--parse-message): * test/lisp/erc/resources/erc-d/erc-d-t.el (erc-d-t-kill-related-buffers, erc-d-t-with-cleanup): * test/lisp/erc/resources/erc-d/erc-d-tests.el (erc-d-i--parse-message--irc-parser-tests): * test/lisp/erc/resources/erc-d/erc-d-u.el (erc-d-u--read-exchange-slowly): * test/lisp/erc/resources/erc-d/erc-d.el (erc-d--expire) (erc-d--finalize-done, erc-d--command-handle-all): * test/lisp/erc/resources/erc-scenarios-common.el (erc-scenarios-common-with-cleanup): * test/lisp/erc/resources/erc-tests-common.el (erc-tests--common-display-message) (erc-tests-common-create-subprocess): * test/lisp/ibuffer-tests.el (ibuffer-test-Bug25058): * test/lisp/international/mule-tests.el (mule-cmds-tests--ucs-names-missing-names): * test/lisp/progmodes/python-tests.el (python-tests-get-shell-interpreter) (python-tests--get-interpreter-info): * test/lisp/progmodes/ruby-ts-mode-tests.el (ruby-ts-resource-file): * test/lisp/replace-tests.el (replace-tests-with-undo): * test/src/emacs-tests.el (emacs-tests--seccomp-debug): * test/src/process-tests.el (process-tests--emacs-command) (process-tests--emacs-binary, process-tests--dump-file): * test/src/treesit-tests.el (treesit--ert-test-defun-navigation): Replace use of the now-obsolete if-let and when-let.
757 lines
31 KiB
EmacsLisp
757 lines
31 KiB
EmacsLisp
;;; esh-proc.el --- process management -*- lexical-binding:t -*-
|
|
|
|
;; Copyright (C) 1999-2024 Free Software Foundation, Inc.
|
|
|
|
;; Author: John Wiegley <johnw@gnu.org>
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(require 'esh-arg)
|
|
(require 'esh-io)
|
|
(require 'esh-opt)
|
|
(require 'esh-util)
|
|
|
|
(require 'pcomplete)
|
|
|
|
(defgroup eshell-proc nil
|
|
"When Eshell invokes external commands, it always does so
|
|
asynchronously, so that Emacs isn't tied up waiting for the process to
|
|
finish."
|
|
:tag "Process management"
|
|
:group 'eshell)
|
|
|
|
;;; User Variables:
|
|
|
|
(defcustom eshell-proc-load-hook nil
|
|
"A hook that gets run when `eshell-proc' is loaded."
|
|
:version "24.1" ; removed eshell-proc-initialize
|
|
:type 'hook)
|
|
|
|
(defcustom eshell-process-wait-time 0.05
|
|
"The number of seconds to delay waiting for a synchronous process."
|
|
:version "30.1"
|
|
:type 'number)
|
|
|
|
(defcustom eshell-process-wait-seconds 0
|
|
"The number of seconds to delay waiting for a synchronous process."
|
|
:type 'integer)
|
|
(make-obsolete-variable 'eshell-process-wait-seconds
|
|
'eshell-process-wait-time "30.1")
|
|
|
|
(defcustom eshell-process-wait-milliseconds 50
|
|
"The number of milliseconds to delay waiting for a synchronous process."
|
|
:type 'integer)
|
|
(make-obsolete-variable 'eshell-process-wait-milliseconds
|
|
'eshell-process-wait-time "30.1")
|
|
|
|
(defcustom eshell-done-messages-in-minibuffer t
|
|
"If non-nil, subjob \"Done\" messages will display in minibuffer."
|
|
:type 'boolean)
|
|
|
|
(defcustom eshell-delete-exited-processes t
|
|
"If nil, process entries will stick around until `jobs' is run.
|
|
This variable sets the buffer-local value of `delete-exited-processes'
|
|
in Eshell buffers.
|
|
|
|
This variable causes Eshell to mimic the behavior of bash when set to
|
|
nil. It allows the user to view the exit status of a completed subjob
|
|
\(process) at their leisure, because the process entry remains in
|
|
memory until the user examines it using \\[list-processes].
|
|
|
|
Otherwise, if `eshell-done-messages-in-minibuffer' is nil, and this
|
|
variable is set to t, the only indication the user will have that a
|
|
subjob is done is that it will no longer appear in the
|
|
\\[list-processes\\] display.
|
|
|
|
Note that Eshell will have to be restarted for a change in this
|
|
variable's value to take effect."
|
|
:type 'boolean)
|
|
|
|
(defcustom eshell-reset-signals
|
|
"^\\(interrupt\\|killed\\|quit\\|stopped\\)"
|
|
"If a termination signal matches this regexp, the terminal will be reset."
|
|
:type 'regexp)
|
|
|
|
(defcustom eshell-exec-hook nil
|
|
"Called each time a process is exec'd by `eshell-gather-process-output'.
|
|
It is passed one argument, which is the process that was just started.
|
|
It is useful for things that must be done each time a process is
|
|
executed in an eshell mode buffer (e.g., `set-process-query-on-exit-flag').
|
|
In contrast, `eshell-mode-hook' is only executed once, when the buffer
|
|
is created."
|
|
:type 'hook)
|
|
|
|
(defcustom eshell-kill-hook nil
|
|
"Called when a process run by `eshell-gather-process-output' has ended.
|
|
It is passed two arguments: the process that was just ended, and the
|
|
termination status (as a string). Note that the first argument may be
|
|
nil, in which case the user attempted to send a signal, but there was
|
|
no relevant process. This can be used for displaying help
|
|
information, for example."
|
|
:version "24.1" ; removed eshell-reset-after-proc
|
|
:type 'hook)
|
|
|
|
;;; Internal Variables:
|
|
|
|
(defvar eshell-supports-asynchronous-processes (fboundp 'make-process)
|
|
"Non-nil if Eshell can create asynchronous processes.")
|
|
|
|
(defvar eshell-subjob-messages t
|
|
"Non-nil if we should print process start/end messages for subjobs.")
|
|
(defvar eshell-current-subjob-p nil)
|
|
|
|
(defvar eshell-process-list nil
|
|
"A list of the current status of subprocesses.
|
|
Each element has the form (PROC . SUBJOB-P), where PROC is the
|
|
process object and SUBJOB-P is non-nil if the process is a
|
|
subjob.
|
|
|
|
To add or remove elements of this list, see
|
|
`eshell-record-process-object' and `eshell-remove-process-entry'.")
|
|
|
|
(declare-function eshell-reset "esh-mode" (&optional no-hooks))
|
|
(declare-function eshell-send-eof-to-process "esh-mode")
|
|
(declare-function eshell-interactive-output-filter "esh-mode" (buffer string))
|
|
(declare-function eshell-set-exit-info "esh-cmd" (status result))
|
|
(declare-function eshell-tail-process "esh-cmd")
|
|
|
|
(defvar-keymap eshell-proc-mode-map
|
|
"C-c M-i" #'eshell-insert-process
|
|
"C-c C-c" #'eshell-interrupt-process
|
|
"C-c C-k" #'eshell-kill-process
|
|
"C-c C-d" #'eshell-send-eof-to-process
|
|
"C-c C-s" #'list-processes
|
|
"C-c C-\\" #'eshell-quit-process)
|
|
|
|
;;; Functions:
|
|
|
|
(defun eshell-kill-process-function (proc status)
|
|
"Function run when killing a process.
|
|
Runs `eshell-reset-after-proc' and `eshell-kill-hook', passing arguments
|
|
PROC and STATUS to functions on the latter."
|
|
(declare (obsolete nil "30.1"))
|
|
;; Was there till 24.1, but it is not optional.
|
|
(remove-hook 'eshell-kill-hook #'eshell-reset-after-proc)
|
|
;; Only reset the prompt if this process is running interactively.
|
|
(when (eq proc (eshell-tail-process))
|
|
(eshell-reset-after-proc status))
|
|
(run-hook-with-args 'eshell-kill-hook proc status))
|
|
|
|
(define-minor-mode eshell-proc-mode
|
|
"Minor mode for the proc eshell module.
|
|
|
|
\\{eshell-proc-mode-map}"
|
|
:keymap eshell-proc-mode-map)
|
|
|
|
(defun eshell-proc-initialize () ;Called from `eshell-mode' via intern-soft!
|
|
"Initialize the process handling code."
|
|
(make-local-variable 'eshell-process-list)
|
|
(setq-local eshell-special-ref-alist
|
|
(cons
|
|
`("process"
|
|
(creation-function get-process)
|
|
(insertion-function eshell-insert-process)
|
|
(completion-function eshell-complete-process-ref))
|
|
eshell-special-ref-alist))
|
|
|
|
(eshell-proc-mode))
|
|
|
|
(define-obsolete-function-alias 'eshell-reset-after-proc
|
|
'eshell--reset-after-signal "30.1")
|
|
|
|
(defun eshell-process-active-p (process)
|
|
"Return non-nil if PROCESS is active.
|
|
This is like `process-live-p', but additionally checks whether
|
|
`eshell-sentinel' has finished all of its work yet."
|
|
(or (process-live-p process)
|
|
;; If we have handles, this is an Eshell-managed
|
|
;; process. Wait until we're 100% done and have
|
|
;; cleared out the handles (see `eshell-sentinel').
|
|
(process-get process :eshell-handles)))
|
|
|
|
(defun eshell-wait-for-processes (&optional procs timeout)
|
|
"Wait until PROCS have completed execution.
|
|
If TIMEOUT is non-nil, wait at most that many seconds. Return non-nil
|
|
if all the processes finished executing before the timeout expired."
|
|
(let ((expiration (when timeout (time-add (current-time) timeout))))
|
|
(catch 'timeout
|
|
(dolist (proc procs)
|
|
(while (if (processp proc)
|
|
(eshell-process-active-p proc)
|
|
(process-attributes proc))
|
|
(when (input-pending-p)
|
|
(discard-input))
|
|
(when (and expiration
|
|
(not (time-less-p (current-time) expiration)))
|
|
(throw 'timeout nil))
|
|
(sit-for eshell-process-wait-time)))
|
|
t)))
|
|
|
|
(defun eshell-wait-for-process (&rest procs)
|
|
"Wait until PROCS have completed execution."
|
|
(declare (obsolete 'eshell-wait-for-processes "31.1"))
|
|
(eshell-wait-for-processes procs))
|
|
|
|
(defun eshell/wait (&rest args)
|
|
"Wait until processes have completed execution."
|
|
(eshell-eval-using-options
|
|
"wait" args
|
|
'((?h "help" nil nil "show this usage screen")
|
|
(?t "timeout" t timeout "timeout in seconds")
|
|
:preserve-args
|
|
:show-usage
|
|
:usage "[OPTION] PROCESS...
|
|
Wait until PROCESS(es) have completed execution.")
|
|
(when (stringp timeout)
|
|
(setq timeout (string-to-number timeout)))
|
|
(dolist (arg args)
|
|
(unless (or (processp arg) (natnump arg))
|
|
(error "wait: invalid argument type: %s" (type-of arg))))
|
|
(unless (eshell-wait-for-processes args timeout)
|
|
(error "wait: timed out after %s seconds" timeout))))
|
|
|
|
(defun eshell/jobs ()
|
|
"List processes, if there are any."
|
|
(and (fboundp 'process-list)
|
|
(process-list)
|
|
(list-processes)))
|
|
|
|
(defun eshell/kill (&rest args)
|
|
"Kill processes.
|
|
Usage: kill [-<signal>] <pid>|<process> ...
|
|
Accepts PIDs and process objects. Optionally accept signals
|
|
and signal names."
|
|
(let ((signum 'SIGINT))
|
|
(let ((arg (car args))
|
|
(case-fold-search nil))
|
|
(when (stringp arg)
|
|
;; If the first argument starts with a dash, treat it as the
|
|
;; signal specifier.
|
|
(cond
|
|
((string-match "\\`-[[:digit:]]+\\'" arg)
|
|
(setq signum (abs (string-to-number arg)))
|
|
(pop args))
|
|
((string-match "\\`-\\([[:upper:]]+\\|[[:lower:]]+\\)\\'" arg)
|
|
(setq signum (intern (substring arg 1)))
|
|
(pop args)))))
|
|
(dolist (proc args)
|
|
(when (stringp proc)
|
|
(setq proc (string-to-number proc)))
|
|
(let ((result
|
|
(cond
|
|
((numberp proc)
|
|
(when (<= proc 0)
|
|
(error "kill: bad pid: %d" proc))
|
|
(signal-process proc signum (file-remote-p default-directory)))
|
|
((eshell-processp proc)
|
|
(signal-process proc signum))
|
|
(t
|
|
(error "kill: invalid argument type: %s" (type-of proc))))))
|
|
(when (= result -1)
|
|
(error "kill: failed to kill process %s" proc))))))
|
|
|
|
(put 'eshell/kill 'eshell-no-numeric-conversions t)
|
|
|
|
(defsubst eshell-record-process-object (object)
|
|
"Record OBJECT as now running."
|
|
(when (and eshell-subjob-messages
|
|
eshell-current-subjob-p
|
|
(eshell-processp object))
|
|
(require 'esh-mode)
|
|
(declare-function eshell-interactive-print "esh-mode" (string))
|
|
(eshell-interactive-print
|
|
(format "[%s] %d\n" (process-name object) (process-id object))))
|
|
(push (cons object eshell-current-subjob-p) eshell-process-list))
|
|
|
|
(defun eshell-remove-process-entry (entry)
|
|
"Record the process ENTRY as fully completed."
|
|
(when (and eshell-subjob-messages
|
|
eshell-done-messages-in-minibuffer
|
|
(eshell-processp (car entry))
|
|
(cdr entry))
|
|
(message "[%s]+ Done %s" (process-name (car entry))
|
|
(process-command (car entry))))
|
|
(setq eshell-process-list
|
|
(delq entry eshell-process-list)))
|
|
|
|
(defun eshell-record-process-properties (process &optional index)
|
|
"Record Eshell bookkeeping properties for PROCESS.
|
|
`eshell-insertion-filter' and `eshell-sentinel' will use these to
|
|
do their jobs.
|
|
|
|
INDEX is the index of the output handle to use for writing; if
|
|
nil, write to `eshell-output-handle'."
|
|
(process-put process :eshell-handles eshell-current-handles)
|
|
(process-put process :eshell-handle-index (or index eshell-output-handle))
|
|
(process-put process :eshell-pending nil)
|
|
(process-put process :eshell-busy nil))
|
|
|
|
(defvar eshell-scratch-buffer " *eshell-scratch*"
|
|
"Scratch buffer for holding Eshell's input/output.")
|
|
(defvar eshell-last-sync-output-start nil
|
|
"A marker that tracks the beginning of output of the last subprocess.
|
|
Used only on systems which do not support async subprocesses.")
|
|
|
|
(defvar tramp-remote-path)
|
|
|
|
(defun eshell-gather-process-output (command args)
|
|
"Gather the output from COMMAND + ARGS."
|
|
(require 'esh-var)
|
|
(declare-function eshell-environment-variables "esh-var" ())
|
|
(unless (and (file-executable-p command)
|
|
(file-regular-p (file-truename command)))
|
|
(error "%s: not an executable file" command))
|
|
(let* ((real-path (getenv "PATH"))
|
|
(tramp-remote-path (bound-and-true-p tramp-remote-path))
|
|
(delete-exited-processes
|
|
(if eshell-current-subjob-p
|
|
eshell-delete-exited-processes
|
|
delete-exited-processes))
|
|
(process-environment (eshell-environment-variables))
|
|
(coding-system-for-read coding-system-for-read)
|
|
(coding-system-for-write coding-system-for-write)
|
|
proc stderr-proc decoding encoding changed)
|
|
;; HACK: We want to supply our subprocess with the all the
|
|
;; environment variables we've set in Eshell. However, supplying
|
|
;; a remote PATH this way can break Tramp, which needs the *local*
|
|
;; PATH for calling "ssh", etc. Instead, set the local path in
|
|
;; our `process-environment' and pass the remote PATH via
|
|
;; `tramp-remote-path'. (If we handle this some better way in the
|
|
;; future, remember to remove `tramp-remote-path' above, too.)
|
|
(when (file-remote-p default-directory)
|
|
(push (concat "PATH=" real-path) process-environment)
|
|
(setq tramp-remote-path (eshell-get-path t)))
|
|
;; MS-Windows needs special setting of encoding/decoding, because
|
|
;; (a) non-ASCII text in command-line arguments needs to be
|
|
;; encoded in the system's codepage; and (b) because many Windows
|
|
;; programs will always interpret any non-ASCII input as encoded
|
|
;; in the system codepage.
|
|
(when (eq system-type 'windows-nt)
|
|
(or coding-system-for-read ; Honor manual decoding settings
|
|
(setq coding-system-for-read
|
|
(coding-system-change-eol-conversion locale-coding-system
|
|
'dos)))
|
|
(or coding-system-for-write ; Honor manual encoding settings
|
|
(setq coding-system-for-write
|
|
(coding-system-change-eol-conversion locale-coding-system
|
|
'unix))))
|
|
(cond
|
|
(eshell-supports-asynchronous-processes
|
|
(unless (or ;; FIXME: It's not currently possible to use a
|
|
;; stderr process for remote files.
|
|
(file-remote-p default-directory)
|
|
(equal (car (aref eshell-current-handles
|
|
eshell-output-handle))
|
|
(car (aref eshell-current-handles
|
|
eshell-error-handle))))
|
|
(eshell-protect-handles eshell-current-handles)
|
|
(setq stderr-proc
|
|
(make-pipe-process
|
|
:name (concat (file-name-nondirectory command) "-stderr")
|
|
:buffer (current-buffer)
|
|
:filter (if (eshell-interactive-output-p eshell-error-handle)
|
|
#'eshell-interactive-process-filter
|
|
#'eshell-insertion-filter)
|
|
:sentinel #'eshell-sentinel))
|
|
(eshell-record-process-properties stderr-proc eshell-error-handle))
|
|
(eshell-protect-handles eshell-current-handles)
|
|
(setq proc
|
|
(let ((command (file-local-name (expand-file-name command)))
|
|
(conn-type (pcase (bound-and-true-p eshell-in-pipeline-p)
|
|
('first '(nil . pipe))
|
|
('last '(pipe . nil))
|
|
('t 'pipe)
|
|
('nil nil))))
|
|
(make-process
|
|
:name (file-name-nondirectory command)
|
|
:buffer (current-buffer)
|
|
:command (cons command args)
|
|
:filter (if (eshell-interactive-output-p)
|
|
#'eshell-interactive-process-filter
|
|
#'eshell-insertion-filter)
|
|
:sentinel #'eshell-sentinel
|
|
:connection-type conn-type
|
|
:stderr stderr-proc
|
|
:file-handler t)))
|
|
(eshell-debug-command 'process
|
|
"started external process `%s'\n\n%s" proc
|
|
(mapconcat #'shell-quote-argument (process-command proc) " "))
|
|
(eshell-record-process-object proc)
|
|
(eshell-record-process-properties proc)
|
|
;; Don't set exit info for processes being piped elsewhere.
|
|
(when (memq (bound-and-true-p eshell-in-pipeline-p) '(nil last))
|
|
(process-put proc :eshell-set-exit-info t))
|
|
(when stderr-proc
|
|
;; Provide a shared flag between the primary and stderr
|
|
;; processes. This lets the primary process wait to clean up
|
|
;; until stderr is totally finished (see `eshell-sentinel').
|
|
(let ((stderr-live (list t)))
|
|
(process-put proc :eshell-stderr-live stderr-live)
|
|
(process-put stderr-proc :eshell-stderr-live stderr-live)))
|
|
(run-hook-with-args 'eshell-exec-hook proc)
|
|
(when (fboundp 'process-coding-system)
|
|
(let ((coding-systems (process-coding-system proc)))
|
|
(setq decoding (car coding-systems)
|
|
encoding (cdr coding-systems)))
|
|
;; If `make-process' decided to use some coding system for
|
|
;; decoding data sent from the process and the coding system
|
|
;; doesn't specify EOL conversion, we had better convert CRLF
|
|
;; to LF.
|
|
(if (vectorp (coding-system-eol-type decoding))
|
|
(setq decoding (coding-system-change-eol-conversion decoding 'dos)
|
|
changed t))
|
|
;; Even if `make-process' left the coding system for encoding
|
|
;; data sent to the process undecided, we had better use the
|
|
;; same one as what we use for decoding. But, we should
|
|
;; suppress EOL conversion.
|
|
(if (and decoding (not encoding))
|
|
(setq encoding (coding-system-change-eol-conversion decoding 'unix)
|
|
changed t))
|
|
(if changed
|
|
(set-process-coding-system proc decoding encoding))))
|
|
(t
|
|
;; No async subprocesses...
|
|
(let ((oldbuf (current-buffer))
|
|
(interact-p (eshell-interactive-output-p))
|
|
lbeg lend line proc-buf exit-status)
|
|
(and (not (markerp eshell-last-sync-output-start))
|
|
(setq eshell-last-sync-output-start (point-marker)))
|
|
(setq proc-buf
|
|
(set-buffer (get-buffer-create eshell-scratch-buffer)))
|
|
(erase-buffer)
|
|
(set-buffer oldbuf)
|
|
(run-hook-with-args 'eshell-exec-hook command)
|
|
;; XXX: This doesn't support sending stdout and stderr to
|
|
;; separate places.
|
|
(setq exit-status
|
|
(apply #'call-process-region
|
|
(append (list eshell-last-sync-output-start (point)
|
|
command t
|
|
eshell-scratch-buffer nil)
|
|
args)))
|
|
;; When in a pipeline, record the place where the output of
|
|
;; this process will begin.
|
|
(and (bound-and-true-p eshell-in-pipeline-p)
|
|
(set-marker eshell-last-sync-output-start (point)))
|
|
;; Simulate the effect of the process filter.
|
|
(when (numberp exit-status)
|
|
(set-buffer proc-buf)
|
|
(goto-char (point-min))
|
|
(setq lbeg (point))
|
|
(while (eq 0 (forward-line 1))
|
|
(setq lend (point)
|
|
line (buffer-substring-no-properties lbeg lend))
|
|
(set-buffer oldbuf)
|
|
(if interact-p
|
|
(eshell-interactive-process-filter nil line)
|
|
(eshell-output-object line))
|
|
(setq lbeg lend)
|
|
(set-buffer proc-buf))
|
|
(set-buffer oldbuf))
|
|
;; Simulate the effect of `eshell-sentinel'.
|
|
(eshell-set-exit-info
|
|
(if (numberp exit-status) exit-status -1)
|
|
(and (numberp exit-status) (= exit-status 0)))
|
|
(run-hook-with-args 'eshell-kill-hook command exit-status)
|
|
(or (bound-and-true-p eshell-in-pipeline-p)
|
|
(setq eshell-last-sync-output-start nil))
|
|
(if (not (numberp exit-status))
|
|
(error "%s: external command failed: %s" command exit-status))
|
|
(setq proc t))))
|
|
proc))
|
|
|
|
(defun eshell-interactive-process-filter (process string)
|
|
"Send the output from PROCESS (STRING) to the interactive display.
|
|
This is done after all necessary filtering has been done."
|
|
(when string
|
|
(eshell-debug-command 'process
|
|
"received output from process `%s'\n\n%s" process string)
|
|
(eshell-interactive-output-filter (if process (process-buffer process)
|
|
(current-buffer))
|
|
string)))
|
|
|
|
(define-obsolete-function-alias 'eshell-output-filter
|
|
#'eshell-interactive-process-filter "30.1")
|
|
|
|
(defun eshell-insertion-filter (proc string)
|
|
"Insert a string into the eshell buffer, or a process/file/buffer.
|
|
PROC is the process for which we're inserting output. STRING is the
|
|
output."
|
|
(eshell-debug-command 'process
|
|
"received output from process `%s'\n\n%s" proc string)
|
|
(when (buffer-live-p (process-buffer proc))
|
|
(with-current-buffer (process-buffer proc)
|
|
(process-put proc :eshell-pending
|
|
(concat (process-get proc :eshell-pending)
|
|
string))
|
|
(if (process-get proc :eshell-busy)
|
|
(eshell-debug-command 'process "i/o busy for process `%s'" proc)
|
|
(unwind-protect
|
|
(let ((handles (process-get proc :eshell-handles))
|
|
(index (process-get proc :eshell-handle-index))
|
|
data)
|
|
(while (setq data (process-get proc :eshell-pending))
|
|
(process-put proc :eshell-pending nil)
|
|
(eshell-debug-command 'process
|
|
"forwarding output from process `%s'\n\n%s" proc data)
|
|
(condition-case nil
|
|
(eshell-output-object data index handles)
|
|
(eshell-pipe-broken
|
|
;; The output pipe broke, so send SIGPIPE to the
|
|
;; process. NOTE: Due to the additional indirection
|
|
;; of Emacs process filters, the process will likely
|
|
;; see the SIGPIPE later than it would in a regular
|
|
;; shell, which could cause problems. For cases
|
|
;; where this matters, using an external pipe
|
|
;; operator (`*|') may work instead.
|
|
(cond
|
|
;; Delay signalling remote processes to prevent
|
|
;; "Forbidden reentrant call of Tramp".
|
|
((process-get proc 'remote-pid)
|
|
(run-at-time 0 nil #'signal-process proc 'SIGPIPE))
|
|
;; MS-Windows doesn't support SIGPIPE, so send
|
|
;; SIGTERM there instead; this is reasonably close
|
|
;; to the right behavior, since the default action
|
|
;; for SIGPIPE is to terminate the process.
|
|
((eq system-type 'windows-nt)
|
|
(signal-process proc 'SIGTERM))
|
|
(t
|
|
(signal-process proc 'SIGPIPE)))))))
|
|
(process-put proc :eshell-busy nil))))))
|
|
|
|
(defun eshell-sentinel (proc string)
|
|
"Generic sentinel for command processes. Reports only signals.
|
|
PROC is the process that's exiting. STRING is the exit message."
|
|
(eshell-debug-command 'process
|
|
"sentinel for external process `%s': %S" proc string)
|
|
(when (and (buffer-live-p (process-buffer proc))
|
|
(not (string= string "run")))
|
|
(with-current-buffer (process-buffer proc)
|
|
(unwind-protect
|
|
(let* ((handles (process-get proc :eshell-handles))
|
|
(index (process-get proc :eshell-handle-index))
|
|
(primary (= index eshell-output-handle))
|
|
(set-exit-info (process-get proc :eshell-set-exit-info))
|
|
(data (process-get proc :eshell-pending))
|
|
(stderr-live (process-get proc :eshell-stderr-live)))
|
|
;; Write the exit message for the last process in the
|
|
;; foreground pipeline if its status is abnormal and
|
|
;; stderr is already writing to the terminal.
|
|
(when (and (eq proc (eshell-tail-process))
|
|
(eshell-interactive-output-p eshell-error-handle handles)
|
|
(not (string-match "^\\(finished\\|exited\\)"
|
|
string)))
|
|
(eshell-interactive-output-filter (process-buffer proc) string))
|
|
(process-put proc :eshell-pending nil)
|
|
;; If we're in the middle of handling output from this
|
|
;; process then schedule the EOF for later.
|
|
(letrec ((wait-for-stderr (and primary
|
|
(not (process-live-p proc))))
|
|
(finish-io
|
|
(lambda ()
|
|
(if (buffer-live-p (process-buffer proc))
|
|
(with-current-buffer (process-buffer proc)
|
|
(if (or (process-get proc :eshell-busy)
|
|
(and wait-for-stderr (car stderr-live)))
|
|
(progn
|
|
(eshell-debug-command 'process
|
|
"i/o busy for process `%s'" proc)
|
|
(run-at-time 0 nil finish-io))
|
|
(when data
|
|
(ignore-error eshell-pipe-broken
|
|
(eshell-output-object
|
|
data index handles)))
|
|
(when set-exit-info
|
|
(let ((status (process-exit-status proc)))
|
|
(eshell-set-exit-info status (= status 0))))
|
|
(eshell-close-handles handles)
|
|
;; Clear the handles to mark that we're 100%
|
|
;; finished with the I/O for this process.
|
|
(process-put proc :eshell-handles nil)
|
|
(eshell-debug-command 'process
|
|
"finished external process `%s'" proc)
|
|
(if primary
|
|
(run-hook-with-args 'eshell-kill-hook
|
|
proc string)
|
|
(setcar stderr-live nil))))
|
|
(eshell-debug-command 'process
|
|
"buffer for external process `%s' already killed"
|
|
proc)))))
|
|
(funcall finish-io)))
|
|
(when-let* ((entry (assq proc eshell-process-list)))
|
|
(eshell-remove-process-entry entry))))))
|
|
|
|
(defun eshell-process-interact (func &optional all query)
|
|
"Interact with a process, using PROMPT if more than one, via FUNC.
|
|
If ALL is non-nil, background processes will be interacted with as well.
|
|
If QUERY is non-nil, query the user with QUERY before calling FUNC."
|
|
(let (defunct result)
|
|
(dolist (entry eshell-process-list)
|
|
(if (and (process-live-p (car entry))
|
|
(or all
|
|
(not (cdr entry)))
|
|
(or (not query)
|
|
(y-or-n-p (format-message query
|
|
(process-name (car entry))))))
|
|
(setq result (funcall func (car entry))))
|
|
(unless (process-live-p (car entry))
|
|
(setq defunct (cons entry defunct))))
|
|
;; clean up the process list; this can get dirty if an error
|
|
;; occurred that brought the user into the debugger, and then they
|
|
;; quit, so that the sentinel was never called.
|
|
(dolist (d defunct)
|
|
(eshell-remove-process-entry d))
|
|
result))
|
|
|
|
(defcustom eshell-kill-process-wait-time 5
|
|
"Seconds to wait between sending termination signals to a subprocess."
|
|
:type 'number)
|
|
|
|
(defcustom eshell-kill-process-signals '(SIGINT SIGQUIT SIGKILL)
|
|
"Signals used to kill processes when an Eshell buffer exits.
|
|
Eshell calls each of these signals in order when an Eshell buffer is
|
|
killed; if the process is still alive afterwards, Eshell waits a
|
|
number of seconds defined by `eshell-kill-process-wait-time', and
|
|
tries the next signal in the list."
|
|
:type '(repeat symbol))
|
|
|
|
(defcustom eshell-kill-processes-on-exit nil
|
|
"If non-nil, kill active processes when exiting an Eshell buffer.
|
|
Emacs will only kill processes owned by that Eshell buffer.
|
|
|
|
If nil, ownership of background and foreground processes reverts to
|
|
Emacs itself, and will die only if the user exits Emacs, calls
|
|
`kill-process', or terminates the processes externally.
|
|
|
|
If `ask', Emacs prompts the user before killing any processes.
|
|
|
|
If `every', it prompts once for every process.
|
|
|
|
If t, it kills all buffer-owned processes without asking.
|
|
|
|
Processes are first sent SIGHUP, then SIGINT, then SIGQUIT, then
|
|
SIGKILL. The variable `eshell-kill-process-wait-time' specifies how
|
|
long to delay between signals."
|
|
:type '(choice (const :tag "Kill all, don't ask" t)
|
|
(const :tag "Ask before killing" ask)
|
|
(const :tag "Ask for each process" every)
|
|
(const :tag "Don't kill subprocesses" nil)))
|
|
|
|
(defun eshell-round-robin-kill (&optional query)
|
|
"Kill current process by trying various signals in sequence.
|
|
See the variable `eshell-kill-processes-on-exit'."
|
|
(catch 'done
|
|
(dolist (sig eshell-kill-process-signals)
|
|
(eshell-process-interact
|
|
(lambda (proc) (signal-process proc sig)) t query)
|
|
(when (eshell-wait-for-processes (mapcar #'car eshell-process-list)
|
|
eshell-kill-process-wait-time)
|
|
(throw 'done nil))
|
|
(setq query nil))))
|
|
|
|
(defun eshell-query-kill-processes ()
|
|
"Kill processes belonging to the current Eshell buffer, possibly with query."
|
|
(when (and eshell-kill-processes-on-exit
|
|
eshell-process-list)
|
|
(save-window-excursion
|
|
(list-processes)
|
|
(if (or (not (eq eshell-kill-processes-on-exit 'ask))
|
|
(y-or-n-p (format-message "Kill processes owned by `%s'? "
|
|
(buffer-name))))
|
|
(eshell-round-robin-kill
|
|
(if (eq eshell-kill-processes-on-exit 'every)
|
|
"Kill Eshell child process `%s'? ")))
|
|
(let ((buf (get-buffer "*Process List*")))
|
|
(if (and buf (buffer-live-p buf))
|
|
(kill-buffer buf)))
|
|
(message nil))))
|
|
|
|
(defun eshell--reset-after-signal (status)
|
|
"Reset the prompt after a signal when necessary.
|
|
STATUS is the status associated with the signal; if
|
|
`eshell-reset-signals' matches status, reset the prompt.
|
|
|
|
This is really only useful when \"signaling\" while there's no
|
|
foreground process. Otherwise, `eshell-resume-command' handles
|
|
everything."
|
|
(when (and (stringp status)
|
|
(string-match eshell-reset-signals status))
|
|
(eshell-reset)))
|
|
|
|
(defun eshell-interrupt-process ()
|
|
"Interrupt a process."
|
|
(interactive)
|
|
(unless (eshell-process-interact 'interrupt-process)
|
|
(eshell--reset-after-signal "interrupt\n")))
|
|
|
|
(defun eshell-kill-process ()
|
|
"Kill a process."
|
|
(interactive)
|
|
(unless (eshell-process-interact 'kill-process)
|
|
(eshell--reset-after-signal "killed\n")))
|
|
|
|
(defun eshell-quit-process ()
|
|
"Send quit signal to process."
|
|
(interactive)
|
|
(unless (eshell-process-interact 'quit-process)
|
|
(eshell--reset-after-signal "quit\n")))
|
|
|
|
;(defun eshell-stop-process ()
|
|
; "Send STOP signal to process."
|
|
; (interactive)
|
|
; (unless (eshell-process-interact 'stop-process)
|
|
; (eshell--reset-after-signal "stopped\n")))
|
|
|
|
;(defun eshell-continue-process ()
|
|
; "Send CONTINUE signal to process."
|
|
; (interactive)
|
|
; (unless (eshell-process-interact 'continue-process)
|
|
; ;; jww (1999-09-17): this signal is not dealt with yet. For
|
|
; ;; example, `eshell-reset' will be called, and so will
|
|
; ;; `eshell-resume-eval'.
|
|
; (eshell--reset-after-signal "continue\n")))
|
|
|
|
;;; Special references
|
|
|
|
(defun eshell-read-process-name (prompt)
|
|
"Read the name of a process from the minibuffer, using completion.
|
|
The prompt will be set to PROMPT."
|
|
(completing-read prompt
|
|
(mapcar
|
|
(lambda (proc)
|
|
(cons (process-name proc) t))
|
|
(process-list))
|
|
nil t))
|
|
|
|
(defun eshell-insert-process (process)
|
|
"Insert the name of PROCESS into the current buffer at point."
|
|
(interactive
|
|
(list (get-process
|
|
(eshell-read-process-name "Name of process: "))))
|
|
(insert-and-inherit "#<process "
|
|
(eshell-quote-argument (process-name process))
|
|
">"))
|
|
|
|
(defun eshell-complete-process-ref ()
|
|
"Perform completion for process references."
|
|
(pcomplete-here (mapcar #'process-name (process-list))))
|
|
|
|
(provide 'esh-proc)
|
|
;;; esh-proc.el ends here
|