mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-17 03:10:58 -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.
797 lines
31 KiB
EmacsLisp
797 lines
31 KiB
EmacsLisp
;;; esh-io.el --- I/O 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:
|
|
|
|
;; At the moment, only output redirection is supported in Eshell. To
|
|
;; use input redirection, the following syntax will work, assuming
|
|
;; that the command after the pipe is always an external command:
|
|
;;
|
|
;; cat <file> | <command>
|
|
;;
|
|
;; Otherwise, output redirection and piping are provided in a manner
|
|
;; consistent with most shells. Therefore, only unique features are
|
|
;; mentioned here.
|
|
;;
|
|
;;;_* Redirect to a Buffer or Process
|
|
;;
|
|
;; Buffers and processes can be named with '#<buffer buffer-name>' and
|
|
;; '#<process process-name>', respectively. As a shorthand,
|
|
;; '#<buffer-name>' without the explicit "buffer" arg is equivalent to
|
|
;; '#<buffer buffer-name>'.
|
|
;;
|
|
;; echo hello > #<buffer *scratch*> # Overwrite '*scratch*' with 'hello'.
|
|
;; echo hello > #<*scratch*> # Same as the command above.
|
|
;;
|
|
;; echo hello > #<process shell> # Pipe "hello" into the shell process.
|
|
;;
|
|
;;;_* Insertion
|
|
;;
|
|
;; To insert at the location of point in a buffer, use '>>>':
|
|
;;
|
|
;; echo alpha >>> #<buffer *scratch*>;
|
|
;;
|
|
;;;_* Pseudo-devices
|
|
;;
|
|
;; A few pseudo-devices are provided, since Emacs cannot write
|
|
;; directly to a UNIX device file:
|
|
;;
|
|
;; echo alpha > /dev/null ; the bit bucket
|
|
;; echo alpha > /dev/kill ; set the kill ring
|
|
;; echo alpha >> /dev/clip ; append to the clipboard
|
|
;;
|
|
;;;_* Multiple output targets
|
|
;;
|
|
;; Eshell can write to multiple output targets, including pipes.
|
|
;; Example:
|
|
;;
|
|
;; (+ 1 2) > a > b > c ; prints number to all three files
|
|
;; (+ 1 2) > a | wc ; prints to 'a', and pipes to 'wc'
|
|
|
|
;;; Code:
|
|
|
|
(require 'esh-arg)
|
|
(require 'esh-util)
|
|
|
|
(eval-when-compile
|
|
(require 'cl-lib))
|
|
|
|
(declare-function eshell-interactive-print "esh-mode" (string))
|
|
(declare-function eshell-term-as-value "esh-cmd" (term))
|
|
|
|
(defgroup eshell-io nil
|
|
"Eshell's I/O management code provides a scheme for treating many
|
|
different kinds of objects -- symbols, files, buffers, etc. -- as
|
|
though they were files."
|
|
:tag "I/O management"
|
|
:group 'eshell)
|
|
|
|
;;; User Variables:
|
|
|
|
(defcustom eshell-io-load-hook nil
|
|
"A hook that gets run when `eshell-io' is loaded."
|
|
:version "24.1" ; removed eshell-io-initialize
|
|
:type 'hook
|
|
:group 'eshell-io)
|
|
|
|
(defcustom eshell-number-of-handles 3
|
|
"The number of file handles that eshell supports.
|
|
Currently this is standard input, output and error. But even all of
|
|
these Emacs does not currently support with asynchronous processes
|
|
\(which is what eshell uses so that you can continue doing work in
|
|
other buffers)."
|
|
:type 'integer
|
|
:group 'eshell-io)
|
|
|
|
(defcustom eshell-output-handle 1
|
|
"The index of the standard output handle."
|
|
:type 'integer
|
|
:group 'eshell-io)
|
|
|
|
(defcustom eshell-error-handle 2
|
|
"The index of the standard error handle."
|
|
:type 'integer
|
|
:group 'eshell-io)
|
|
|
|
(defcustom eshell-print-queue-size 5
|
|
"The size of the print queue, for doing buffered printing.
|
|
This variable is obsolete. You should use `eshell-buffered-print-size'
|
|
instead."
|
|
:type 'integer
|
|
:group 'eshell-io)
|
|
(make-obsolete-variable 'eshell-print-queue-size
|
|
'eshell-buffered-print-size "30.1")
|
|
|
|
(defcustom eshell-buffered-print-size 2048
|
|
"The size of the print queue in characters, for doing buffered printing.
|
|
Larger values for this option will generally result in faster execution
|
|
by reducing the overhead associated with each print operation, but will
|
|
increase the time it takes to see any progress in the output; smaller
|
|
values will do the reverse."
|
|
:type 'integer
|
|
:group 'eshell-io
|
|
:version "30.1")
|
|
|
|
(defcustom eshell-buffered-print-redisplay-throttle 0.025
|
|
"The minimum time in seconds between redisplays when using buffered printing.
|
|
If nil, don't redisplay while printing."
|
|
:type '(choice number
|
|
(const :tag "Don't redisplay" nil))
|
|
:group 'eshell-io
|
|
:version "30.1")
|
|
|
|
(defcustom eshell-virtual-targets
|
|
'(;; The literal string "/dev/null" is intentional here. It just
|
|
;; provides compatibility so that users can redirect to
|
|
;; "/dev/null" no matter the actual value of `null-device'.
|
|
("/dev/null" (lambda (_mode) (throw 'eshell-null-device t)) t)
|
|
("/dev/eshell" eshell-interactive-print nil)
|
|
("/dev/kill" (lambda (mode)
|
|
(when (eq mode 'overwrite)
|
|
(kill-new ""))
|
|
#'eshell-kill-append)
|
|
t)
|
|
("/dev/clip" (lambda (mode)
|
|
(when (eq mode 'overwrite)
|
|
(let ((select-enable-clipboard t))
|
|
(kill-new "")))
|
|
#'eshell-clipboard-append)
|
|
t))
|
|
"Map virtual devices name to Emacs Lisp functions.
|
|
Each member is of the following form:
|
|
|
|
(FILENAME OUTPUT-FUNCTION [PASS-MODE])
|
|
|
|
When the user specifies FILENAME as a redirection target, Eshell will
|
|
repeatedly call the OUTPUT-FUNCTION with the redirected output as
|
|
strings. OUTPUT-FUNCTION can also be an `eshell-generic-target'
|
|
instance. In this case, Eshell will repeatedly call the function in the
|
|
`output-function' slot with the string output; once the redirection has
|
|
completed, Eshell will then call the function in the `close-function'
|
|
slot, passing the exit status of the redirected command.
|
|
|
|
If PASS-MODE is non-nil, Eshell will pass the redirection mode as an
|
|
argument (which is the symbol `overwrite', `append' or `insert') to
|
|
OUTPUT-FUNCTION, which should return the real output function (either an
|
|
ordinary function or `eshell-generic-target' as described above)."
|
|
:version "30.1"
|
|
:type '(repeat
|
|
(list (string :tag "Target")
|
|
function
|
|
(choice (const :tag "Func returns output-func" t)
|
|
(const :tag "Func is output-func" nil))))
|
|
:risky t
|
|
:group 'eshell-io)
|
|
|
|
(define-error 'eshell-pipe-broken "Pipe broken")
|
|
|
|
(defvar eshell-ensure-newline-p nil
|
|
"If non-nil, ensure that a newline is emitted after a Lisp form.
|
|
This can be changed by Lisp forms that are evaluated from the
|
|
Eshell command line. This behavior only applies to line-oriented
|
|
output targets (see `eshell-target-line-oriented-p'.")
|
|
|
|
;;; Internal Variables:
|
|
|
|
(defconst eshell-redirection-operators-alist
|
|
'(("<" . input) ; FIXME: Not supported yet.
|
|
(">" . overwrite)
|
|
(">>" . append)
|
|
(">>>" . insert))
|
|
"An association list of redirection operators to symbols
|
|
describing the mode, e.g. for using with `eshell-get-target'.")
|
|
|
|
(defvar eshell-current-handles nil)
|
|
|
|
(defvar eshell-output-file-buffer nil
|
|
"If non-nil, the current buffer is a file output buffer.")
|
|
|
|
(defvar eshell-print-count)
|
|
(defvar eshell-current-redirections)
|
|
|
|
;;; Functions:
|
|
|
|
(defun eshell-io-initialize () ;Called from `eshell-mode' via intern-soft!
|
|
"Initialize the I/O subsystem code."
|
|
(add-hook 'eshell-parse-argument-hook
|
|
#'eshell-parse-redirection nil t)
|
|
(make-local-variable 'eshell-current-redirections)
|
|
(add-hook 'eshell-pre-rewrite-command-hook
|
|
#'eshell-strip-redirections nil t)
|
|
(add-function :filter-return (local 'eshell-post-rewrite-command-function)
|
|
#'eshell--apply-redirections))
|
|
|
|
(defun eshell-parse-redirection ()
|
|
"Parse an output redirection, such as `2>' or `>&'."
|
|
(unless (or eshell-current-quoted
|
|
eshell-current-argument-plain)
|
|
(cond
|
|
;; Copying a handle (e.g. `2>&1').
|
|
((looking-at (rx (? (group digit))
|
|
(group (or "<" ">"))
|
|
"&" (group digit)
|
|
(* (syntax whitespace))))
|
|
(let ((source (string-to-number (or (match-string 1) "1")))
|
|
(mode (cdr (assoc (match-string 2)
|
|
eshell-redirection-operators-alist)))
|
|
(target (string-to-number (match-string 3))))
|
|
(when (eq mode 'input)
|
|
(error "Eshell does not support input redirection"))
|
|
(goto-char (match-end 0))
|
|
(eshell-finish-arg (list 'eshell-copy-output-handle
|
|
source target))))
|
|
;; Shorthand for redirecting both stdout and stderr (e.g. `&>').
|
|
((looking-at (rx (or (seq (group (** 1 3 ">")) "&")
|
|
(seq "&" (group-n 1 (** 1 3 ">"))))
|
|
(* (syntax whitespace))))
|
|
(if eshell-current-argument
|
|
(eshell-finish-arg)
|
|
(goto-char (match-end 0))
|
|
(eshell-finish-arg
|
|
(let ((mode (cdr (assoc (match-string 1)
|
|
eshell-redirection-operators-alist))))
|
|
(list 'eshell-set-all-output-handles
|
|
(list 'quote mode))))))
|
|
;; Shorthand for piping both stdout and stderr (i.e. `|&').
|
|
((looking-at (rx "|&" (* (syntax whitespace))))
|
|
(if eshell-current-argument
|
|
(eshell-finish-arg)
|
|
(goto-char (match-end 0))
|
|
(eshell-finish-arg
|
|
'(eshell-copy-output-handle eshell-error-handle
|
|
eshell-output-handle)
|
|
'(eshell-operator "|"))))
|
|
;; Regular redirecting (e.g. `2>').
|
|
((looking-at (rx (? (group digit))
|
|
(group (or "<" (** 1 3 ">")))
|
|
(* (syntax whitespace))))
|
|
(if eshell-current-argument
|
|
(eshell-finish-arg)
|
|
(let ((source (if (match-string 1)
|
|
(string-to-number (match-string 1))
|
|
eshell-output-handle))
|
|
(mode (cdr (assoc (match-string 2)
|
|
eshell-redirection-operators-alist))))
|
|
(when (eq mode 'input)
|
|
(error "Eshell does not support input redirection"))
|
|
(goto-char (match-end 0))
|
|
(eshell-finish-arg
|
|
;; Note: the target will be set later by
|
|
;; `eshell-strip-redirections'.
|
|
(list 'eshell-set-output-handle
|
|
source (list 'quote mode)))))))))
|
|
|
|
(defun eshell-strip-redirections (terms)
|
|
"Rewrite any output redirections in TERMS."
|
|
(setq eshell-current-redirections (list t))
|
|
(let ((tl terms)
|
|
(tt (cdr terms)))
|
|
(while tt
|
|
(cond
|
|
;; Strip `eshell-copy-output-handle'.
|
|
((and (consp (car tt))
|
|
(eq (caar tt) 'eshell-copy-output-handle))
|
|
(nconc eshell-current-redirections
|
|
(list (car tt)))
|
|
(setcdr tl (cddr tt))
|
|
(setq tt (cdr tt)))
|
|
;; Strip `eshell-set-output-handle' or
|
|
;; `eshell-set-all-output-handles' and the term immediately
|
|
;; after (the redirection target).
|
|
((and (consp (car tt))
|
|
(memq (caar tt) '(eshell-set-output-handle
|
|
eshell-set-all-output-handles)))
|
|
(unless (cdr tt)
|
|
(error "Missing redirection target"))
|
|
(nconc eshell-current-redirections
|
|
`((ignore ,(append (car tt)
|
|
(list (eshell-term-as-value (cadr tt)))))))
|
|
(setcdr tl (cddr tt))
|
|
(setq tt (cddr tt)))
|
|
(t
|
|
(setq tt (cdr tt)
|
|
tl (cdr tl)))))
|
|
(setq eshell-current-redirections
|
|
(cdr eshell-current-redirections))))
|
|
|
|
(defun eshell--apply-redirections (cmd)
|
|
"Apply any redirection which were specified for COMMAND."
|
|
(if eshell-current-redirections
|
|
`(progn
|
|
,@eshell-current-redirections
|
|
,cmd)
|
|
cmd))
|
|
|
|
(defun eshell-create-handles
|
|
(stdout output-mode &optional stderr error-mode)
|
|
"Create a new set of file handles for a command.
|
|
The default target for standard output and standard error will
|
|
go to STDOUT and STDERR, respectively. OUTPUT-MODE and
|
|
ERROR-MODE are either `overwrite', `append' or `insert'; a nil
|
|
value of mode defaults to `insert'.
|
|
|
|
The result is a vector of file handles. Each handle is of the form:
|
|
|
|
((TARGETS . REF-COUNT) DEFAULT)
|
|
|
|
TARGETS is a list of destinations for output. REF-COUNT is the
|
|
number of references to this handle (initially 1); see
|
|
`eshell-protect-handles' and `eshell-close-handles'. DEFAULT is
|
|
non-nil if handle has its initial default value (always t after
|
|
calling this function)."
|
|
(let* ((handles (make-vector eshell-number-of-handles nil))
|
|
(output-target
|
|
(let ((target (eshell-get-target stdout output-mode)))
|
|
(cons (when target (list target)) 1)))
|
|
(error-target
|
|
(if stderr
|
|
(let ((target (eshell-get-target stderr error-mode)))
|
|
(cons (when target (list target)) 1))
|
|
(cl-incf (cdr output-target))
|
|
output-target)))
|
|
(aset handles eshell-output-handle (list output-target t))
|
|
(aset handles eshell-error-handle (list error-target t))
|
|
handles))
|
|
|
|
(defun eshell-duplicate-handles (handles &optional steal-p)
|
|
"Create a duplicate of the file handles in HANDLES.
|
|
This uses the targets of each handle in HANDLES, incrementing its
|
|
reference count by one. These targets are shared between the original
|
|
set of handles and the new one, so the targets are only closed when the
|
|
reference count drops to 0 (see `eshell-close-handles').
|
|
|
|
This function also sets the DEFAULT field for each handle to
|
|
t (see `eshell-create-handles'). Unlike the targets, this value
|
|
is not shared with the original handles."
|
|
(declare (advertised-calling-convention (handles) "31.1"))
|
|
(let ((dup-handles (make-vector eshell-number-of-handles nil)))
|
|
(dotimes (idx eshell-number-of-handles)
|
|
(when-let* ((handle (aref handles idx)))
|
|
(unless steal-p
|
|
(cl-incf (cdar handle)))
|
|
(aset dup-handles idx (list (car handle) t))))
|
|
dup-handles))
|
|
|
|
(defun eshell-protect-handles (handles)
|
|
"Protect the handles in HANDLES from a being closed."
|
|
(dotimes (idx eshell-number-of-handles)
|
|
(when-let* ((handle (aref handles idx)))
|
|
(cl-incf (cdar handle))))
|
|
handles)
|
|
|
|
(declare-function eshell-exit-success-p "esh-cmd")
|
|
|
|
(defun eshell-close-handles (&optional handles obsolete-1 obsolete-2)
|
|
"Close all of the current HANDLES, taking refcounts into account.
|
|
If HANDLES is nil, use `eshell-current-handles'."
|
|
(declare (advertised-calling-convention (&optional handles) "31.1"))
|
|
(when (or obsolete-1 obsolete-2 (numberp handles))
|
|
(declare-function eshell-set-exit-info "esh-cmd"
|
|
(&optional exit-code result))
|
|
;; In addition to setting the advertised calling convention, warn
|
|
;; if we get here. A caller may have called with the right number
|
|
;; of arguments but the wrong type.
|
|
(display-warning '(eshell close-handles)
|
|
"Called `eshell-close-handles' with obsolete arguments")
|
|
;; Here, HANDLES is really the exit code.
|
|
(when (or handles obsolete-1)
|
|
(eshell-set-exit-info (or handles 0) (cadr obsolete-1)))
|
|
(setq handles obsolete-2))
|
|
|
|
(let ((handles (or handles eshell-current-handles))
|
|
(succeeded (eshell-exit-success-p)))
|
|
(dotimes (idx eshell-number-of-handles)
|
|
(eshell-close-handle (aref handles idx) succeeded))))
|
|
|
|
(defun eshell-close-handle (handle status)
|
|
"Close a single HANDLE, taking refcounts into account.
|
|
This will pass STATUS to each target for the handle, which should
|
|
be a non-nil value on successful termination."
|
|
(when handle
|
|
(cl-assert (> (cdar handle) 0)
|
|
"Attempted to close a handle with 0 references")
|
|
(when (and (> (cdar handle) 0)
|
|
(= (cl-decf (cdar handle)) 0))
|
|
(dolist (target (caar handle))
|
|
(eshell-close-target target status))
|
|
(setcar (car handle) nil))))
|
|
|
|
(defun eshell-set-output-handle (index mode &optional target handles)
|
|
"Set handle INDEX for the current HANDLES to point to TARGET using MODE.
|
|
If HANDLES is nil, use `eshell-current-handles'.
|
|
|
|
If the handle is currently set to its default value (see
|
|
`eshell-create-handles'), this will overwrite the targets with
|
|
the new target. Otherwise, it will append the new target to the
|
|
current list of targets."
|
|
(when target
|
|
(let* ((handles (or handles eshell-current-handles))
|
|
(handle (or (aref handles index)
|
|
(aset handles index (list (cons nil 1) nil))))
|
|
(defaultp (cadr handle)))
|
|
(when defaultp
|
|
(cl-decf (cdar handle))
|
|
(setcar handle (cons nil 1)))
|
|
(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)
|
|
"Copy the handle INDEX-TO-COPY to INDEX for the current HANDLES.
|
|
If HANDLES is nil, use `eshell-current-handles'."
|
|
(let* ((handles (or handles eshell-current-handles))
|
|
(handle-to-copy (car (aref handles index-to-copy))))
|
|
(when handle-to-copy
|
|
(cl-incf (cdr handle-to-copy)))
|
|
(eshell-close-handle (aref handles index) nil)
|
|
(setcar (aref handles index) handle-to-copy)))
|
|
|
|
(defun eshell-set-all-output-handles (mode &optional target handles)
|
|
"Set output and error HANDLES to point to TARGET using MODE.
|
|
If HANDLES is nil, use `eshell-current-handles'."
|
|
(eshell-set-output-handle eshell-output-handle mode target handles)
|
|
(eshell-copy-output-handle eshell-error-handle eshell-output-handle handles))
|
|
|
|
(defun eshell-kill-append (string)
|
|
"Call `kill-append' with STRING, if it is indeed a string."
|
|
(if (stringp string)
|
|
(kill-append string nil)))
|
|
|
|
(defun eshell-clipboard-append (string)
|
|
"Call `kill-append' with STRING, if it is indeed a string."
|
|
(if (stringp string)
|
|
(let ((select-enable-clipboard t))
|
|
(kill-append string nil))))
|
|
|
|
(defun eshell-interactive-output-p (&optional index handles)
|
|
"Return non-nil if the specified handle is bound for interactive display.
|
|
HANDLES is the set of handles to check; if nil, use
|
|
`eshell-current-handles'.
|
|
|
|
INDEX is the handle index to check. If nil, check
|
|
`eshell-output-handle'. If `all', check both
|
|
`eshell-output-handle' and `eshell-error-handle'."
|
|
(let ((handles (or handles eshell-current-handles))
|
|
(index (or index eshell-output-handle)))
|
|
(if (eq index 'all)
|
|
(and (equal (caar (aref handles eshell-output-handle)) '(t))
|
|
(equal (caar (aref handles eshell-error-handle)) '(t)))
|
|
(equal (caar (aref handles index)) '(t)))))
|
|
|
|
(defvar eshell--buffered-print-queue nil)
|
|
(defvar eshell--buffered-print-current-size nil)
|
|
(defvar eshell--buffered-print-next-redisplay nil)
|
|
|
|
(defvar eshell-print-queue nil)
|
|
(make-obsolete-variable 'eshell-print-queue
|
|
'eshell--buffered-print-queue "30.1")
|
|
(defvar eshell-print-queue-count -1)
|
|
(make-obsolete-variable 'eshell-print-queue-count
|
|
'eshell--buffered-print-current-size "30.1")
|
|
|
|
(defsubst eshell-print (object)
|
|
"Output OBJECT to the standard output handle."
|
|
(eshell-output-object object eshell-output-handle))
|
|
|
|
(defun eshell-init-print-buffer ()
|
|
"Initialize the buffered printing queue."
|
|
(declare (obsolete #'eshell-with-buffered-print "30.1"))
|
|
(setq eshell--buffered-print-queue nil
|
|
eshell--buffered-print-current-size 0))
|
|
|
|
(defun eshell-flush (&optional redisplay-now)
|
|
"Flush out any text that has been queued for printing.
|
|
When printing interactively, this will call `redisplay' every
|
|
`eshell-buffered-print-redisplay-throttle' seconds so that the user can
|
|
see the progress. If REDISPLAY-NOW is non-nil, call `redisplay' for
|
|
interactive output even if the throttle would otherwise prevent it."
|
|
(ignore
|
|
(when eshell--buffered-print-queue
|
|
(eshell-print (apply #'concat eshell--buffered-print-queue))
|
|
;; When printing interactively (see `eshell-with-buffered-print'),
|
|
;; periodically redisplay so the user can see some progress.
|
|
(when (and eshell--buffered-print-next-redisplay
|
|
(or redisplay-now
|
|
(time-less-p eshell--buffered-print-next-redisplay
|
|
(current-time))))
|
|
(redisplay)
|
|
(setq eshell--buffered-print-next-redisplay
|
|
(time-add eshell--buffered-print-next-redisplay
|
|
eshell-buffered-print-redisplay-throttle)))
|
|
(setq eshell--buffered-print-queue nil
|
|
eshell--buffered-print-current-size 0))))
|
|
|
|
(defun eshell-buffered-print (&rest strings)
|
|
"A buffered print -- *for strings only*.
|
|
When the buffer exceeds `eshell-buffered-print-size' in characters, this
|
|
will flush it using `eshell-flush' (which see)."
|
|
(setq eshell--buffered-print-queue
|
|
(nconc eshell--buffered-print-queue strings))
|
|
(cl-incf eshell--buffered-print-current-size
|
|
(apply #'+ (mapcar #'length strings)))
|
|
(when (> eshell--buffered-print-current-size eshell-buffered-print-size)
|
|
(eshell-flush)))
|
|
|
|
(defmacro eshell-with-buffered-print (&rest body)
|
|
"Initialize buffered printing for Eshell, and then evaluate BODY.
|
|
Within BODY, call `eshell-buffered-print' to perform output."
|
|
(declare (indent 0))
|
|
`(let ((eshell--buffered-print-queue nil)
|
|
(eshell--buffered-print-current-size 0)
|
|
(eshell--buffered-print-next-redisplay
|
|
(when (and eshell-buffered-print-redisplay-throttle
|
|
(eshell-interactive-output-p))
|
|
(time-add (current-time)
|
|
eshell-buffered-print-redisplay-throttle))))
|
|
(unwind-protect
|
|
,@body
|
|
(eshell-flush))))
|
|
|
|
(defsubst eshell-error (object)
|
|
"Output OBJECT to the standard error handle."
|
|
(eshell-output-object object eshell-error-handle))
|
|
|
|
(defsubst eshell-printn (object)
|
|
"Output OBJECT followed by a newline to the standard output handle."
|
|
(eshell-print object)
|
|
(eshell-print "\n"))
|
|
|
|
(defsubst eshell-errorn (object)
|
|
"Output OBJECT followed by a newline to the standard error handle."
|
|
(eshell-error object)
|
|
(eshell-error "\n"))
|
|
|
|
(defun eshell--output-maybe-n (object handle)
|
|
"Output OBJECT to HANDLE.
|
|
For any line-oriented output targets on HANDLE, ensure the output
|
|
ends in a newline."
|
|
(eshell-output-object object handle)
|
|
(when (and eshell-ensure-newline-p
|
|
(not (and (stringp object)
|
|
(string-suffix-p object "\n"))))
|
|
(eshell-maybe-output-newline handle)))
|
|
|
|
(defsubst eshell-print-maybe-n (object)
|
|
"Output OBJECT to the standard output handle.
|
|
For any line-oriented output targets, ensure the output ends in a
|
|
newline."
|
|
(eshell--output-maybe-n object eshell-output-handle))
|
|
|
|
(defsubst eshell-error-maybe-n (object)
|
|
"Output OBJECT to the standard error handle.
|
|
For any line-oriented output targets, ensure the output ends in a
|
|
newline."
|
|
(eshell--output-maybe-n object eshell-error-handle))
|
|
|
|
(cl-defstruct (eshell-generic-target (:constructor nil))
|
|
"An Eshell target.
|
|
This is mainly useful for creating virtual targets (see
|
|
`eshell-virtual-targets').")
|
|
|
|
(cl-defstruct (eshell-function-target
|
|
(:include eshell-generic-target)
|
|
(:constructor nil)
|
|
(:constructor eshell-function-target-create
|
|
(output-function &optional close-function)))
|
|
"An Eshell target that calls an OUTPUT-FUNCTION."
|
|
output-function close-function)
|
|
|
|
(cl-defgeneric eshell-get-target (raw-target &optional _mode)
|
|
"Convert RAW-TARGET, which is a raw argument, into a valid output target.
|
|
MODE is either `overwrite', `append' or `insert'; if it is omitted or nil,
|
|
it defaults to `insert'."
|
|
(error "Invalid redirection target: %s" (eshell-stringify raw-target)))
|
|
|
|
(cl-defmethod eshell-get-target ((raw-target string) &optional mode)
|
|
"Convert a string RAW-TARGET into a valid output target using MODE.
|
|
If TARGET is a virtual target (see `eshell-virtual-targets'),
|
|
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)
|
|
(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)))
|
|
(with-current-buffer buf
|
|
(when buffer-file-read-only
|
|
(error "Cannot write to read-only file `%s'" raw-target))
|
|
(setq buffer-read-only nil)
|
|
(setq-local eshell-output-file-buffer
|
|
(if (eq exists buf) 0 t))
|
|
(cond ((eq mode 'overwrite)
|
|
(erase-buffer))
|
|
((eq mode 'append)
|
|
(goto-char (point-max))))
|
|
(point-marker)))))
|
|
|
|
(cl-defmethod eshell-get-target ((raw-target buffer) &optional mode)
|
|
"Convert a buffer RAW-TARGET into a valid output target using MODE.
|
|
This returns a marker for that buffer."
|
|
(with-current-buffer raw-target
|
|
(cond ((eq mode 'overwrite)
|
|
(erase-buffer))
|
|
((eq mode 'append)
|
|
(goto-char (point-max))))
|
|
(point-marker)))
|
|
|
|
(cl-defmethod eshell-get-target ((raw-target symbol) &optional mode)
|
|
"Convert a symbol RAW-TARGET into a valid output target using MODE.
|
|
This returns RAW-TARGET, with its value initialized to nil if MODE is
|
|
`overwrite'."
|
|
(when (eq mode 'overwrite)
|
|
(set raw-target nil))
|
|
raw-target)
|
|
|
|
(cl-defmethod eshell-get-target ((raw-target process) &optional _mode)
|
|
"Convert a process RAW-TARGET into a valid output target.
|
|
This just returns RAW-TARGET."
|
|
raw-target)
|
|
|
|
(cl-defmethod eshell-get-target ((raw-target marker) &optional _mode)
|
|
"Convert a marker RAW-TARGET into a valid output target.
|
|
This just returns RAW-TARGET."
|
|
raw-target)
|
|
|
|
(cl-defgeneric eshell-close-target (target status)
|
|
"Close an output TARGET, passing STATUS as the result.
|
|
STATUS should be non-nil on successful termination of the output.")
|
|
|
|
(cl-defmethod eshell-close-target ((_target symbol) _status)
|
|
"Close a symbol TARGET."
|
|
nil)
|
|
|
|
(cl-defmethod eshell-close-target ((target marker) status)
|
|
"Close a marker TARGET.
|
|
If TARGET was created from a file name, save and kill the buffer.
|
|
If status is nil, prompt before killing."
|
|
(when (buffer-live-p (marker-buffer target))
|
|
(with-current-buffer (marker-buffer target)
|
|
(when eshell-output-file-buffer
|
|
(save-buffer)
|
|
(when (eq eshell-output-file-buffer t)
|
|
(or status (set-buffer-modified-p nil))
|
|
(kill-buffer))))))
|
|
|
|
(cl-defmethod eshell-close-target ((target process) _status)
|
|
"Close a process TARGET."
|
|
;; According to POSIX.1-2017, section 11.1.9, when communicating via
|
|
;; terminal, sending EOF causes all bytes waiting to be read to be
|
|
;; sent to the process immediately. Thus, if there are any bytes
|
|
;; waiting, we need to send EOF twice: once to flush the buffer, and
|
|
;; a second time to cause the next read() to return a size of 0,
|
|
;; indicating end-of-file to the reading process. However, some
|
|
;; platforms (e.g. Solaris) actually require sending a *third* EOF.
|
|
;; Since sending extra EOFs to a running process is a no-op, we'll
|
|
;; just send the maximum we'd ever need. See bug#56025 for further
|
|
;; details.
|
|
(catch 'done
|
|
(dotimes (_ (if (process-tty-name target 'stdin) 3 1))
|
|
(unless (process-live-p target)
|
|
(throw 'done nil))
|
|
(process-send-eof target))))
|
|
|
|
(cl-defmethod eshell-close-target ((target eshell-function-target) status)
|
|
"Close an Eshell function TARGET."
|
|
(when-let* ((close-function (eshell-function-target-close-function target)))
|
|
(funcall close-function status)))
|
|
|
|
(cl-defgeneric eshell-output-object-to-target (object target)
|
|
"Output OBJECT to TARGET.
|
|
Returns what was actually sent, or nil if nothing was sent.")
|
|
|
|
(cl-defmethod eshell-output-object-to-target (object (_target (eql t)))
|
|
"Output OBJECT to the display."
|
|
(setq object (eshell-stringify object))
|
|
(eshell-interactive-print object))
|
|
|
|
(cl-defmethod eshell-output-object-to-target (object (target symbol))
|
|
"Output OBJECT to the value of the symbol TARGET."
|
|
(if (not (and (boundp target) (symbol-value target)))
|
|
(set target object)
|
|
(setq object (eshell-stringify object))
|
|
(if (not (stringp (symbol-value target)))
|
|
(set target (eshell-stringify
|
|
(symbol-value target))))
|
|
(set target (concat (symbol-value target) object)))
|
|
object)
|
|
|
|
(cl-defmethod eshell-output-object-to-target (object (target marker))
|
|
"Output OBJECT to the marker TARGET."
|
|
(when (buffer-live-p (marker-buffer target))
|
|
(with-current-buffer (marker-buffer target)
|
|
(let ((moving (= (point) target)))
|
|
(save-excursion
|
|
(goto-char target)
|
|
(unless (stringp object)
|
|
(setq object (eshell-stringify object)))
|
|
(insert-and-inherit object)
|
|
(set-marker target (point-marker)))
|
|
(when moving
|
|
(goto-char target)))))
|
|
object)
|
|
|
|
(cl-defmethod eshell-output-object-to-target (object (target process))
|
|
"Output OBJECT to the process TARGET."
|
|
(unless (stringp object)
|
|
(setq object (eshell-stringify object)))
|
|
(condition-case err
|
|
(process-send-string target object)
|
|
(error
|
|
;; If `process-send-string' raises an error and the process has
|
|
;; finished, treat it as a broken pipe. Otherwise, just re-raise
|
|
;; the signal. NOTE: When running Emacs in batch mode
|
|
;; (e.g. during regression tests), Emacs can abort due to SIGPIPE
|
|
;; here. Maybe `process-send-string' should handle SIGPIPE even
|
|
;; in batch mode (bug#66186).
|
|
(if (process-live-p target)
|
|
(signal (car err) (cdr err))
|
|
(signal 'eshell-pipe-broken (list target)))))
|
|
object)
|
|
|
|
(cl-defmethod eshell-output-object-to-target (object
|
|
(target eshell-function-target))
|
|
"Output OBJECT to the Eshell function TARGET."
|
|
(funcall (eshell-function-target-output-function target) object))
|
|
|
|
(cl-defgeneric eshell-target-line-oriented-p (_target)
|
|
"Return non-nil if the specified TARGET is line-oriented.
|
|
Line-oriented targets are those that expect a newline after
|
|
command output when `eshell-ensure-newline-p' is non-nil."
|
|
nil)
|
|
|
|
(cl-defmethod eshell-target-line-oriented-p ((_target (eql t)))
|
|
"Return non-nil to indicate that the display is line-oriented."
|
|
t)
|
|
|
|
(defun eshell-output-object (object &optional handle-index handles)
|
|
"Insert OBJECT, using HANDLE-INDEX specifically.
|
|
If HANDLE-INDEX is nil, output to `eshell-output-handle'.
|
|
HANDLES is the set of file handles to use; if nil, use
|
|
`eshell-current-handles'."
|
|
(let ((targets (caar (aref (or handles eshell-current-handles)
|
|
(or handle-index eshell-output-handle)))))
|
|
(dolist (target targets)
|
|
(eshell-output-object-to-target object target))))
|
|
|
|
(defun eshell-maybe-output-newline (&optional handle-index handles)
|
|
"Maybe insert a newline, using HANDLE-INDEX specifically.
|
|
This inserts a newline for all line-oriented output targets.
|
|
|
|
If HANDLE-INDEX is nil, output to `eshell-output-handle'.
|
|
HANDLES is the set of file handles to use; if nil, use
|
|
`eshell-current-handles'."
|
|
(let ((targets (caar (aref (or handles eshell-current-handles)
|
|
(or handle-index eshell-output-handle)))))
|
|
(dolist (target targets)
|
|
(when (eshell-target-line-oriented-p target)
|
|
(eshell-output-object-to-target "\n" target)))))
|
|
|
|
(provide 'esh-io)
|
|
;;; esh-io.el ends here
|