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
|
|
|
|
2014-01-01 07:43:34 +00:00
|
|
|
;; Copyright (C) 1999-2014 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
|
2008-05-06 03:36:21 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://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:
|
|
|
|
|
2007-12-05 07:08:55 +00:00
|
|
|
(provide 'esh-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
|
|
|
(require 'esh-util)
|
|
|
|
|
2007-12-05 07:08:55 +00:00
|
|
|
(eval-when-compile
|
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 'cl-lib)
|
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-io)
|
2007-12-05 07:08:55 +00:00
|
|
|
(require 'esh-cmd))
|
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)
|
|
|
|
|
|
|
|
(defcustom eshell-force-execution 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
|
|
|
"If non-nil, try to execute binary files regardless of permissions.
|
2000-06-23 05:24:10 +00:00
|
|
|
This can be useful on systems like Windows, where the operating system
|
|
|
|
doesn't happen to honor the permission bits in certain cases; or in
|
|
|
|
cases where you want to associate an interpreter with a particular
|
|
|
|
kind of script file, but the language won't let you but a '#!'
|
|
|
|
interpreter line in the file, and you don't want to make it executable
|
|
|
|
since nothing else but Eshell will be able to understand
|
|
|
|
`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
|
2009-11-24 10:25:54 +00:00
|
|
|
(let ((list (eshell-parse-colon-path eshell-path-env))
|
2000-06-23 05:24:10 +00:00
|
|
|
suffixes n1 n2 file)
|
|
|
|
(while list
|
|
|
|
(setq n1 (concat (car list) name))
|
|
|
|
(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)
|
|
|
|
"Invoke a .BAT or .CMD file on DOS/Windows systems."
|
|
|
|
;; 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.
|
2004-09-20 15:54:10 +00:00
|
|
|
That is, although `vi' may be an alias, `\vi' will always call the
|
|
|
|
external version."
|
2001-05-18 16:40:11 +00:00
|
|
|
:type 'character
|
|
|
|
:group 'eshell-ext)
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
;;; Functions:
|
|
|
|
|
|
|
|
(defun eshell-ext-initialize ()
|
|
|
|
"Initialize the external command handling code."
|
|
|
|
(add-hook 'eshell-named-command-hook 'eshell-explicit-command nil t))
|
|
|
|
|
|
|
|
(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))))))
|
|
|
|
|
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-close-handles "esh-io")
|
|
|
|
|
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*"))
|
2012-07-10 14:16:40 +02:00
|
|
|
(command (or (file-remote-p command 'localname) 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
|
|
|
|
(mapconcat 'shell-quote-argument
|
|
|
|
(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."
|
|
|
|
(setq args (eshell-stringify-list (eshell-flatten-list 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-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.")
|
|
|
|
(if args
|
|
|
|
(progn
|
2012-08-06 00:10:27 -07:00
|
|
|
(setq eshell-path-env (getenv "PATH")
|
|
|
|
args (mapconcat 'identity args path-separator)
|
|
|
|
eshell-path-env
|
|
|
|
(if prepend
|
|
|
|
(concat args path-separator eshell-path-env)
|
|
|
|
(concat eshell-path-env path-separator args)))
|
2012-08-05 18:23:37 -07:00
|
|
|
(setenv "PATH" eshell-path-env))
|
|
|
|
(dolist (dir (parse-colon-path (getenv "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)
|
|
|
|
|
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))
|
2014-12-24 09:52:18 +01:00
|
|
|
(if (and fullname
|
|
|
|
(not (file-remote-p fullname))
|
|
|
|
(file-remote-p default-directory))
|
|
|
|
(setq fullname (expand-file-name
|
|
|
|
(concat "./" 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)))))))
|
|
|
|
|
|
|
|
;;; esh-ext.el ends here
|