annotate lisp/eshell/esh-cmd.el @ 30611:179f6da6b8cb

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