annotate lisp/eshell/esh-cmd.el @ 96804:d6d74da7758e

*** empty log message ***
author Michael Albinus <michael.albinus@gmx.de>
date Fri, 18 Jul 2008 20:27:34 +0000
parents b0ac9927a5c0
children 5be4c494e1d5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38414
67b464da13ec Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38007
diff changeset
1 ;;; esh-cmd.el --- command invocation
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
2
95619
45dbb3c749a6 Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents: 94661
diff changeset
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
45dbb3c749a6 Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents: 94661
diff changeset
4 ;; 2008 Free Software Foundation, Inc.
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
5
32526
8e57189d61b4 Add author information.
Gerd Moellmann <gerd@gnu.org>
parents: 31241
diff changeset
6 ;; Author: John Wiegley <johnw@gnu.org>
8e57189d61b4 Add author information.
Gerd Moellmann <gerd@gnu.org>
parents: 31241
diff changeset
7
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
9
94661
b5b0801a7637 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
10 ;; GNU Emacs is free software: you can redistribute it and/or modify
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
94661
b5b0801a7637 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
12 ;; the Free Software Foundation, either version 3 of the License, or
b5b0801a7637 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
13 ;; (at your option) any later version.
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
14
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
18 ;; GNU General Public License for more details.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
19
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
94661
b5b0801a7637 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
22
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
23 ;;; Commentary:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
24
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
25 ;;;_* Invoking external commands
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
26 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
27 ;; External commands cause processes to be created, by loading
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
28 ;; external executables into memory. This is what most normal shells
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
29 ;; do, most of the time. For more information, see [External commands].
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
30 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
31 ;;;_* Invoking Lisp functions
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
32 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
33 ;; A Lisp function can be invoked using Lisp syntax, or command shell
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
34 ;; syntax. For example, to run `dired' to edit the current directory:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
35 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
36 ;; /tmp $ (dired ".")
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
37 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
38 ;; Or:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
39 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
40 ;; /tmp $ dired .
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
41 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
42 ;; The latter form is preferable, but the former is more precise,
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
43 ;; since it involves no translations. See [Argument parsing], to
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
44 ;; learn more about how arguments are transformed before passing them
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
45 ;; to commands.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
46 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
47 ;; Ordinarily, if 'dired' were also available as an external command,
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
48 ;; the external version would be called in preference to any Lisp
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
49 ;; function of the same name. To change this behavior so that Lisp
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
50 ;; functions always take precedence, set
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
51 ;; `eshell-prefer-lisp-functions' to t.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
52
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
53 ;;;_* Alias functions
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
54 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
55 ;; Whenever a command is specified using a simple name, such as 'ls',
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
56 ;; Eshell will first look for a Lisp function of the name `eshell/ls'.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
57 ;; If it exists, it will be called in preference to any other command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
58 ;; which might have matched the name 'ls' (such as command aliases,
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
59 ;; external commands, Lisp functions of that name, etc).
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
60 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
61 ;; This is the most flexible mechanism for creating new commands,
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
62 ;; since it does not pollute the global namespace, yet allows you to
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
63 ;; use all of Lisp's facilities to define that piece of functionality.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
64 ;; Most of Eshell's "builtin" commands are defined as alias functions.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
65 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
66 ;;;_* Lisp arguments
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
67 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
68 ;; It is possible to invoke a Lisp form as an argument. This can be
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
69 ;; done either by specifying the form as you might in Lisp, or by
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
70 ;; using the '$' character to introduce a value-interpolation:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
71 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
72 ;; echo (+ 1 2)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
73 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
74 ;; Or
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
75 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
76 ;; echo $(+ 1 2)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
77 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
78 ;; The two forms are equivalent. The second is required only if the
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
79 ;; form being interpolated is within a string, or is a subexpression
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
80 ;; of a larger argument:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
81 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
82 ;; echo x$(+ 1 2) "String $(+ 1 2)"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
83 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
84 ;; To pass a Lisp symbol as a argument, use the alternate quoting
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
85 ;; syntax, since the single quote character is far too overused in
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
86 ;; shell syntax:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
87 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
88 ;; echo #'lisp-symbol
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
89 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
90 ;; Backquote can also be used:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
91 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
92 ;; echo `(list ,lisp-symbol)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
93 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
94 ;; Lisp arguments are identified using the following regexp:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
95
87079
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
96 ;;;_* Command hooks
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
97 ;;
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
98 ;; There are several hooks involved with command execution, which can
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
99 ;; be used either to change or augment Eshell's behavior.
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
100
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
101
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
102 ;;; Code:
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
103
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
104 (require 'esh-util)
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
105 (unless (featurep 'xemacs)
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
106 (require 'eldoc))
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
107 (require 'esh-arg)
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
108 (require 'esh-proc)
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
109 (require 'esh-ext)
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
110
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
111 (eval-when-compile
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
112 (require 'pcomplete))
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
113
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
114
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
115 (defgroup eshell-cmd nil
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
116 "Executing an Eshell command is as simple as typing it in and
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
117 pressing <RET>. There are several different kinds of commands,
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
118 however."
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
119 :tag "Command invocation"
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
120 ;; :link '(info-link "(eshell)Command invocation")
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
121 :group 'eshell)
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
122
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
123 (defcustom eshell-prefer-lisp-functions nil
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
124 "*If non-nil, prefer Lisp functions to external commands."
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
125 :type 'boolean
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
126 :group 'eshell-cmd)
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
127
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
128 (defcustom eshell-lisp-regexp "\\([(`]\\|#'\\)"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
129 "*A regexp which, if matched at beginning of an argument, means Lisp.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
130 Such arguments will be passed to `read', and then evaluated."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
131 :type 'regexp
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
132 :group 'eshell-cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
133
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
134 (defcustom eshell-pre-command-hook nil
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
135 "*A hook run before each interactive command is invoked."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
136 :type 'hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
137 :group 'eshell-cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
138
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
139 (defcustom eshell-post-command-hook nil
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
140 "*A hook run after each interactive command is invoked."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
141 :type 'hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
142 :group 'eshell-cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
143
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
144 (defcustom eshell-prepare-command-hook nil
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
145 "*A set of functions called to prepare a named command.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
146 The command name and its argument are in `eshell-last-command-name'
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
147 and `eshell-last-arguments'. The functions on this hook can change
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
148 the value of these symbols if necessary.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
149
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
150 To prevent a command from executing at all, set
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
151 `eshell-last-command-name' to nil."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
152 :type 'hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
153 :group 'eshell-cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
154
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
155 (defcustom eshell-named-command-hook nil
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
156 "*A set of functions called before a named command is invoked.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
157 Each function will be passed the command name and arguments that were
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
158 passed to `eshell-named-command'.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
159
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
160 If any of the functions returns a non-nil value, the named command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
161 will not be invoked, and that value will be returned from
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
162 `eshell-named-command'.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
163
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
164 In order to substitute an alternate command form for execution, the
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
165 hook function should throw it using the tag `eshell-replace-command'.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
166 For example:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
167
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
168 (add-hook 'eshell-named-command-hook 'subst-with-cd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
169 (defun subst-with-cd (command args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
170 (throw 'eshell-replace-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
171 (eshell-parse-command \"cd\" args)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
172
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
173 Although useless, the above code will cause any non-glob, non-Lisp
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
174 command (i.e., 'ls' as opposed to '*ls' or '(ls)') to be replaced by a
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
175 call to `cd' using the arguments that were passed to the function."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
176 :type 'hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
177 :group 'eshell-cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
178
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
179 (defcustom eshell-pre-rewrite-command-hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
180 '(eshell-no-command-conversion
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
181 eshell-subcommand-arg-values)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
182 "*A hook run before command rewriting begins.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
183 The terms of the command to be rewritten is passed as arguments, and
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
184 may be modified in place. Any return value is ignored."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
185 :type 'hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
186 :group 'eshell-cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
187
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
188 (defcustom eshell-rewrite-command-hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
189 '(eshell-rewrite-for-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
190 eshell-rewrite-while-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
191 eshell-rewrite-if-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
192 eshell-rewrite-sexp-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
193 eshell-rewrite-initial-subcommand
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
194 eshell-rewrite-named-command)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
195 "*A set of functions used to rewrite the command argument.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
196 Once parsing of a command line is completed, the next step is to
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
197 rewrite the initial argument into something runnable.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
198
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
199 A module may wish to associate special behavior with certain argument
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
200 syntaxes at the beginning of a command line. They are welcome to do
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
201 so by adding a function to this hook. The first function to return a
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
202 substitute command form is the one used. Each function is passed the
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
203 command's full argument list, which is a list of sexps (typically
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
204 forms or strings)."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
205 :type 'hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
206 :group 'eshell-cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
207
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
208 (defcustom eshell-post-rewrite-command-hook nil
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
209 "*A hook run after command rewriting is finished.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
210 Each function is passed the symbol containing the rewritten command,
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
211 which may be modified directly. Any return value is ignored."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
212 :type 'hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
213 :group 'eshell-cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
214
79116
1af9837978fa (eshell-complex-commands): Add "ls".
Chong Yidong <cyd@stupidchicken.com>
parents: 78220
diff changeset
215 (defcustom eshell-complex-commands '("ls")
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
216 "*A list of commands names or functions, that determine complexity.
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
217 That is, if a command is defined by a function named eshell/NAME,
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
218 and NAME is part of this list, it is invoked as a complex command.
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
219 Complex commands are always correct, but run much slower. If a
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
220 command works fine without being part of this list, then it doesn't
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
221 need to be.
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
222
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
223 If an entry is a function, it will be called with the name, and should
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
224 return non-nil if the command is complex."
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
225 :type '(repeat :tag "Commands"
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
226 (choice (string :tag "Name")
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
227 (function :tag "Predicate")))
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
228 :group 'eshell-cmd)
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
229
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
230 ;;; User Variables:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
231
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
232 (defcustom eshell-cmd-load-hook '(eshell-cmd-initialize)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
233 "*A hook that gets run when `eshell-cmd' is loaded."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
234 :type 'hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
235 :group 'eshell-cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
236
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
237 (defcustom eshell-debug-command nil
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
238 "*If non-nil, enable debugging code. SSLLOOWW.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
239 This option is only useful for reporting bugs. If you enable it, you
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
240 will have to visit the file 'eshell-cmd.el' and run the command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
241 \\[eval-buffer]."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
242 :type 'boolean
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
243 :group 'eshell-cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
244
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
245 (defcustom eshell-deferrable-commands
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
246 '(eshell-named-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
247 eshell-lisp-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
248 eshell-process-identity)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
249 "*A list of functions which might return an ansychronous process.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
250 If they return a process object, execution of the calling Eshell
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
251 command will wait for completion (in the background) before finishing
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
252 the command."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
253 :type '(repeat function)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
254 :group 'eshell-cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
255
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
256 (defcustom eshell-subcommand-bindings
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
257 '((eshell-in-subcommand-p t)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
258 (default-directory default-directory)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
259 (process-environment (eshell-copy-environment)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
260 "*A list of `let' bindings for subcommand environments."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
261 :type 'sexp
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
262 :group 'eshell-cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
263
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
264 (put 'risky-local-variable 'eshell-subcommand-bindings t)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
265
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
266 (defvar eshell-ensure-newline-p nil
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
267 "If non-nil, ensure that a newline is emitted after a Lisp form.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
268 This can be changed by Lisp forms that are evaluated from the Eshell
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
269 command line.")
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
270
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
271 ;;; Internal Variables:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
272
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
273 (defvar eshell-current-command nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
274 (defvar eshell-command-name nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
275 (defvar eshell-command-arguments nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
276 (defvar eshell-in-pipeline-p nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
277 (defvar eshell-in-subcommand-p nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
278 (defvar eshell-last-arguments nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
279 (defvar eshell-last-command-name nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
280 (defvar eshell-last-async-proc nil
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
281 "When this foreground process completes, resume command evaluation.")
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
282
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
283 ;;; Functions:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
284
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
285 (defsubst eshell-interactive-process ()
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
286 "Return currently running command process, if non-Lisp."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
287 eshell-last-async-proc)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
288
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
289 (defun eshell-cmd-initialize ()
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
290 "Initialize the Eshell command processing module."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
291 (set (make-local-variable 'eshell-current-command) nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
292 (set (make-local-variable 'eshell-command-name) nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
293 (set (make-local-variable 'eshell-command-arguments) nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
294 (set (make-local-variable 'eshell-last-arguments) nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
295 (set (make-local-variable 'eshell-last-command-name) nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
296 (set (make-local-variable 'eshell-last-async-proc) nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
297
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
298 (add-hook 'eshell-kill-hook 'eshell-resume-command nil t)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
299
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
300 ;; make sure that if a command is over, and no process is being
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
301 ;; waited for, that `eshell-current-command' is set to nil. This
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
302 ;; situation can occur, for example, if a Lisp function results in
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
303 ;; `debug' being called, and the user then types \\[top-level]
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
304 (add-hook 'eshell-post-command-hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
305 (function
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
306 (lambda ()
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
307 (setq eshell-current-command nil
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
308 eshell-last-async-proc nil))) nil t)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
309
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
310 (add-hook 'eshell-parse-argument-hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
311 'eshell-parse-subcommand-argument nil t)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
312 (add-hook 'eshell-parse-argument-hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
313 'eshell-parse-lisp-argument nil t)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
314
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
315 (when (eshell-using-module 'eshell-cmpl)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
316 (add-hook 'pcomplete-try-first-hook
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
317 'eshell-complete-lisp-symbols nil t)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
318
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
319 (eshell-deftest var last-result-var
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
320 "\"last result\" variable"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
321 (eshell-command-result-p "+ 1 2; + $$ 2" "3\n5\n"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
322
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
323 (eshell-deftest var last-result-var2
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
324 "\"last result\" variable"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
325 (eshell-command-result-p "+ 1 2; + $$ $$" "3\n6\n"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
326
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
327 (eshell-deftest var last-arg-var
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
328 "\"last arg\" variable"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
329 (eshell-command-result-p "+ 1 2; + $_ 4" "3\n6\n"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
330
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
331 (defun eshell-complete-lisp-symbols ()
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
332 "If there is a user reference, complete it."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
333 (let ((arg (pcomplete-actual-arg)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
334 (when (string-match (concat "\\`" eshell-lisp-regexp) arg)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
335 (setq pcomplete-stub (substring arg (match-end 0))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
336 pcomplete-last-completion-raw t)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
337 (throw 'pcomplete-completions
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
338 (all-completions pcomplete-stub obarray 'boundp)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
339
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
340 ;; Command parsing
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
341
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
342 (defun eshell-parse-command (command &optional args top-level)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
343 "Parse the COMMAND, adding ARGS if given.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
344 COMMAND can either be a string, or a cons cell demarcating a buffer
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
345 region. TOP-LEVEL, if non-nil, means that the outermost command (the
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
346 user's input command) is being parsed, and that pre and post command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
347 hooks should be run before and after the command."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
348 (let* (sep-terms
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
349 (terms
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
350 (append
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
351 (if (consp command)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
352 (eshell-parse-arguments (car command) (cdr command))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
353 (let ((here (point))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
354 (inhibit-point-motion-hooks t)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
355 after-change-functions)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
356 (insert command)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
357 (prog1
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
358 (eshell-parse-arguments here (point))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
359 (delete-region here (point)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
360 args))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
361 (commands
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
362 (mapcar
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
363 (function
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
364 (lambda (cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
365 (if (or (not (car sep-terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
366 (string= (car sep-terms) ";"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
367 (setq cmd
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
368 (eshell-parse-pipeline cmd (not (car sep-terms))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
369 (setq cmd
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
370 (list 'eshell-do-subjob
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
371 (list 'list (eshell-parse-pipeline cmd)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
372 (setq sep-terms (cdr sep-terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
373 (if eshell-in-pipeline-p
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
374 cmd
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
375 (list 'eshell-trap-errors cmd))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
376 (eshell-separate-commands terms "[&;]" nil 'sep-terms))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
377 (let ((cmd commands))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
378 (while cmd
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
379 (if (cdr cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
380 (setcar cmd (list 'eshell-commands (car cmd))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
381 (setq cmd (cdr cmd))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
382 (setq commands
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
383 (append (list 'progn)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
384 (if top-level
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
385 (list '(run-hooks 'eshell-pre-command-hook)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
386 (if (not top-level)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
387 commands
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
388 (list
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
389 (list 'catch (quote 'top-level)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
390 (append (list 'progn) commands))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
391 '(run-hooks 'eshell-post-command-hook)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
392 (if top-level
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
393 (list 'eshell-commands commands)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
394 commands)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
395
87079
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
396 (defun eshell-debug-command (tag subform)
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
397 "Output a debugging message to '*eshell last cmd*'."
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
398 (let ((buf (get-buffer-create "*eshell last cmd*"))
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
399 (text (eshell-stringify eshell-current-command)))
96274
b0ac9927a5c0 (eshell-manipulate): Check eshell-debug-command is bound before using it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95619
diff changeset
400 (with-current-buffer buf
87079
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
401 (if (not tag)
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
402 (erase-buffer)
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
403 (insert "\n\C-l\n" tag "\n\n" text
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
404 (if subform
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
405 (concat "\n\n" (eshell-stringify subform)) ""))))))
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
406
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
407 (defun eshell-debug-show-parsed-args (terms)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
408 "Display parsed arguments in the debug buffer."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
409 (ignore
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
410 (if eshell-debug-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
411 (eshell-debug-command "parsed arguments" terms))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
412
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
413 (defun eshell-no-command-conversion (terms)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
414 "Don't convert the command argument."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
415 (ignore
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
416 (if (and (listp (car terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
417 (eq (caar terms) 'eshell-convert))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
418 (setcar terms (cadr (car terms))))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
419
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
420 (defun eshell-subcommand-arg-values (terms)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
421 "Convert subcommand arguments {x} to ${x}, in order to take their values."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
422 (setq terms (cdr terms)) ; skip command argument
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
423 (while terms
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
424 (if (and (listp (car terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
425 (eq (caar terms) 'eshell-as-subcommand))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
426 (setcar terms (list 'eshell-convert
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
427 (list 'eshell-command-to-value
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
428 (car terms)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
429 (setq terms (cdr terms))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
430
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
431 (defun eshell-rewrite-sexp-command (terms)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
432 "Rewrite a sexp in initial position, such as '(+ 1 2)'."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
433 ;; this occurs when a Lisp expression is in first position
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
434 (if (and (listp (car terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
435 (eq (caar terms) 'eshell-command-to-value))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
436 (car (cdar terms))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
437
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
438 (eshell-deftest cmd lisp-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
439 "Evaluate Lisp command"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
440 (eshell-command-result-p "(+ 1 2)" "3"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
441
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
442 (eshell-deftest cmd lisp-command-args
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
443 "Evaluate Lisp command (ignore args)"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
444 (eshell-command-result-p "(+ 1 2) 3" "3"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
445
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
446 (defun eshell-rewrite-initial-subcommand (terms)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
447 "Rewrite a subcommand in initial position, such as '{+ 1 2}'."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
448 (if (and (listp (car terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
449 (eq (caar terms) 'eshell-as-subcommand))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
450 (car terms)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
451
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
452 (eshell-deftest cmd subcommand
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
453 "Run subcommand"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
454 (eshell-command-result-p "{+ 1 2}" "3\n"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
455
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
456 (eshell-deftest cmd subcommand-args
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
457 "Run subcommand (ignore args)"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
458 (eshell-command-result-p "{+ 1 2} 3" "3\n"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
459
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
460 (eshell-deftest cmd subcommand-lisp
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
461 "Run subcommand + Lisp form"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
462 (eshell-command-result-p "{(+ 1 2)}" "3\n"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
463
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
464 (defun eshell-rewrite-named-command (terms)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
465 "If no other rewriting rule transforms TERMS, assume a named command."
65167
2980740e3f1c (eshell-rewrite-named-command): Changed the code around a bit so that
John Wiegley <johnw@newartisans.com>
parents: 64701
diff changeset
466 (let ((sym (if eshell-in-pipeline-p
2980740e3f1c (eshell-rewrite-named-command): Changed the code around a bit so that
John Wiegley <johnw@newartisans.com>
parents: 64701
diff changeset
467 'eshell-named-command*
2980740e3f1c (eshell-rewrite-named-command): Changed the code around a bit so that
John Wiegley <johnw@newartisans.com>
parents: 64701
diff changeset
468 'eshell-named-command))
2980740e3f1c (eshell-rewrite-named-command): Changed the code around a bit so that
John Wiegley <johnw@newartisans.com>
parents: 64701
diff changeset
469 (cmd (car terms))
2980740e3f1c (eshell-rewrite-named-command): Changed the code around a bit so that
John Wiegley <johnw@newartisans.com>
parents: 64701
diff changeset
470 (args (cdr terms)))
2980740e3f1c (eshell-rewrite-named-command): Changed the code around a bit so that
John Wiegley <johnw@newartisans.com>
parents: 64701
diff changeset
471 (if args
2980740e3f1c (eshell-rewrite-named-command): Changed the code around a bit so that
John Wiegley <johnw@newartisans.com>
parents: 64701
diff changeset
472 (list sym cmd (append (list 'list) (cdr terms)))
2980740e3f1c (eshell-rewrite-named-command): Changed the code around a bit so that
John Wiegley <johnw@newartisans.com>
parents: 64701
diff changeset
473 (list sym cmd))))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
474
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
475 (eshell-deftest cmd named-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
476 "Execute named command"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
477 (eshell-command-result-p "+ 1 2" "3\n"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
478
95619
45dbb3c749a6 Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents: 94661
diff changeset
479 (defvar eshell-command-body)
45dbb3c749a6 Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents: 94661
diff changeset
480 (defvar eshell-test-body)
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
481
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
482 (defsubst eshell-invokify-arg (arg &optional share-output silent)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
483 "Change ARG so it can be invoked from a structured command.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
484
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
485 SHARE-OUTPUT, if non-nil, means this invocation should share the
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
486 current output stream, which is separately redirectable. SILENT
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
487 means the user and/or any redirections shouldn't see any output
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
488 from this command. If both SHARE-OUTPUT and SILENT are non-nil,
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
489 the second is ignored."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
490 ;; something that begins with `eshell-convert' means that it
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
491 ;; intends to return a Lisp value. We want to get past this,
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
492 ;; but if it's not _actually_ a value interpolation -- in which
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
493 ;; we leave it alone. In fact, the only time we muck with it
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
494 ;; is in the case of a {subcommand} that has been turned into
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
495 ;; the interpolation, ${subcommand}, by the parser because it
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
496 ;; didn't know better.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
497 (if (and (listp arg)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
498 (eq (car arg) 'eshell-convert)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
499 (eq (car (cadr arg)) 'eshell-command-to-value))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
500 (if share-output
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
501 (cadr (cadr arg))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
502 (list 'eshell-commands (cadr (cadr arg))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
503 silent))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
504 arg))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
505
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
506 (defun eshell-rewrite-for-command (terms)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
507 "Rewrite a `for' command into its equivalent Eshell command form.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
508 Because the implementation of `for' relies upon conditional evaluation
75512
aee02f0a570b (eshell-rewrite-for-command): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 75346
diff changeset
509 of its argument (i.e., use of a Lisp special form), it must be
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
510 implemented via rewriting, rather than as a function."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
511 (if (and (stringp (car terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
512 (string= (car terms) "for")
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
513 (stringp (nth 2 terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
514 (string= (nth 2 terms) "in"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
515 (let ((body (car (last terms))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
516 (setcdr (last terms 2) nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
517 (list
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
518 'let (list (list 'for-items
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
519 (append
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
520 (list 'append)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
521 (mapcar
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
522 (function
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
523 (lambda (elem)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
524 (if (listp elem)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
525 elem
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
526 (list 'list elem))))
29875
19baeeb660f1 (eshell-rewrite-for-command): Use cdr and
Gerd Moellmann <gerd@gnu.org>
parents: 29873
diff changeset
527 (cdr (cddr terms)))))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
528 (list 'eshell-command-body
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
529 (list 'quote (list nil)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
530 (list 'eshell-test-body
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
531 (list 'quote (list nil))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
532 (list
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
533 'progn
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
534 (list
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
535 'while (list 'car (list 'symbol-value
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
536 (list 'quote 'for-items)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
537 (list
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
538 'progn
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
539 (list 'let
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
540 (list (list (intern (cadr terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
541 (list 'car
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
542 (list 'symbol-value
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
543 (list 'quote 'for-items)))))
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
544 (list 'eshell-protect
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
545 (eshell-invokify-arg body t)))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
546 (list 'setcar 'for-items
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
547 (list 'cadr
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
548 (list 'symbol-value
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
549 (list 'quote 'for-items))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
550 (list 'setcdr 'for-items
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
551 (list 'cddr
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
552 (list 'symbol-value
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
553 (list 'quote 'for-items))))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
554 (list 'eshell-close-handles
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
555 'eshell-last-command-status
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
556 (list 'list (quote 'quote)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
557 'eshell-last-command-result)))))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
558
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
559 (defun eshell-structure-basic-command (func names keyword test body
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
560 &optional else vocal-test)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
561 "With TERMS, KEYWORD, and two NAMES, structure a basic command.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
562 The first of NAMES should be the positive form, and the second the
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
563 negative. It's not likely that users should ever need to call this
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
564 function.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
565
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
566 If VOCAL-TEST is non-nil, it means output from the test should be
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
567 shown, as well as output from the body."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
568 ;; If the test form begins with `eshell-convert', it means
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
569 ;; something data-wise will be returned, and we should let
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
570 ;; that determine the truth of the statement.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
571 (unless (eq (car test) 'eshell-convert)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
572 (setq test
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
573 (list 'progn test
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
574 (list 'eshell-exit-success-p))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
575
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
576 ;; should we reverse the sense of the test? This depends
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
577 ;; on the `names' parameter. If it's the symbol nil, yes.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
578 ;; Otherwise, it can be a pair of strings; if the keyword
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
579 ;; we're using matches the second member of that pair (a
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
580 ;; list), we should reverse it.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
581 (if (or (eq names nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
582 (and (listp names)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
583 (string= keyword (cadr names))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
584 (setq test (list 'not test)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
585
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
586 ;; finally, create the form that represents this structured
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
587 ;; command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
588 (list
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
589 'let (list (list 'eshell-command-body
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
590 (list 'quote (list nil)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
591 (list 'eshell-test-body
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
592 (list 'quote (list nil))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
593 (list func test body else)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
594 (list 'eshell-close-handles
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
595 'eshell-last-command-status
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
596 (list 'list (quote 'quote)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
597 'eshell-last-command-result))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
598
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
599 (defun eshell-rewrite-while-command (terms)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
600 "Rewrite a `while' command into its equivalent Eshell command form.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
601 Because the implementation of `while' relies upon conditional
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
602 evaluation of its argument (i.e., use of a Lisp special form), it
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
603 must be implemented via rewriting, rather than as a function."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
604 (if (and (stringp (car terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
605 (member (car terms) '("while" "until")))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
606 (eshell-structure-basic-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
607 'while '("while" "until") (car terms)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
608 (eshell-invokify-arg (cadr terms) nil t)
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
609 (list 'eshell-protect
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
610 (eshell-invokify-arg (car (last terms)) t)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
611
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
612 (defun eshell-rewrite-if-command (terms)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
613 "Rewrite an `if' command into its equivalent Eshell command form.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
614 Because the implementation of `if' relies upon conditional
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
615 evaluation of its argument (i.e., use of a Lisp special form), it
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
616 must be implemented via rewriting, rather than as a function."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
617 (if (and (stringp (car terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
618 (member (car terms) '("if" "unless")))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
619 (eshell-structure-basic-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
620 'if '("if" "unless") (car terms)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
621 (eshell-invokify-arg (cadr terms) nil t)
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
622 (list 'eshell-protect
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
623 (eshell-invokify-arg
38007
fa54203d014a (eshell-exit-success-p): Use a string-match to test if the last
John Wiegley <johnw@newartisans.com>
parents: 37817
diff changeset
624 (if (= (length terms) 4)
fa54203d014a (eshell-exit-success-p): Use a string-match to test if the last
John Wiegley <johnw@newartisans.com>
parents: 37817
diff changeset
625 (car (last terms 2))
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
626 (car (last terms))) t))
38007
fa54203d014a (eshell-exit-success-p): Use a string-match to test if the last
John Wiegley <johnw@newartisans.com>
parents: 37817
diff changeset
627 (if (= (length terms) 4)
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
628 (list 'eshell-protect
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
629 (eshell-invokify-arg
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
630 (car (last terms)))) t))))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
631
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
632 (defun eshell-exit-success-p ()
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
633 "Return non-nil if the last command was \"successful\".
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
634 For a bit of Lisp code, this means a return value of non-nil.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
635 For an external command, it means an exit code of 0."
38007
fa54203d014a (eshell-exit-success-p): Use a string-match to test if the last
John Wiegley <johnw@newartisans.com>
parents: 37817
diff changeset
636 (if (save-match-data
fa54203d014a (eshell-exit-success-p): Use a string-match to test if the last
John Wiegley <johnw@newartisans.com>
parents: 37817
diff changeset
637 (string-match "#<\\(Lisp object\\|function .*\\)>"
fa54203d014a (eshell-exit-success-p): Use a string-match to test if the last
John Wiegley <johnw@newartisans.com>
parents: 37817
diff changeset
638 eshell-last-command-name))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
639 eshell-last-command-result
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
640 (= eshell-last-command-status 0)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
641
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
642 (defun eshell-parse-pipeline (terms &optional final-p)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
643 "Parse a pipeline from TERMS, return the appropriate Lisp forms."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
644 (let* (sep-terms
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
645 (bigpieces (eshell-separate-commands terms "\\(&&\\|||\\)"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
646 nil 'sep-terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
647 (bp bigpieces)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
648 (results (list t))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
649 final)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
650 (while bp
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
651 (let ((subterms (car bp)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
652 (let* ((pieces (eshell-separate-commands subterms "|"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
653 (p pieces))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
654 (while p
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
655 (let ((cmd (car p)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
656 (run-hook-with-args 'eshell-pre-rewrite-command-hook cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
657 (setq cmd (run-hook-with-args-until-success
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
658 'eshell-rewrite-command-hook cmd))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
659 (run-hook-with-args 'eshell-post-rewrite-command-hook 'cmd)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
660 (setcar p cmd))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
661 (setq p (cdr p)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
662 (nconc results
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
663 (list
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
664 (if (<= (length pieces) 1)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
665 (car pieces)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
666 (assert (not eshell-in-pipeline-p))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
667 (list 'eshell-execute-pipeline
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
668 (list 'quote pieces))))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
669 (setq bp (cdr bp))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
670 ;; `results' might be empty; this happens in the case of
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
671 ;; multi-line input
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
672 (setq results (cdr results)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
673 results (nreverse results)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
674 final (car results)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
675 results (cdr results)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
676 sep-terms (nreverse sep-terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
677 (while results
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
678 (assert (car sep-terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
679 (setq final (eshell-structure-basic-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
680 'if (string= (car sep-terms) "&&") "if"
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
681 (list 'eshell-protect (car results))
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
682 (list 'eshell-protect final)
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
683 nil t)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
684 results (cdr results)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
685 sep-terms (cdr sep-terms)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
686 final))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
687
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
688 (defun eshell-parse-subcommand-argument ()
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
689 "Parse a subcommand argument of the form '{command}'."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
690 (if (and (not eshell-current-argument)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
691 (not eshell-current-quoted)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
692 (eq (char-after) ?\{)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
693 (or (= (point-max) (1+ (point)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
694 (not (eq (char-after (1+ (point))) ?\}))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
695 (let ((end (eshell-find-delimiter ?\{ ?\})))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
696 (if (not end)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
697 (throw 'eshell-incomplete ?\{)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
698 (when (eshell-arg-delimiter (1+ end))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
699 (prog1
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
700 (list 'eshell-as-subcommand
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
701 (eshell-parse-command (cons (1+ (point)) end)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
702 (goto-char (1+ end))))))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
703
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
704 (defun eshell-parse-lisp-argument ()
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
705 "Parse a Lisp expression which is specified as an argument."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
706 (if (and (not eshell-current-argument)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
707 (not eshell-current-quoted)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
708 (looking-at eshell-lisp-regexp))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
709 (let* ((here (point))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
710 (obj
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
711 (condition-case err
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
712 (read (current-buffer))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
713 (end-of-file
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
714 (throw 'eshell-incomplete ?\()))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
715 (if (eshell-arg-delimiter)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
716 (list 'eshell-command-to-value
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
717 (list 'eshell-lisp-command (list 'quote obj)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
718 (ignore (goto-char here))))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
719
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
720 (defun eshell-separate-commands (terms separator &optional
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
721 reversed last-terms-sym)
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
722 "Separate TERMS using SEPARATOR.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
723 If REVERSED is non-nil, the list of separated term groups will be
49477
ea69593b3b09 (eshell-separate-commands): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 48211
diff changeset
724 returned in reverse order. If LAST-TERMS-SYM is a symbol, its value
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
725 will be set to a list of all the separator operators found (or '(list
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
726 nil)' if none)."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
727 (let ((sub-terms (list t))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
728 (eshell-sep-terms (list t))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
729 subchains)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
730 (while terms
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
731 (if (and (consp (car terms))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
732 (eq (caar terms) 'eshell-operator)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
733 (string-match (concat "^" separator "$")
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
734 (nth 1 (car terms))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
735 (progn
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
736 (nconc eshell-sep-terms (list (nth 1 (car terms))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
737 (setq subchains (cons (cdr sub-terms) subchains)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
738 sub-terms (list t)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
739 (nconc sub-terms (list (car terms))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
740 (setq terms (cdr terms)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
741 (if (> (length sub-terms) 1)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
742 (setq subchains (cons (cdr sub-terms) subchains)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
743 (if reversed
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
744 (progn
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
745 (if last-terms-sym
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
746 (set last-terms-sym (reverse (cdr eshell-sep-terms))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
747 subchains) ; already reversed
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
748 (if last-terms-sym
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
749 (set last-terms-sym (cdr eshell-sep-terms)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
750 (nreverse subchains))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
751
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
752 ;;_* Command evaluation macros
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
753 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
754 ;; The structure of the following macros is very important to
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
755 ;; `eshell-do-eval' [Iterative evaluation]:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
756 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
757 ;; @ Don't use forms that conditionally evaluate their arguments, such
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
758 ;; as `setq', `if', `while', `let*', etc. The only special forms
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
759 ;; that can be used are `let', `condition-case' and
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
760 ;; `unwind-protect'.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
761 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
762 ;; @ The main body of a `let' can contain only one form. Use `progn'
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
763 ;; if necessary.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
764 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
765 ;; @ The two `special' variables are `eshell-current-handles' and
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
766 ;; `eshell-current-subjob-p'. Bind them locally with a `let' if you
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
767 ;; need to change them. Change them directly only if your intention
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
768 ;; is to change the calling environment.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
769
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
770 (defmacro eshell-do-subjob (object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
771 "Evaluate a command OBJECT as a subjob.
62789
74e26c83386f (eshell-eval-command): If the return value of `eshell-resume-eval' is
John Wiegley <johnw@newartisans.com>
parents: 59121
diff changeset
772 We indicate that the process was run in the background by returning it
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
773 ensconced in a list."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
774 `(let ((eshell-current-subjob-p t))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
775 ,object))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
776
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
777 (defmacro eshell-commands (object &optional silent)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
778 "Place a valid set of handles, and context, around command OBJECT."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
779 `(let ((eshell-current-handles
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
780 (eshell-create-handles ,(not silent) 'append))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
781 eshell-current-subjob-p)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
782 ,object))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
783
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
784 (defmacro eshell-trap-errors (object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
785 "Trap any errors that occur, so they are not entirely fatal.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
786 Also, the variable `eshell-this-command-hook' is available for the
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
787 duration of OBJECT's evaluation. Note that functions should be added
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
788 to this hook using `nconc', and *not* `add-hook'.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
789
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
790 Someday, when Scheme will become the dominant Emacs language, all of
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
791 this grossness will be made to disappear by using `call/cc'..."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
792 `(let ((eshell-this-command-hook (list 'ignore)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
793 (eshell-condition-case err
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
794 (prog1
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
795 ,object
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
796 (run-hooks 'eshell-this-command-hook))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
797 (error
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
798 (run-hooks 'eshell-this-command-hook)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
799 (eshell-errorn (error-message-string err))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
800 (eshell-close-handles 1)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
801
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
802 (defmacro eshell-copy-handles (object)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
803 "Duplicate current I/O handles, so OBJECT works with its own copy."
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
804 `(let ((eshell-current-handles
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
805 (eshell-create-handles
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
806 (car (aref eshell-current-handles
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
807 eshell-output-handle)) nil
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
808 (car (aref eshell-current-handles
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
809 eshell-error-handle)) nil)))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
810 ,object))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
811
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
812 (defmacro eshell-protect (object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
813 "Protect I/O handles, so they aren't get closed after eval'ing OBJECT."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
814 `(progn
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
815 (eshell-protect-handles eshell-current-handles)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
816 ,object))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
817
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
818 (defmacro eshell-do-pipelines (pipeline)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
819 "Execute the commands in PIPELINE, connecting each to one another."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
820 (when (setq pipeline (cadr pipeline))
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
821 `(eshell-copy-handles
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
822 (progn
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
823 ,(when (cdr pipeline)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
824 `(let (nextproc)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
825 (progn
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
826 (set 'nextproc
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
827 (eshell-do-pipelines (quote ,(cdr pipeline))))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
828 (eshell-set-output-handle ,eshell-output-handle
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
829 'append nextproc)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
830 (eshell-set-output-handle ,eshell-error-handle
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
831 'append nextproc)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
832 (set 'tailproc (or tailproc nextproc)))))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
833 ,(let ((head (car pipeline)))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
834 (if (memq (car head) '(let progn))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
835 (setq head (car (last head))))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
836 (when (memq (car head) eshell-deferrable-commands)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
837 (ignore
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
838 (setcar head
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
839 (intern-soft
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
840 (concat (symbol-name (car head)) "*"))))))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
841 ,(car pipeline)))))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
842
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
843 (defmacro eshell-do-pipelines-synchronously (pipeline)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
844 "Execute the commands in PIPELINE in sequence synchronously.
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
845 Output of each command is passed as input to the next one in the pipeline.
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
846 This is used on systems where `start-process' is not supported."
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
847 (when (setq pipeline (cadr pipeline))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
848 `(let (result)
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
849 (progn
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
850 ,(when (cdr pipeline)
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
851 `(let (output-marker)
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
852 (progn
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
853 (set 'output-marker ,(point-marker))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
854 (eshell-set-output-handle ,eshell-output-handle
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
855 'append output-marker)
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
856 (eshell-set-output-handle ,eshell-error-handle
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
857 'append output-marker))))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
858 ,(let ((head (car pipeline)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
859 (if (memq (car head) '(let progn))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
860 (setq head (car (last head))))
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
861 ;;; FIXME: is deferrable significant here?
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
862 (when (memq (car head) eshell-deferrable-commands)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
863 (ignore
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
864 (setcar head
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
865 (intern-soft
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
866 (concat (symbol-name (car head)) "*"))))))
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
867 ;; The last process in the pipe should get its handles
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
868 ;; redirected as we found them before running the pipe.
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
869 ,(if (null (cdr pipeline))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
870 `(progn
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
871 (set 'eshell-current-handles tail-handles)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
872 (set 'eshell-in-pipeline-p nil)))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
873 (set 'result ,(car pipeline))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
874 ;; tailproc gets the result of the last successful process in
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
875 ;; the pipeline.
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
876 (set 'tailproc (or result tailproc))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
877 ,(if (cdr pipeline)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
878 `(eshell-do-pipelines-synchronously (quote ,(cdr pipeline))))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
879 result))))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
880
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
881 (defalias 'eshell-process-identity 'identity)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
882
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
883 (defmacro eshell-execute-pipeline (pipeline)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
884 "Execute the commands in PIPELINE, connecting each to one another."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
885 `(let ((eshell-in-pipeline-p t) tailproc)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
886 (progn
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
887 ,(if (fboundp 'start-process)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
888 `(eshell-do-pipelines ,pipeline)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
889 `(let ((tail-handles (eshell-create-handles
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
890 (car (aref eshell-current-handles
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
891 ,eshell-output-handle)) nil
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
892 (car (aref eshell-current-handles
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
893 ,eshell-error-handle)) nil)))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
894 (eshell-do-pipelines-synchronously ,pipeline)))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
895 (eshell-process-identity tailproc))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
896
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
897 (defmacro eshell-as-subcommand (command)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
898 "Execute COMMAND using a temp buffer.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
899 This is used so that certain Lisp commands, such as `cd', when
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
900 executed in a subshell, do not disturb the environment of the main
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
901 Eshell buffer."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
902 `(let ,eshell-subcommand-bindings
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
903 ,command))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
904
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
905 (defmacro eshell-do-command-to-value (object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
906 "Run a subcommand prepared by `eshell-command-to-value'.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
907 This avoids the need to use `let*'."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
908 `(let ((eshell-current-handles
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
909 (eshell-create-handles value 'overwrite)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
910 (progn
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
911 ,object
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
912 (symbol-value value))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
913
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
914 (defmacro eshell-command-to-value (object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
915 "Run OBJECT synchronously, returning its result as a string.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
916 Returns a string comprising the output from the command."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
917 `(let ((value (make-symbol "eshell-temp")))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
918 (eshell-do-command-to-value ,object)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
919
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
920 ;;;_* Iterative evaluation
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
921 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
922 ;; Eshell runs all of its external commands asynchronously, so that
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
923 ;; Emacs is not blocked while the operation is being performed.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
924 ;; However, this introduces certain synchronization difficulties,
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
925 ;; since the Lisp code, once it returns, will not "go back" to finish
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
926 ;; executing the commands which haven't yet been started.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
927 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
928 ;; What Eshell does to work around this problem (basically, the lack
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
929 ;; of threads in Lisp), is that it evaluates the command sequence
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
930 ;; iteratively. Whenever an asynchronous process is begun, evaluation
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
931 ;; terminates and control is given back to Emacs. When that process
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
932 ;; finishes, it will resume the evaluation using the remainder of the
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
933 ;; command tree.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
934
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
935 (defun eshell/eshell-debug (&rest args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
936 "A command for toggling certain debug variables."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
937 (ignore
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
938 (cond
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
939 ((not args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
940 (if eshell-handle-errors
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
941 (eshell-print "errors\n"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
942 (if eshell-debug-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
943 (eshell-print "commands\n")))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
944 ((or (string= (car args) "-h")
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
945 (string= (car args) "--help"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
946 (eshell-print "usage: eshell-debug [kinds]
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
947
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
948 This command is used to aid in debugging problems related to Eshell
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
949 itself. It is not useful for anything else. The recognized `kinds'
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
950 at the moment are:
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
951
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
952 errors stops Eshell from trapping errors
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
953 commands shows command execution progress in `*eshell last cmd*'
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
954 "))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
955 (t
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
956 (while args
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
957 (cond
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
958 ((string= (car args) "errors")
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
959 (setq eshell-handle-errors (not eshell-handle-errors)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
960 ((string= (car args) "commands")
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
961 (setq eshell-debug-command (not eshell-debug-command))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
962 (setq args (cdr args)))))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
963
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
964 (defun pcomplete/eshell-mode/eshell-debug ()
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
965 "Completion for the `debug' command."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
966 (while (pcomplete-here '("errors" "commands"))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
967
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
968 (defun eshell-invoke-directly (command input)
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
969 (let ((base (cadr (nth 2 (nth 2 (cadr command))))) name)
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
970 (if (and (eq (car base) 'eshell-trap-errors)
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
971 (eq (car (cadr base)) 'eshell-named-command))
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
972 (setq name (cadr (cadr base))))
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
973 (and name (stringp name)
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
974 (not (member name eshell-complex-commands))
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
975 (catch 'simple
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
976 (progn
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
977 (eshell-for pred eshell-complex-commands
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
978 (if (and (functionp pred)
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
979 (funcall pred name))
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
980 (throw 'simple nil)))
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
981 t))
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
982 (fboundp (intern-soft (concat "eshell/" name))))))
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
983
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
984 (defun eshell-eval-command (command &optional input)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
985 "Evaluate the given COMMAND iteratively."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
986 (if eshell-current-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
987 ;; we can just stick the new command at the end of the current
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
988 ;; one, and everything will happen as it should
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
989 (setcdr (last (cdr eshell-current-command))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
990 (list (list 'let '((here (and (eobp) (point))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
991 (and input
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
992 (list 'insert-and-inherit
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
993 (concat input "\n")))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
994 '(if here
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
995 (eshell-update-markers here))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
996 (list 'eshell-do-eval
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
997 (list 'quote command)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
998 (and eshell-debug-command
96274
b0ac9927a5c0 (eshell-manipulate): Check eshell-debug-command is bound before using it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95619
diff changeset
999 (with-current-buffer (get-buffer-create "*eshell last cmd*")
b0ac9927a5c0 (eshell-manipulate): Check eshell-debug-command is bound before using it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95619
diff changeset
1000 (erase-buffer)
b0ac9927a5c0 (eshell-manipulate): Check eshell-debug-command is bound before using it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95619
diff changeset
1001 (insert "command: \"" input "\"\n")))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1002 (setq eshell-current-command command)
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1003 (let ((delim (catch 'eshell-incomplete
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1004 (eshell-resume-eval))))
42971
a4e7fd8ad209 (eshell-eval-command): If eshell-resume-eval
Eli Zaretskii <eliz@gnu.org>
parents: 38414
diff changeset
1005 ;; On systems that don't support async subprocesses, eshell-resume
a4e7fd8ad209 (eshell-eval-command): If eshell-resume-eval
Eli Zaretskii <eliz@gnu.org>
parents: 38414
diff changeset
1006 ;; can return t. Don't treat that as an error.
62789
74e26c83386f (eshell-eval-command): If the return value of `eshell-resume-eval' is
John Wiegley <johnw@newartisans.com>
parents: 59121
diff changeset
1007 (if (listp delim)
74e26c83386f (eshell-eval-command): If the return value of `eshell-resume-eval' is
John Wiegley <johnw@newartisans.com>
parents: 59121
diff changeset
1008 (setq delim (car delim)))
42971
a4e7fd8ad209 (eshell-eval-command): If eshell-resume-eval
Eli Zaretskii <eliz@gnu.org>
parents: 38414
diff changeset
1009 (if (and delim (not (eq delim t)))
62789
74e26c83386f (eshell-eval-command): If the return value of `eshell-resume-eval' is
John Wiegley <johnw@newartisans.com>
parents: 59121
diff changeset
1010 (error "Unmatched delimiter: %c" delim)))))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1011
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1012 (defun eshell-resume-command (proc status)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1013 "Resume the current command when a process ends."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1014 (when proc
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1015 (unless (or (not (stringp status))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1016 (string= "stopped" status)
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1017 (string-match eshell-reset-signals status))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1018 (if (eq proc (eshell-interactive-process))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1019 (eshell-resume-eval)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1020
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1021 (defun eshell-resume-eval ()
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1022 "Destructively evaluate a form which may need to be deferred."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1023 (eshell-condition-case err
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1024 (progn
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1025 (setq eshell-last-async-proc nil)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1026 (when eshell-current-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1027 (let* (retval
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1028 (proc (catch 'eshell-defer
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1029 (ignore
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1030 (setq retval
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1031 (eshell-do-eval
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1032 eshell-current-command))))))
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1033 (if (eshell-processp proc)
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1034 (ignore (setq eshell-last-async-proc proc))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1035 (cadr retval)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1036 (error
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1037 (error (error-message-string err)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1038
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1039 (defmacro eshell-manipulate (tag &rest commands)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1040 "Manipulate a COMMAND form, with TAG as a debug identifier."
96274
b0ac9927a5c0 (eshell-manipulate): Check eshell-debug-command is bound before using it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95619
diff changeset
1041 ;; Check `bound'ness since at compile time the code until here has not
b0ac9927a5c0 (eshell-manipulate): Check eshell-debug-command is bound before using it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95619
diff changeset
1042 ;; executed yet.
b0ac9927a5c0 (eshell-manipulate): Check eshell-debug-command is bound before using it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95619
diff changeset
1043 (if (not (and (boundp 'eshell-debug-command) eshell-debug-command))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1044 `(progn ,@commands)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1045 `(progn
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1046 (eshell-debug-command ,(eval tag) form)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1047 ,@commands
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1048 (eshell-debug-command ,(concat "done " (eval tag)) form))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1049
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1050 (put 'eshell-manipulate 'lisp-indent-function 1)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1051
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1052 ;; eshell-lookup-function, eshell-functionp, and eshell-macrop taken
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1053 ;; from edebug
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1054
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1055 (defsubst eshell-lookup-function (object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1056 "Return the ultimate function definition of OBJECT."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1057 (while (and (symbolp object) (fboundp object))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1058 (setq object (symbol-function object)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1059 object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1060
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1061 (defconst function-p-func
48211
e23f9344f37d (function-p-func): Avoid `xemacs-p'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43335
diff changeset
1062 (if (fboundp 'compiled-function-p)
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1063 'compiled-function-p
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1064 'byte-code-function-p))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1065
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1066 (defsubst eshell-functionp (object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1067 "Returns the function named by OBJECT, or nil if it is not a function."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1068 (setq object (eshell-lookup-function object))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1069 (if (or (subrp object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1070 (funcall function-p-func object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1071 (and (listp object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1072 (eq (car object) 'lambda)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1073 (listp (car (cdr object)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1074 object))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1075
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1076 (defsubst eshell-macrop (object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1077 "Return t if OBJECT is a macro or nil otherwise."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1078 (setq object (eshell-lookup-function object))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1079 (if (and (listp object)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1080 (eq 'macro (car object))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1081 (eshell-functionp (cdr object)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1082 t))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1083
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1084 (defun eshell-do-eval (form &optional synchronous-p)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1085 "Evaluate form, simplifying it as we go.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1086 Unless SYNCHRONOUS-P is non-nil, throws `eshell-defer' if it needs to
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1087 be finished later after the completion of an asynchronous subprocess."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1088 (cond
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1089 ((not (listp form))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1090 (list 'quote (eval form)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1091 ((memq (car form) '(quote function))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1092 form)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1093 (t
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1094 ;; skip past the call to `eshell-do-eval'
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1095 (when (eq (car form) 'eshell-do-eval)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1096 (setq form (cadr (cadr form))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1097 ;; expand any macros directly into the form. This is done so that
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1098 ;; we can modify any `let' forms to evaluate only once.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1099 (if (eshell-macrop (car form))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1100 (let ((exp (eshell-copy-tree (macroexpand form))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1101 (eshell-manipulate (format "expanding macro `%s'"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1102 (symbol-name (car form)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1103 (setcar form (car exp))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1104 (setcdr form (cdr exp)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1105 (let ((args (cdr form)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1106 (cond
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1107 ((eq (car form) 'while)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1108 ;; `eshell-copy-tree' is needed here so that the test argument
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1109 ;; doesn't get modified and thus always yield the same result.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1110 (when (car eshell-command-body)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1111 (assert (not synchronous-p))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1112 (eshell-do-eval (car eshell-command-body))
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1113 (setcar eshell-command-body nil)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1114 (setcar eshell-test-body nil))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1115 (unless (car eshell-test-body)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1116 (setcar eshell-test-body (eshell-copy-tree (car args))))
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1117 (while (cadr (eshell-do-eval (car eshell-test-body)))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1118 (setcar eshell-command-body (eshell-copy-tree (cadr args)))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1119 (eshell-do-eval (car eshell-command-body) synchronous-p)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1120 (setcar eshell-command-body nil)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1121 (setcar eshell-test-body (eshell-copy-tree (car args))))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1122 (setcar eshell-command-body nil))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1123 ((eq (car form) 'if)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1124 ;; `eshell-copy-tree' is needed here so that the test argument
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1125 ;; doesn't get modified and thus always yield the same result.
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1126 (if (car eshell-command-body)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1127 (progn
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1128 (assert (not synchronous-p))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1129 (eshell-do-eval (car eshell-command-body)))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1130 (unless (car eshell-test-body)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1131 (setcar eshell-test-body (eshell-copy-tree (car args))))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1132 (if (cadr (eshell-do-eval (car eshell-test-body)))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1133 (setcar eshell-command-body (eshell-copy-tree (cadr args)))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1134 (setcar eshell-command-body (eshell-copy-tree (car (cddr args)))))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1135 (eshell-do-eval (car eshell-command-body) synchronous-p))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1136 (setcar eshell-command-body nil)
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1137 (setcar eshell-test-body nil))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1138 ((eq (car form) 'setcar)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1139 (setcar (cdr args) (eshell-do-eval (cadr args) synchronous-p))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1140 (eval form))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1141 ((eq (car form) 'setcdr)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1142 (setcar (cdr args) (eshell-do-eval (cadr args) synchronous-p))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1143 (eval form))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1144 ((memq (car form) '(let catch condition-case unwind-protect))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1145 ;; `let', `condition-case' and `unwind-protect' have to be
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1146 ;; handled specially, because we only want to call
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1147 ;; `eshell-do-eval' on their first form.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1148 ;;
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1149 ;; NOTE: This requires obedience by all forms which this
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1150 ;; function might encounter, that they do not contain
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1151 ;; other special forms.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1152 (if (and (eq (car form) 'let)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1153 (not (eq (car (cadr args)) 'eshell-do-eval)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1154 (eshell-manipulate "evaluating let args"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1155 (eshell-for letarg (car args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1156 (if (and (listp letarg)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1157 (not (eq (cadr letarg) 'quote)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1158 (setcdr letarg
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1159 (list (eshell-do-eval
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1160 (cadr letarg) synchronous-p)))))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1161 (unless (eq (car form) 'unwind-protect)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1162 (setq args (cdr args)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1163 (unless (eq (caar args) 'eshell-do-eval)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1164 (eshell-manipulate "handling special form"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1165 (setcar args (list 'eshell-do-eval
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1166 (list 'quote (car args))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1167 synchronous-p))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1168 (eval form))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1169 (t
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1170 (if (and args (not (memq (car form) '(run-hooks))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1171 (eshell-manipulate
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1172 (format "evaluating arguments to `%s'"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1173 (symbol-name (car form)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1174 (while args
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1175 (setcar args (eshell-do-eval (car args) synchronous-p))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1176 (setq args (cdr args)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1177 (cond
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1178 ((eq (car form) 'progn)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1179 (car (last form)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1180 ((eq (car form) 'prog1)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1181 (cadr form))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1182 (t
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1183 ;; If a command desire to replace its execution form with
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1184 ;; another command form, all it needs to do is throw the new
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1185 ;; form using the exception tag `eshell-replace-command'.
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1186 ;; For example, let's say that the form currently being
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1187 ;; eval'd is:
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1188 ;;
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1189 ;; (eshell-named-command "hello")
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1190 ;;
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1191 ;; Now, let's assume the 'hello' command is an Eshell alias,
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1192 ;; the definition of which yields the command:
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1193 ;;
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1194 ;; (eshell-named-command "echo" (list "Hello" "world"))
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1195 ;;
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1196 ;; What the alias code would like to do is simply substitute
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1197 ;; the alias form for the original form. To accomplish
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1198 ;; this, all it needs to do is to throw the substitution
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1199 ;; form with the `eshell-replace-command' tag, and the form
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1200 ;; will be replaced within the current command, and
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1201 ;; execution will then resume (iteratively) as before.
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1202 ;; Thus, aliases can even contain references to asynchronous
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1203 ;; sub-commands, and things will still work out as they
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
1204 ;; should.
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1205 (let (result new-form)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1206 (if (setq new-form
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1207 (catch 'eshell-replace-command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1208 (ignore
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1209 (setq result (eval form)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1210 (progn
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1211 (eshell-manipulate "substituting replacement form"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1212 (setcar form (car new-form))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1213 (setcdr form (cdr new-form)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1214 (eshell-do-eval form synchronous-p))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1215 (if (and (memq (car form) eshell-deferrable-commands)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1216 (not eshell-current-subjob-p)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1217 result
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1218 (eshell-processp result))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1219 (if synchronous-p
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1220 (eshell/wait result)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1221 (eshell-manipulate "inserting ignore form"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1222 (setcar form 'ignore)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1223 (setcdr form nil))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1224 (throw 'eshell-defer result))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1225 (list 'quote result))))))))))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1226
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1227 ;; command invocation
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1228
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1229 (defun eshell/which (command &rest names)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1230 "Identify the COMMAND, and where it is located."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1231 (eshell-for name (cons command names)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1232 (let (program alias direct)
37817
431f430082e9 (eshell/which): Use `eshell-explicit-command-char' instead of ?*.
John Wiegley <johnw@newartisans.com>
parents: 37665
diff changeset
1233 (if (eq (aref name 0) eshell-explicit-command-char)
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1234 (setq name (substring name 1)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1235 direct t))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1236 (if (and (not direct)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1237 (eshell-using-module 'eshell-alias)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1238 (setq alias
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1239 (funcall (symbol-function 'eshell-lookup-alias)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1240 name)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1241 (setq program
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1242 (concat name " is an alias, defined as \""
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1243 (cadr alias) "\"")))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1244 (unless program
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1245 (setq program (eshell-search-path name))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1246 (let* ((esym (eshell-find-alias-function name))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1247 (sym (or esym (intern-soft name))))
55968
db23082093f5 2004-06-06 Emilio C. Lopes <eclig@gmx.net>
John Wiegley <johnw@newartisans.com>
parents: 54568
diff changeset
1248 (if (and (or esym (and sym (fboundp sym)))
db23082093f5 2004-06-06 Emilio C. Lopes <eclig@gmx.net>
John Wiegley <johnw@newartisans.com>
parents: 54568
diff changeset
1249 (or eshell-prefer-lisp-functions (not direct)))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1250 (let ((desc (let ((inhibit-redisplay t))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1251 (save-window-excursion
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1252 (prog1
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1253 (describe-function sym)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1254 (message nil))))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1255 (setq desc (substring desc 0
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1256 (1- (or (string-match "\n" desc)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1257 (length desc)))))
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1258 (if (buffer-live-p (get-buffer "*Help*"))
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 30272
diff changeset
1259 (kill-buffer "*Help*"))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1260 (setq program (or desc name))))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1261 (if (not program)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1262 (eshell-error (format "which: no %s in (%s)\n"
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1263 name (getenv "PATH")))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1264 (eshell-printn program)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1265
37662
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1266 (put 'eshell/which 'eshell-no-numeric-conversions t)
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1267
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1268 (defun eshell-named-command (command &optional args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1269 "Insert output from a plain COMMAND, using ARGS.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1270 COMMAND may result in an alias being executed, or a plain command."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1271 (setq eshell-last-arguments args
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1272 eshell-last-command-name (eshell-stringify command))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1273 (run-hook-with-args 'eshell-prepare-command-hook)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1274 (assert (stringp eshell-last-command-name))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1275 (if eshell-last-command-name
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1276 (or (run-hook-with-args-until-success
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1277 'eshell-named-command-hook eshell-last-command-name
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1278 eshell-last-arguments)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1279 (eshell-plain-command eshell-last-command-name
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1280 eshell-last-arguments))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1281
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1282 (defalias 'eshell-named-command* 'eshell-named-command)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1283
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1284 (defun eshell-find-alias-function (name)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1285 "Check whether a function called `eshell/NAME' exists."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1286 (let* ((sym (intern-soft (concat "eshell/" name)))
59121
7b2031432b63 (eshell-find-alias-function): Call symbol-file with `defun'.
Richard M. Stallman <rms@gnu.org>
parents: 55968
diff changeset
1287 (file (symbol-file sym 'defun)))
37442
f4b209194d8c (eshell-find-alias-function): Return t in the case where the function
John Wiegley <johnw@newartisans.com>
parents: 33020
diff changeset
1288 ;; If the function exists, but is defined in an eshell module
f4b209194d8c (eshell-find-alias-function): Return t in the case where the function
John Wiegley <johnw@newartisans.com>
parents: 33020
diff changeset
1289 ;; that's not currently enabled, don't report it as found
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1290 (if (and file
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1291 (string-match "\\(em\\|esh\\)-\\(.*\\)\\(\\.el\\)?\\'" file))
37442
f4b209194d8c (eshell-find-alias-function): Return t in the case where the function
John Wiegley <johnw@newartisans.com>
parents: 33020
diff changeset
1292 (let ((module-sym
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1293 (intern (file-name-sans-extension
37442
f4b209194d8c (eshell-find-alias-function): Return t in the case where the function
John Wiegley <johnw@newartisans.com>
parents: 33020
diff changeset
1294 (file-name-nondirectory
f4b209194d8c (eshell-find-alias-function): Return t in the case where the function
John Wiegley <johnw@newartisans.com>
parents: 33020
diff changeset
1295 (concat "eshell-" (match-string 2 file)))))))
37450
b1c5785dbec5 (eshell-find-alias-function): Corrected the fix from last night, since
John Wiegley <johnw@newartisans.com>
parents: 37442
diff changeset
1296 (if (and (functionp sym)
b1c5785dbec5 (eshell-find-alias-function): Corrected the fix from last night, since
John Wiegley <johnw@newartisans.com>
parents: 37442
diff changeset
1297 (or (null module-sym)
b1c5785dbec5 (eshell-find-alias-function): Corrected the fix from last night, since
John Wiegley <johnw@newartisans.com>
parents: 37442
diff changeset
1298 (eshell-using-module module-sym)
b1c5785dbec5 (eshell-find-alias-function): Corrected the fix from last night, since
John Wiegley <johnw@newartisans.com>
parents: 37442
diff changeset
1299 (memq module-sym (eshell-subgroups 'eshell))))
37442
f4b209194d8c (eshell-find-alias-function): Return t in the case where the function
John Wiegley <johnw@newartisans.com>
parents: 33020
diff changeset
1300 sym))
f4b209194d8c (eshell-find-alias-function): Return t in the case where the function
John Wiegley <johnw@newartisans.com>
parents: 33020
diff changeset
1301 ;; Otherwise, if it's bound, return it.
f4b209194d8c (eshell-find-alias-function): Return t in the case where the function
John Wiegley <johnw@newartisans.com>
parents: 33020
diff changeset
1302 (if (functionp sym)
f4b209194d8c (eshell-find-alias-function): Return t in the case where the function
John Wiegley <johnw@newartisans.com>
parents: 33020
diff changeset
1303 sym))))
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1304
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1305 (defun eshell-plain-command (command args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1306 "Insert output from a plain COMMAND, using ARGS.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1307 COMMAND may result in either a Lisp function being executed by name,
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1308 or an external command."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1309 (let* ((esym (eshell-find-alias-function command))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1310 (sym (or esym (intern-soft command))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1311 (if (and sym (fboundp sym)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1312 (or esym eshell-prefer-lisp-functions
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1313 (not (eshell-search-path command))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1314 (eshell-lisp-command sym args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1315 (eshell-external-command command args))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1316
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1317 (defun eshell-exec-lisp (printer errprint func-or-form args form-p)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1318 "Execute a lisp FUNC-OR-FORM, maybe passing ARGS.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1319 PRINTER and ERRPRINT are functions to use for printing regular
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1320 messages, and errors. FORM-P should be non-nil if FUNC-OR-FORM
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1321 represent a lisp form; ARGS will be ignored in that case."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1322 (let (result)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1323 (eshell-condition-case err
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1324 (progn
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1325 (setq result
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1326 (save-current-buffer
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1327 (if form-p
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1328 (eval func-or-form)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1329 (apply func-or-form args))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1330 (and result (funcall printer result))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1331 result)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1332 (error
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1333 (let ((msg (error-message-string err)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1334 (if (and (not form-p)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1335 (string-match "^Wrong number of arguments" msg)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1336 (fboundp 'eldoc-get-fnsym-args-string))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1337 (let ((func-doc (eldoc-get-fnsym-args-string func-or-form)))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1338 (setq msg (format "usage: %s" func-doc))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1339 (funcall errprint msg))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1340 nil))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1341
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1342 (defsubst eshell-apply* (printer errprint func args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1343 "Call FUNC, with ARGS, trapping errors and return them as output.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1344 PRINTER and ERRPRINT are functions to use for printing regular
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1345 messages, and errors."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1346 (eshell-exec-lisp printer errprint func args nil))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1347
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1348 (defsubst eshell-funcall* (printer errprint func &rest args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1349 "Call FUNC, with ARGS, trapping errors and return them as output."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1350 (eshell-apply* printer errprint func args))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1351
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1352 (defsubst eshell-eval* (printer errprint form)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1353 "Evaluate FORM, trapping errors and returning them."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1354 (eshell-exec-lisp printer errprint form nil t))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1355
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1356 (defsubst eshell-apply (func args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1357 "Call FUNC, with ARGS, trapping errors and return them as output.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1358 PRINTER and ERRPRINT are functions to use for printing regular
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1359 messages, and errors."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1360 (eshell-apply* 'eshell-print 'eshell-error func args))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1361
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1362 (defsubst eshell-funcall (func &rest args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1363 "Call FUNC, with ARGS, trapping errors and return them as output."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1364 (eshell-apply func args))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1365
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1366 (defsubst eshell-eval (form)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1367 "Evaluate FORM, trapping errors and returning them."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1368 (eshell-eval* 'eshell-print 'eshell-error form))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1369
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1370 (defsubst eshell-applyn (func args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1371 "Call FUNC, with ARGS, trapping errors and return them as output.
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1372 PRINTER and ERRPRINT are functions to use for printing regular
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1373 messages, and errors."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1374 (eshell-apply* 'eshell-printn 'eshell-errorn func args))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1375
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1376 (defsubst eshell-funcalln (func &rest args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1377 "Call FUNC, with ARGS, trapping errors and return them as output."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1378 (eshell-applyn func args))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1379
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1380 (defsubst eshell-evaln (form)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1381 "Evaluate FORM, trapping errors and returning them."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1382 (eshell-eval* 'eshell-printn 'eshell-errorn form))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1383
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1384 (defun eshell-lisp-command (object &optional args)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1385 "Insert Lisp OBJECT, using ARGS if a function."
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1386 (catch 'eshell-external ; deferred to an external command
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1387 (let* ((eshell-ensure-newline-p (eshell-interactive-output-p))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1388 (result
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1389 (if (functionp object)
37662
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1390 (progn
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1391 (setq eshell-last-arguments args
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1392 eshell-last-command-name
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1393 (concat "#<function " (symbol-name object) ">"))
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1394 ;; if any of the arguments are flagged as numbers
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1395 ;; waiting for conversion, convert them now
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1396 (unless (get object 'eshell-no-numeric-conversions)
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1397 (while args
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1398 (let ((arg (car args)))
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1399 (if (and (stringp arg)
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1400 (> (length arg) 0)
53051
bf3ee9e2ceda (eshell-lisp-command): Do not late-convert string arguments to numbers
John Wiegley <johnw@newartisans.com>
parents: 52401
diff changeset
1401 (not (text-property-not-all
bf3ee9e2ceda (eshell-lisp-command): Do not late-convert string arguments to numbers
John Wiegley <johnw@newartisans.com>
parents: 52401
diff changeset
1402 0 (length arg) 'number t arg)))
37665
ebd292552bfe Fixed reference to free variable.
John Wiegley <johnw@newartisans.com>
parents: 37662
diff changeset
1403 (setcar args (string-to-number arg))))
37662
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1404 (setq args (cdr args))))
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1405 (eshell-apply object eshell-last-arguments))
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1406 (setq eshell-last-arguments args
cb20d33bef50 (eshell-lisp-command): Don't perform numeric conversions if a Lisp
John Wiegley <johnw@newartisans.com>
parents: 37657
diff changeset
1407 eshell-last-command-name "#<Lisp object>")
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1408 (eshell-eval object))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1409 (if (and eshell-ensure-newline-p
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1410 (save-excursion
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1411 (goto-char eshell-last-output-end)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1412 (not (bolp))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1413 (eshell-print "\n"))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1414 (eshell-close-handles 0 (list 'quote result)))))
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1415
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1416 (defalias 'eshell-lisp-command* 'eshell-lisp-command)
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1417
87079
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
1418 (provide 'esh-cmd)
c1197dc2780b Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents: 86202
diff changeset
1419
93975
1e3a407766b9 Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1420 ;; arch-tag: 8e4f3867-a0c5-441f-96ba-ddd142d94366
29873
b0bbf97625c2 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1421 ;;; esh-cmd.el ends here