2013-09-12 16:15:53 -04:00
|
|
|
;;; esh-ext.el --- commands external to Eshell -*- lexical-binding:t -*-
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2022-01-01 02:45:51 -05:00
|
|
|
;; Copyright (C) 1999-2022 Free Software Foundation, Inc.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2000-10-16 12:27:09 +00:00
|
|
|
;; Author: John Wiegley <johnw@gnu.org>
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:36:21 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-06-23 05:24:10 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:36:21 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
;; 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
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; To force a command to invoked external, either provide an explicit
|
|
|
|
;; pathname for the command argument, or prefix the command name with
|
|
|
|
;; an asterix character. Example:
|
|
|
|
;;
|
|
|
|
;; grep ; make invoke `grep' Lisp function, or `eshell/grep'
|
|
|
|
;; /bin/grep ; will definitely invoke /bin/grep
|
|
|
|
;; *grep ; will also invoke /bin/grep
|
|
|
|
|
2009-01-22 06:33:06 +00:00
|
|
|
;;; Code:
|
|
|
|
|
Silence many eshell compilation warnings
* lisp/eshell/em-tramp.el: Adjust requires.
(eshell-parse-command): Autoload.
* lisp/eshell/em-xtra.el: Adjust requires.
(eshell-parse-command): Autoload.
* lisp/eshell/esh-ext.el: Adjust requires.
(eshell-parse-command, eshell-close-handles): Autoload.
* lisp/eshell/esh-io.el: Adjust requires.
(eshell-output-filter): Autoload.
* lisp/eshell/esh-util.el: No need to load tramp when compiling.
(tramp-file-name-structure, ange-ftp-ls, ange-ftp-file-modtime): Declare.
(eshell-parse-ange-ls): Require ange-ftp and tramp.
* lisp/eshell/em-alias.el, lisp/eshell/em-banner.el, lisp/eshell/em-basic.el:
* lisp/eshell/em-cmpl.el, lisp/eshell/em-glob.el, lisp/eshell/em-pred.el:
* lisp/eshell/em-prompt.el, lisp/eshell/em-rebind.el, lisp/eshell/em-smart.el:
* lisp/eshell/em-term.el, lisp/eshell/esh-arg.el, lisp/eshell/esh-mode.el:
* lisp/eshell/esh-opt.el, lisp/eshell/esh-proc.el:
* lisp/eshell/esh-var.el: Adjust requires.
* lisp/eshell/eshell.el: Do not require esh-util twice.
(eshell-add-input-to-history): Declare.
(eshell-command): Check history module is active before using it.
2013-05-22 21:57:27 -07:00
|
|
|
(require 'esh-util)
|
|
|
|
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(eval-when-compile (require 'cl-lib))
|
2018-02-28 14:35:56 -05:00
|
|
|
(require 'esh-io)
|
2017-06-12 10:01:25 +02:00
|
|
|
(require 'esh-arg)
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 19:13:41 -04:00
|
|
|
(require 'esh-opt)
|
2007-12-05 07:08:55 +00:00
|
|
|
|
|
|
|
(defgroup eshell-ext nil
|
|
|
|
"External commands are invoked when operating system executables are
|
|
|
|
loaded into memory, thus beginning a new process."
|
|
|
|
:tag "External commands"
|
|
|
|
:group 'eshell)
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
;;; User Variables:
|
|
|
|
|
2011-03-04 20:11:05 -08:00
|
|
|
(defcustom eshell-ext-load-hook nil
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"A hook that gets run when `eshell-ext' is loaded."
|
2011-03-04 20:11:05 -08:00
|
|
|
:version "24.1" ; removed eshell-ext-initialize
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'hook
|
|
|
|
:group 'eshell-ext)
|
|
|
|
|
2002-03-18 14:56:35 +00:00
|
|
|
(defcustom eshell-binary-suffixes exec-suffixes
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"A list of suffixes used when searching for executable files."
|
2000-06-23 05:24:10 +00:00
|
|
|
:type '(repeat string)
|
|
|
|
:group 'eshell-ext)
|
|
|
|
|
2015-04-29 20:52:02 +03:00
|
|
|
(defcustom eshell-force-execution
|
|
|
|
(not (null (memq system-type '(windows-nt ms-dos))))
|
|
|
|
"If non-nil, try to execute files regardless of execute permissions.
|
2000-06-23 05:24:10 +00:00
|
|
|
This can be useful on systems like Windows, where the operating system
|
2015-04-29 20:52:02 +03:00
|
|
|
doesn't support the execution bit for shell scripts; or in cases where
|
|
|
|
you want to associate an interpreter with a particular kind of script
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-24 23:39:33 -07:00
|
|
|
file, but the language won't let you but a `#!' interpreter line in
|
2015-04-29 20:52:02 +03:00
|
|
|
the file, and you don't want to make it executable since nothing else
|
|
|
|
but Eshell will be able to understand
|
2000-06-23 05:24:10 +00:00
|
|
|
`eshell-interpreter-alist'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'eshell-ext)
|
|
|
|
|
|
|
|
(defun eshell-search-path (name)
|
|
|
|
"Search the environment path for NAME."
|
|
|
|
(if (file-name-absolute-p name)
|
|
|
|
name
|
2019-05-30 10:13:00 +02:00
|
|
|
(let ((list (eshell-get-path))
|
2000-06-23 05:24:10 +00:00
|
|
|
suffixes n1 n2 file)
|
|
|
|
(while list
|
2022-09-15 12:24:37 -07:00
|
|
|
(setq n1 (file-name-concat (car list) name))
|
2000-06-23 05:24:10 +00:00
|
|
|
(setq suffixes eshell-binary-suffixes)
|
|
|
|
(while suffixes
|
|
|
|
(setq n2 (concat n1 (car suffixes)))
|
|
|
|
(if (and (or (file-executable-p n2)
|
|
|
|
(and eshell-force-execution
|
|
|
|
(file-readable-p n2)))
|
|
|
|
(not (file-directory-p n2)))
|
|
|
|
(setq file n2 suffixes nil list nil))
|
|
|
|
(setq suffixes (cdr suffixes)))
|
|
|
|
(setq list (cdr list)))
|
|
|
|
file)))
|
|
|
|
|
2013-09-13 00:10:30 -07:00
|
|
|
;; This file provides itself then eval-when-compile loads files that require it.
|
|
|
|
;; This causes spurious "might not be defined at runtime" warnings.
|
|
|
|
(declare-function eshell-search-path "esh-ext" (name))
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
(defcustom eshell-windows-shell-file
|
|
|
|
(if (eshell-under-windows-p)
|
2012-02-04 11:57:09 +02:00
|
|
|
(if (string-match "\\(cmdproxy\\|sh\\)\\.\\(com\\|exe\\)"
|
2000-06-23 05:24:10 +00:00
|
|
|
shell-file-name)
|
|
|
|
(or (eshell-search-path "cmd.exe")
|
2005-08-27 12:16:21 +00:00
|
|
|
(eshell-search-path "command.com"))
|
2000-06-23 05:24:10 +00:00
|
|
|
shell-file-name))
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"The name of the shell command to use for DOS/Windows batch files.
|
2000-06-23 05:24:10 +00:00
|
|
|
This defaults to nil on non-Windows systems, where this variable is
|
|
|
|
wholly ignored."
|
2001-01-29 23:58:24 +00:00
|
|
|
:type '(choice file (const nil))
|
2000-06-23 05:24:10 +00:00
|
|
|
:group 'eshell-ext)
|
|
|
|
|
Silence many eshell compilation warnings
* lisp/eshell/em-tramp.el: Adjust requires.
(eshell-parse-command): Autoload.
* lisp/eshell/em-xtra.el: Adjust requires.
(eshell-parse-command): Autoload.
* lisp/eshell/esh-ext.el: Adjust requires.
(eshell-parse-command, eshell-close-handles): Autoload.
* lisp/eshell/esh-io.el: Adjust requires.
(eshell-output-filter): Autoload.
* lisp/eshell/esh-util.el: No need to load tramp when compiling.
(tramp-file-name-structure, ange-ftp-ls, ange-ftp-file-modtime): Declare.
(eshell-parse-ange-ls): Require ange-ftp and tramp.
* lisp/eshell/em-alias.el, lisp/eshell/em-banner.el, lisp/eshell/em-basic.el:
* lisp/eshell/em-cmpl.el, lisp/eshell/em-glob.el, lisp/eshell/em-pred.el:
* lisp/eshell/em-prompt.el, lisp/eshell/em-rebind.el, lisp/eshell/em-smart.el:
* lisp/eshell/em-term.el, lisp/eshell/esh-arg.el, lisp/eshell/esh-mode.el:
* lisp/eshell/esh-opt.el, lisp/eshell/esh-proc.el:
* lisp/eshell/esh-var.el: Adjust requires.
* lisp/eshell/eshell.el: Do not require esh-util twice.
(eshell-add-input-to-history): Declare.
(eshell-command): Check history module is active before using it.
2013-05-22 21:57:27 -07:00
|
|
|
(autoload 'eshell-parse-command "esh-cmd")
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
(defsubst eshell-invoke-batch-file (&rest args)
|
2021-09-14 07:55:56 +02:00
|
|
|
"Invoke a .BAT or .CMD file on MS-DOS/MS-Windows systems."
|
2000-06-23 05:24:10 +00:00
|
|
|
;; since CMD.EXE can't handle forward slashes in the initial
|
|
|
|
;; argument...
|
2005-05-31 00:14:26 +00:00
|
|
|
(setcar args (subst-char-in-string ?/ ?\\ (car args)))
|
2000-06-23 05:24:10 +00:00
|
|
|
(throw 'eshell-replace-command
|
2012-01-28 21:58:46 +08:00
|
|
|
(eshell-parse-command
|
|
|
|
(eshell-quote-argument eshell-windows-shell-file)
|
|
|
|
(cons "/c" args))))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defcustom eshell-interpreter-alist
|
|
|
|
(if (eshell-under-windows-p)
|
|
|
|
'(("\\.\\(bat\\|cmd\\)\\'" . eshell-invoke-batch-file)))
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"An alist defining interpreter substitutions.
|
2000-06-23 05:24:10 +00:00
|
|
|
Each member is a cons cell of the form:
|
|
|
|
|
|
|
|
(MATCH . INTERPRETER)
|
|
|
|
|
2013-06-02 11:19:09 +02:00
|
|
|
MATCH should be a regexp, which is matched against the command
|
|
|
|
name, or a function of arity 2 receiving the COMMAND and its
|
|
|
|
ARGS (a list). If either returns a non-nil value, then
|
|
|
|
INTERPRETER will be used for that command.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
If INTERPRETER is a string, it will be called as the command name,
|
|
|
|
with the original command name passed as the first argument, with all
|
|
|
|
subsequent arguments following. If INTERPRETER is a function, it will
|
|
|
|
be called with all of those arguments. Note that interpreter
|
|
|
|
functions should throw `eshell-replace-command' with the alternate
|
|
|
|
command form, or they should return a value compatible with the
|
|
|
|
possible return values of `eshell-external-command', which see."
|
|
|
|
:type '(repeat (cons (choice regexp (function :tag "Predicate"))
|
|
|
|
(choice string (function :tag "Interpreter"))))
|
|
|
|
:group 'eshell-ext)
|
|
|
|
|
|
|
|
(defcustom eshell-alternate-command-hook nil
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"A hook run whenever external command lookup fails.
|
2000-06-23 05:24:10 +00:00
|
|
|
If a functions wishes to provide an alternate command, they must throw
|
|
|
|
it using the tag `eshell-replace-command'. This is done because the
|
|
|
|
substituted command need not be external at all, and therefore must be
|
|
|
|
passed up to a higher level for re-evaluation.
|
|
|
|
|
|
|
|
Or, if the function returns a filename, that filename will be invoked
|
|
|
|
with the current command arguments rather than the command specified
|
|
|
|
by the user on the command line."
|
|
|
|
:type 'hook
|
|
|
|
:group 'eshell-ext)
|
|
|
|
|
|
|
|
(defcustom eshell-command-interpreter-max-length 256
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"The maximum length of any command interpreter string, plus args."
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'integer
|
|
|
|
:group 'eshell-ext)
|
|
|
|
|
2001-05-18 16:40:11 +00:00
|
|
|
(defcustom eshell-explicit-command-char ?*
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"If this char occurs before a command name, call it externally.
|
2022-03-25 19:01:51 +01:00
|
|
|
That is, although `vi' may be an alias, `*vi' will always call the
|
2004-09-20 15:54:10 +00:00
|
|
|
external version."
|
2001-05-18 16:40:11 +00:00
|
|
|
:type 'character
|
|
|
|
:group 'eshell-ext)
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
;;; Functions:
|
|
|
|
|
2019-04-09 14:57:29 -04:00
|
|
|
(defun eshell-ext-initialize () ;Called from `eshell-mode' via intern-soft!
|
2000-06-23 05:24:10 +00:00
|
|
|
"Initialize the external command handling code."
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(add-hook 'eshell-named-command-hook #'eshell-explicit-command nil t))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell-explicit-command (command args)
|
|
|
|
"If a command name begins with `*', call it externally always.
|
|
|
|
This bypasses all Lisp functions and aliases."
|
|
|
|
(when (and (> (length command) 1)
|
2001-05-18 16:40:11 +00:00
|
|
|
(eq (aref command 0) eshell-explicit-command-char))
|
2000-06-23 05:24:10 +00:00
|
|
|
(let ((cmd (eshell-search-path (substring command 1))))
|
|
|
|
(if cmd
|
|
|
|
(or (eshell-external-command cmd args)
|
|
|
|
(error "%s: external command failed" cmd))
|
|
|
|
(error "%s: external command not found"
|
|
|
|
(substring command 1))))))
|
|
|
|
|
2009-11-24 10:25:54 +00:00
|
|
|
(defun eshell-remote-command (command args)
|
2000-06-23 05:24:10 +00:00
|
|
|
"Insert output from a remote COMMAND, using ARGS.
|
|
|
|
A remote command is something that executes on a different machine.
|
|
|
|
An external command simply means external to Emacs.
|
|
|
|
|
|
|
|
Note that this function is very crude at the moment. It gathers up
|
|
|
|
all the output from the remote command, and sends it all at once,
|
|
|
|
causing the user to wonder if anything's really going on..."
|
|
|
|
(let ((outbuf (generate-new-buffer " *eshell remote output*"))
|
|
|
|
(errbuf (generate-new-buffer " *eshell remote error*"))
|
2016-11-20 16:29:47 +01:00
|
|
|
(command (file-local-name command))
|
2000-06-23 05:24:10 +00:00
|
|
|
(exitcode 1))
|
|
|
|
(unwind-protect
|
|
|
|
(progn
|
|
|
|
(setq exitcode
|
2009-11-24 10:25:54 +00:00
|
|
|
(shell-command
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(mapconcat #'shell-quote-argument
|
2009-11-24 10:25:54 +00:00
|
|
|
(append (list command) args) " ")
|
|
|
|
outbuf errbuf))
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
(eshell-print (with-current-buffer outbuf (buffer-string)))
|
|
|
|
(eshell-error (with-current-buffer errbuf (buffer-string))))
|
2000-06-23 05:24:10 +00:00
|
|
|
(eshell-close-handles exitcode 'nil)
|
|
|
|
(kill-buffer outbuf)
|
|
|
|
(kill-buffer errbuf))))
|
|
|
|
|
|
|
|
(defun eshell-external-command (command args)
|
|
|
|
"Insert output from an external COMMAND, using ARGS."
|
New function flatten-tree
Co-authored-by: Basil L. Contovounesios <contovob@tcd.ie>
* doc/lispref/lists.texi: Document `flatten-tree'.
* lisp/progmodes/js.el (js--maybe-join):
* lisp/printing.el (pr-switches):
* lisp/lpr.el (lpr-print-region):
* lisp/gnus/nnimap.el (nnimap-find-wanted-parts):
* lisp/gnus/message.el (message-talkative-question):
* lisp/gnus/gnus-sum.el (gnus-remove-thread)
(gnus-thread-highest-number, gnus-thread-latest-date):
* lisp/eshell/esh-util.el (eshell-flatten-and-stringify):
* lisp/eshell/esh-opt.el (eshell-eval-using-options):
* lisp/eshell/esh-ext.el (eshell-external-command):
* lisp/eshell/em-xtra.el (eshell/expr):
* lisp/eshell/em-unix.el (eshell/rm, eshell-mvcpln-template)
(eshell/cat, eshell/make, eshell-poor-mans-grep, eshell-grep)
(eshell/du, eshell/time, eshell/diff, eshell/locate):
* lisp/eshell/em-tramp.el (eshell/su, eshell/sudo):
* lisp/eshell/em-term.el (eshell-exec-visual):
* lisp/eshell/em-dirs.el (eshell-dirs-substitute-cd, eshell/cd):
* lisp/eshell/em-basic.el (eshell/printnl):
Use new flatten-tree.
* lisp/progmodes/js.el (js--flatten-list):
* lisp/lpr.el (lpr-flatten-list):
* lisp/gnus/message.el (message-flatten-list):
* lisp/eshell/esh-util.el (eshell-flatten-list):
Obsolete in favor of Emacs-wide `flatten-tree'.
* lisp/subr.el (flatten-list): Alias to `flatten-tree' for
discoverability.
* lisp/subr.el (flatten-tree): New defun.
* test/lisp/subr-tests.el (subr-tests-flatten-tree): New test.
2018-12-17 12:15:09 +01:00
|
|
|
(setq args (eshell-stringify-list (flatten-tree args)))
|
2012-08-29 14:49:44 +02:00
|
|
|
(let ((interp (eshell-find-interpreter
|
|
|
|
command
|
2013-06-02 11:19:09 +02:00
|
|
|
args
|
2012-08-31 13:11:06 +02:00
|
|
|
;; `eshell-find-interpreter' does not work correctly
|
|
|
|
;; for Tramp file name syntax. But we don't need to
|
|
|
|
;; know the interpreter in that case, therefore the
|
|
|
|
;; check is suppressed.
|
2012-08-29 14:49:44 +02:00
|
|
|
(or (and (stringp command) (file-remote-p command))
|
|
|
|
(file-remote-p default-directory)))))
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 19:13:41 -04:00
|
|
|
(cl-assert interp)
|
2009-11-24 10:25:54 +00:00
|
|
|
(if (functionp (car interp))
|
|
|
|
(apply (car interp) (append (cdr interp) args))
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(require 'esh-proc)
|
|
|
|
(declare-function eshell-gather-process-output "esh-proc" (command args))
|
2009-11-24 10:25:54 +00:00
|
|
|
(eshell-gather-process-output
|
|
|
|
(car interp) (append (cdr interp) args)))))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell/addpath (&rest args)
|
|
|
|
"Add a set of paths to PATH."
|
|
|
|
(eshell-eval-using-options
|
|
|
|
"addpath" args
|
|
|
|
'((?b "begin" nil prepend "add path element at beginning")
|
|
|
|
(?h "help" nil nil "display this usage message")
|
|
|
|
:usage "[-b] PATH
|
|
|
|
Adds the given PATH to $PATH.")
|
2022-09-15 12:24:37 -07:00
|
|
|
(let ((path (eshell-get-path t)))
|
|
|
|
(if args
|
|
|
|
(progn
|
|
|
|
(setq path (if prepend
|
|
|
|
(append args path)
|
|
|
|
(append path args)))
|
|
|
|
(eshell-set-path path)
|
|
|
|
(string-join path (path-separator)))
|
|
|
|
(dolist (dir path)
|
|
|
|
(eshell-printn dir))))))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
Set the property `eshell-no-numeric-conversions' on the following
functions (which all deal with filesystem entities, and never Lisp
numerical values): eshell/cd, eshell/pushd, eshell/popd, eshell/ls,
eshell/source, eshell/., eshell/man, eshell/rm, eshell/mkdir,
eshell/rmdir, eshell/mv, eshell/cp, eshell/ln, eshell/cat,
eshell/make, eshell/diff, eshell/locate, eshell/occur, eshell/which,
eshell/addpath.
2001-05-10 03:47:24 +00:00
|
|
|
(put 'eshell/addpath 'eshell-no-numeric-conversions t)
|
2018-07-16 21:46:20 -05:00
|
|
|
(put 'eshell/addpath 'eshell-filename-arguments t)
|
Set the property `eshell-no-numeric-conversions' on the following
functions (which all deal with filesystem entities, and never Lisp
numerical values): eshell/cd, eshell/pushd, eshell/popd, eshell/ls,
eshell/source, eshell/., eshell/man, eshell/rm, eshell/mkdir,
eshell/rmdir, eshell/mv, eshell/cp, eshell/ln, eshell/cat,
eshell/make, eshell/diff, eshell/locate, eshell/occur, eshell/which,
eshell/addpath.
2001-05-10 03:47:24 +00:00
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
(defun eshell-script-interpreter (file)
|
|
|
|
"Extract the script to run from FILE, if it has #!<interp> in it.
|
|
|
|
Return nil, or a list of the form:
|
|
|
|
|
|
|
|
(INTERPRETER [ARGS] FILE)"
|
|
|
|
(let ((maxlen eshell-command-interpreter-max-length))
|
|
|
|
(if (and (file-readable-p file)
|
|
|
|
(file-regular-p file))
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert-file-contents-literally file nil 0 maxlen)
|
2002-04-12 20:11:06 +00:00
|
|
|
(if (looking-at "#![ \t]*\\([^ \r\t\n]+\\)\\([ \t]+\\(.+\\)\\)?")
|
2000-06-23 05:24:10 +00:00
|
|
|
(if (match-string 3)
|
|
|
|
(list (match-string 1)
|
|
|
|
(match-string 3)
|
|
|
|
file)
|
|
|
|
(list (match-string 1)
|
|
|
|
file)))))))
|
|
|
|
|
2013-06-02 11:19:09 +02:00
|
|
|
(defun eshell-find-interpreter (file args &optional no-examine-p)
|
2000-06-23 05:24:10 +00:00
|
|
|
"Find the command interpreter with which to execute FILE.
|
|
|
|
If NO-EXAMINE-P is non-nil, FILE will not be inspected for a script
|
|
|
|
line of the form #!<interp>."
|
|
|
|
(let ((finterp
|
|
|
|
(catch 'found
|
|
|
|
(ignore
|
Make eshell-for obsolete (replaced by dolist)
* eshell/esh-util.el (eshell-for): Make it obsolete.
* eshell/em-alias.el (eshell/alias, eshell-alias-completions):
* eshell/em-dirs.el (eshell-save-some-last-dir):
* eshell/em-hist.el (eshell-save-some-history, eshell-hist-parse-modifier):
* eshell/em-ls.el (eshell-ls-dir, eshell-ls-files, eshell-ls-entries):
* eshell/em-unix.el (eshell/cat, eshell/du, eshell/su):
* eshell/esh-cmd.el (eshell-invoke-directly, eshell-do-eval, eshell/which):
* eshell/esh-ext.el (eshell-find-interpreter):
* eshell/esh-mode.el (eshell-mode):
* eshell/esh-module.el (eshell-unload-extension-modules):
* eshell/esh-proc.el (eshell-process-interact):
* eshell/esh-test.el (eshell-test):
* eshell/esh-util.el (eshell-flatten-list, eshell-winnow-list):
* eshell/esh-var.el (eshell/env, eshell-environment-variables)
(eshell-variables-list):
* eshell/eshell.el (eshell-unload-all-modules):
Replace eshell-for with dolist.
2011-03-04 19:53:41 -08:00
|
|
|
(dolist (possible eshell-interpreter-alist)
|
2000-06-23 05:24:10 +00:00
|
|
|
(cond
|
|
|
|
((functionp (car possible))
|
2013-06-02 11:19:09 +02:00
|
|
|
(let ((fn (car possible)))
|
|
|
|
(and (funcall fn file args)
|
|
|
|
(throw 'found (cdr possible)))))
|
2000-06-23 05:24:10 +00:00
|
|
|
((stringp (car possible))
|
|
|
|
(and (string-match (car possible) file)
|
|
|
|
(throw 'found (cdr possible))))
|
|
|
|
(t
|
|
|
|
(error "Invalid interpreter-alist test"))))))))
|
|
|
|
(if finterp ; first check
|
|
|
|
(list finterp file)
|
|
|
|
(let ((fullname (if (file-name-directory file) file
|
|
|
|
(eshell-search-path file)))
|
|
|
|
(suffixes eshell-binary-suffixes))
|
2017-06-07 18:48:39 -04:00
|
|
|
(when (and fullname
|
|
|
|
(not (file-remote-p fullname))
|
|
|
|
(file-remote-p default-directory))
|
|
|
|
(setq fullname
|
|
|
|
(if (file-name-absolute-p fullname)
|
|
|
|
(concat (file-remote-p default-directory) fullname)
|
|
|
|
(expand-file-name fullname default-directory))))
|
2000-06-23 05:24:10 +00:00
|
|
|
(if (and fullname (not (or eshell-force-execution
|
|
|
|
(file-executable-p fullname))))
|
|
|
|
(while suffixes
|
|
|
|
(let ((try (concat fullname (car suffixes))))
|
|
|
|
(if (or (file-executable-p try)
|
|
|
|
(and eshell-force-execution
|
|
|
|
(file-readable-p try)))
|
|
|
|
(setq fullname try suffixes nil)
|
|
|
|
(setq suffixes (cdr suffixes))))))
|
|
|
|
(cond ((not (and fullname (file-exists-p fullname)))
|
|
|
|
(let ((name (or fullname file)))
|
|
|
|
(unless (setq fullname
|
|
|
|
(run-hook-with-args-until-success
|
|
|
|
'eshell-alternate-command-hook file))
|
|
|
|
(error "%s: command not found" name))))
|
|
|
|
((not (or eshell-force-execution
|
|
|
|
(file-executable-p fullname)))
|
|
|
|
(error "%s: Permission denied" fullname)))
|
|
|
|
(let (interp)
|
|
|
|
(unless no-examine-p
|
|
|
|
(setq interp (eshell-script-interpreter fullname))
|
|
|
|
(if interp
|
|
|
|
(setq interp
|
2013-06-02 11:19:09 +02:00
|
|
|
(cons (car (eshell-find-interpreter (car interp) args t))
|
2000-06-23 05:24:10 +00:00
|
|
|
(cdr interp)))))
|
|
|
|
(or interp (list fullname)))))))
|
|
|
|
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(provide 'esh-ext)
|
2000-06-23 05:24:10 +00:00
|
|
|
;;; esh-ext.el ends here
|