Mercurial > emacs
annotate lisp/shell.el @ 4943:7a6aea972b7e
Doc fixes.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 09 Nov 1993 21:37:50 +0000 |
parents | dfb65242faf4 |
children | 220ec2f456e0 |
rev | line source |
---|---|
925
6295ac3be480
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
844
diff
changeset
|
1 ;;; shell.el --- specialized comint.el for running the shell. |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
2 ;;; Copyright (C) 1988, 1993 Free Software Foundation, Inc. |
844
bf829a2d63b4
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
814
diff
changeset
|
3 |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
4 ;; Author: Olin Shivers <shivers@cs.cmu.edu> |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
5 ;; Adapted-by: Simon Marshall <s.marshall@dcs.hull.ac.uk> |
814
38b2499cb3e9
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
6 ;; Keywords: processes |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
7 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
8 ;;; This file is part of GNU Emacs. |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
9 |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
10 ;;; GNU Emacs is free software; you can redistribute it and/or modify |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
11 ;;; it under the terms of the GNU General Public License as published by |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
787
diff
changeset
|
12 ;;; the Free Software Foundation; either version 2, or (at your option) |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
13 ;;; any later version. |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
14 |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
15 ;;; GNU Emacs is distributed in the hope that it will be useful, |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
16 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
17 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
18 ;;; GNU General Public License for more details. |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
19 |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
20 ;;; You should have received a copy of the GNU General Public License |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
21 ;;; along with GNU Emacs; see the file COPYING. If not, write to |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
22 ;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. |
114 | 23 |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
24 ;;; Commentary: |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
25 |
252 | 26 ;;; Please send me bug reports, bug fixes, and extensions, so that I can |
27 ;;; merge them into the master source. | |
28 ;;; - Olin Shivers (shivers@cs.cmu.edu) | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
29 ;;; - Simon Marshall (s.marshall@dcs.hull.ac.uk) |
114 | 30 |
252 | 31 ;;; This file defines a a shell-in-a-buffer package (shell mode) built |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
32 ;;; on top of comint mode. This is actually cmushell with things |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
33 ;;; renamed to replace its counterpart in Emacs 18. cmushell is more |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
34 ;;; featureful, robust, and uniform than the Emacs 18 version. |
114 | 35 |
36 ;;; Since this mode is built on top of the general command-interpreter-in- | |
37 ;;; a-buffer mode (comint mode), it shares a common base functionality, | |
38 ;;; and a common set of bindings, with all modes derived from comint mode. | |
252 | 39 ;;; This makes these modes easier to use. |
114 | 40 |
41 ;;; For documentation on the functionality provided by comint mode, and | |
42 ;;; the hooks available for customising it, see the file comint.el. | |
252 | 43 ;;; For further information on shell mode, see the comments below. |
114 | 44 |
45 ;;; Needs fixin: | |
46 ;;; When sending text from a source file to a subprocess, the process-mark can | |
47 ;;; move off the window, so you can lose sight of the process interactions. | |
48 ;;; Maybe I should ensure the process mark is in the window when I send | |
49 ;;; text to the process? Switch selectable? | |
50 | |
252 | 51 ;; YOUR .EMACS FILE |
52 ;;============================================================================= | |
53 ;; Some suggestions for your .emacs file. | |
54 ;; | |
2351
bb1ff4e31fb6
Brent Benson's patch to support `cd -'.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1801
diff
changeset
|
55 ;; ; If shell lives in some non-standard directory, you must tell emacs |
252 | 56 ;; ; where to get it. This may or may not be necessary. |
57 ;; (setq load-path (cons (expand-file-name "~jones/lib/emacs") load-path)) | |
58 ;; | |
2351
bb1ff4e31fb6
Brent Benson's patch to support `cd -'.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1801
diff
changeset
|
59 ;; ; Autoload shell from file shell.el |
bb1ff4e31fb6
Brent Benson's patch to support `cd -'.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1801
diff
changeset
|
60 ;; (autoload 'shell "shell" |
252 | 61 ;; "Run an inferior shell process." |
62 ;; t) | |
63 ;; | |
2351
bb1ff4e31fb6
Brent Benson's patch to support `cd -'.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1801
diff
changeset
|
64 ;; ; Define C-c t to run my favorite command in shell mode: |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
65 ;; (setq shell-mode-hook |
252 | 66 ;; '((lambda () |
2351
bb1ff4e31fb6
Brent Benson's patch to support `cd -'.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1801
diff
changeset
|
67 ;; (define-key shell-mode-map "\C-ct" 'favorite-cmd)))) |
252 | 68 |
69 | |
70 ;;; Brief Command Documentation: | |
71 ;;;============================================================================ | |
72 ;;; Comint Mode Commands: (common to shell and all comint-derived modes) | |
73 ;;; | |
74 ;;; m-p comint-previous-input Cycle backwards in input history | |
75 ;;; m-n comint-next-input Cycle forwards | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
76 ;;; m-r comint-previous-matching-input Previous input matching a regexp |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
77 ;;; m-R comint-previous-matching-input-from-input -"- matching input |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
78 ;;; m-s comint-next-matching-input Next input that matches |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
79 ;;; m-S comint-next-matching-input-from-input -"- matching input |
252 | 80 ;;; m-c-r comint-previous-input-matching Search backwards in input history |
81 ;;; return comint-send-input | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
82 ;;; c-a comint-bol Beginning of line; skip prompt |
252 | 83 ;;; c-d comint-delchar-or-maybe-eof Delete char unless at end of buff. |
84 ;;; c-c c-u comint-kill-input ^u | |
85 ;;; c-c c-w backward-kill-word ^w | |
86 ;;; c-c c-c comint-interrupt-subjob ^c | |
87 ;;; c-c c-z comint-stop-subjob ^z | |
88 ;;; c-c c-\ comint-quit-subjob ^\ | |
89 ;;; c-c c-o comint-kill-output Delete last batch of process output | |
90 ;;; c-c c-r comint-show-output Show last batch of process output | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
91 ;;; c-c c-h comint-dynamic-list-input-ring List input history |
252 | 92 ;;; send-invisible Read line w/o echo & send to proc |
93 ;;; comint-continue-subjob Useful if you accidentally suspend | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
94 ;;; top-level job |
252 | 95 ;;; comint-mode-hook is the comint mode hook. |
96 | |
97 ;;; Shell Mode Commands: | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
98 ;;; shell Fires up the shell process |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
99 ;;; tab comint-dynamic-complete Complete filename/command/history |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
100 ;;; m-? comint-dynamic-list-filename-completions List completions in help buffer |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
101 ;;; m-c-f shell-forward-command Forward a shell command |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
102 ;;; m-c-b shell-backward-command Backward a shell command |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
103 ;;; dirs Resync the buffer's dir stack |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
104 ;;; dirtrack-toggle Turn dir tracking on/off |
252 | 105 ;;; |
106 ;;; The shell mode hook is shell-mode-hook | |
107 ;;; comint-prompt-regexp is initialised to shell-prompt-pattern, for backwards | |
108 ;;; compatibility. | |
109 | |
110 ;;; Read the rest of this file for more information. | |
111 | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
112 ;;; SHELL.EL COMPATIBILITY |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
113 ;;; Notes from when this was called cmushell, and was not the standard emacs |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
114 ;;; shell package. |
252 | 115 ;;;============================================================================ |
116 ;;; In brief: this package should have no trouble coexisting with shell.el. | |
117 ;;; | |
118 ;;; Most customising variables -- e.g., explicit-shell-file-name -- are the | |
119 ;;; same, so the users shouldn't have much trouble. Hooks have different | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
120 ;;; names, however, so you can customise shell mode differently from cmushell |
252 | 121 ;;; mode. You basically just have to remember to type M-x cmushell instead of |
122 ;;; M-x shell. | |
123 ;;; | |
124 ;;; It would be nice if this file was completely plug-compatible with the old | |
125 ;;; shell package -- if you could just name this file shell.el, and have it | |
126 ;;; transparently replace the old one. But you can't. Several other packages | |
127 ;;; (tex-mode, background, dbx, gdb, kermit, monkey, prolog, telnet) are also | |
128 ;;; clients of shell mode. These packages assume detailed knowledge of shell | |
129 ;;; mode internals in ways that are incompatible with cmushell mode (mostly | |
130 ;;; because of cmushell mode's greater functionality). So, unless we are | |
131 ;;; willing to port all of these packages, we can't have this file be a | |
132 ;;; complete replacement for shell.el -- that is, we can't name this file | |
133 ;;; shell.el, and its main entry point (shell), because dbx.el will break | |
134 ;;; when it loads it in and tries to use it. | |
135 ;;; | |
136 ;;; There are two ways to fix this. One: rewrite these other modes to use the | |
137 ;;; new package. This is a win, but can't be assumed. The other, backwards | |
138 ;;; compatible route, is to make this package non-conflict with shell.el, so | |
139 ;;; both files can be loaded in at the same time. And *that* is why some | |
140 ;;; functions and variables have different names: (cmushell), | |
141 ;;; cmushell-mode-map, that sort of thing. All the names have been carefully | |
142 ;;; chosen so that shell.el and cmushell.el won't tromp on each other. | |
143 | |
2557
a212ee1907fe
(shell-mode): isationization (doc fix).
Roland McGrath <roland@gnu.org>
parents:
2556
diff
changeset
|
144 ;;; Customization and Buffer Variables |
252 | 145 ;;; =========================================================================== |
146 ;;; | |
147 | |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
148 ;;; Code: |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
149 |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
150 (require 'comint) |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
151 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
152 ;;;###autoload |
4131
c9a0f06110bd
* shell.el (shell-process-pushd): Fix syntax error in
Jim Blandy <jimb@redhat.com>
parents:
3418
diff
changeset
|
153 (defvar shell-prompt-pattern "^[^#$%>\n]*[#$%>] *" |
252 | 154 "Regexp to match prompts in the inferior shell. |
4131
c9a0f06110bd
* shell.el (shell-process-pushd): Fix syntax error in
Jim Blandy <jimb@redhat.com>
parents:
3418
diff
changeset
|
155 Defaults to \"^[^#$%>\\n]*[#$%>] *\", which works pretty well. |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
156 This variable is used to initialise `comint-prompt-regexp' in the |
252 | 157 shell buffer. |
158 | |
4131
c9a0f06110bd
* shell.el (shell-process-pushd): Fix syntax error in
Jim Blandy <jimb@redhat.com>
parents:
3418
diff
changeset
|
159 The pattern should probably not match more than one line. If it does, |
c9a0f06110bd
* shell.el (shell-process-pushd): Fix syntax error in
Jim Blandy <jimb@redhat.com>
parents:
3418
diff
changeset
|
160 shell-mode may become confused trying to distinguish prompt from input |
c9a0f06110bd
* shell.el (shell-process-pushd): Fix syntax error in
Jim Blandy <jimb@redhat.com>
parents:
3418
diff
changeset
|
161 on lines which don't start with a prompt. |
c9a0f06110bd
* shell.el (shell-process-pushd): Fix syntax error in
Jim Blandy <jimb@redhat.com>
parents:
3418
diff
changeset
|
162 |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
163 This is a fine thing to set in your `.emacs' file.") |
252 | 164 |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
165 (defvar shell-delimiter-argument-list '("|" "&" "<" ">" "(" ")" ";") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
166 "List of characters to recognise as separate arguments. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
167 Defaults to \(\"|\" \"&\" \"\(\" \")\" \";\"), which works pretty well. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
168 This variable is used to initialise `comint-delimiter-argument-list' in the |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
169 shell buffer. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
170 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
171 This is a fine thing to set in your `.emacs' file.") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
172 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
173 (defvar shell-command-regexp "\\((.*)\\|[^;&|]\\)+" |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
174 "*Regexp to match shell commands. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
175 Elements of pipes are considered as separate commands, forks and redirections |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
176 as part of one command.") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
177 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
178 (defvar shell-completion-execonly t |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
179 "*If non-nil, use executable files only for completion candidates. |
4938 | 180 This mirrors the optional behavior of tcsh. |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
181 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
182 Detecting executability of files may slow command completion considerably.") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
183 |
114 | 184 (defvar shell-popd-regexp "popd" |
185 "*Regexp to match subshell commands equivalent to popd.") | |
186 | |
187 (defvar shell-pushd-regexp "pushd" | |
188 "*Regexp to match subshell commands equivalent to pushd.") | |
189 | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
190 (defvar shell-pushd-tohome nil |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
191 "*If non-nil, make pushd with no arg behave as \"pushd ~\" (like cd). |
4938 | 192 This mirrors the optional behavior of tcsh.") |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
193 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
194 (defvar shell-pushd-dextract nil |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
195 "*If non-nil, make \"pushd +n\" pop the nth dir to the stack top. |
4938 | 196 This mirrors the optional behavior of tcsh.") |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
197 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
198 (defvar shell-pushd-dunique nil |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
199 "*If non-nil, make pushd only add unique directories to the stack. |
4938 | 200 This mirrors the optional behavior of tcsh.") |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
201 |
114 | 202 (defvar shell-cd-regexp "cd" |
203 "*Regexp to match subshell commands equivalent to cd.") | |
204 | |
205 (defvar explicit-shell-file-name nil | |
206 "*If non-nil, is file name to use for explicitly requested inferior shell.") | |
207 | |
208 (defvar explicit-csh-args | |
209 (if (eq system-type 'hpux) | |
210 ;; -T persuades HP's csh not to think it is smarter | |
211 ;; than us about what terminal modes to use. | |
212 '("-i" "-T") | |
213 '("-i")) | |
214 "*Args passed to inferior shell by M-x shell, if the shell is csh. | |
215 Value is a list of strings, which may be nil.") | |
216 | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
217 ;;; All the above vars aren't prefixed "cmushell-" to make them |
252 | 218 ;;; backwards compatible w/shell.el and old .emacs files. |
219 | |
114 | 220 (defvar shell-dirstack nil |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
221 "List of directories saved by pushd in this buffer's shell. |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
222 Thus, this does not include the shell's current directory.") |
114 | 223 |
2351
bb1ff4e31fb6
Brent Benson's patch to support `cd -'.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1801
diff
changeset
|
224 (defvar shell-last-dir nil |
bb1ff4e31fb6
Brent Benson's patch to support `cd -'.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1801
diff
changeset
|
225 "Keep track of last directory for ksh `cd -' command.") |
bb1ff4e31fb6
Brent Benson's patch to support `cd -'.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1801
diff
changeset
|
226 |
114 | 227 (defvar shell-dirstack-query "dirs" |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
228 "Command used by `shell-resync-dir' to query the shell.") |
114 | 229 |
252 | 230 (defvar shell-mode-map '()) |
114 | 231 (cond ((not shell-mode-map) |
252 | 232 (setq shell-mode-map (full-copy-sparse-keymap comint-mode-map)) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
233 (define-key shell-mode-map "\C-c\C-f" 'shell-forward-command) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
234 (define-key shell-mode-map "\C-c\C-b" 'shell-backward-command) |
114 | 235 (define-key shell-mode-map "\t" 'comint-dynamic-complete) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
236 (define-key shell-mode-map "\M-?" |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
237 'comint-dynamic-list-filename-completions))) |
114 | 238 |
239 (defvar shell-mode-hook '() | |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
240 "*Hook for customising Shell mode.") |
114 | 241 |
242 | |
243 ;;; Basic Procedures | |
244 ;;; =========================================================================== | |
245 ;;; | |
246 | |
247 (defun shell-mode () | |
248 "Major mode for interacting with an inferior shell. | |
249 Return after the end of the process' output sends the text from the | |
250 end of process to the end of the current line. | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
251 Return before end of process output copies the current line (except |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
252 for the prompt) to the end of the buffer and sends it. |
114 | 253 M-x send-invisible reads a line of text without echoing it, and sends it to |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
254 the shell. This is useful for entering passwords. |
114 | 255 |
256 If you accidentally suspend your process, use \\[comint-continue-subjob] | |
257 to continue it. | |
258 | |
259 cd, pushd and popd commands given to the shell are watched by Emacs to keep | |
260 this buffer's default directory the same as the shell's working directory. | |
261 M-x dirs queries the shell and resyncs Emacs' idea of what the current | |
262 directory stack is. | |
263 M-x dirtrack-toggle turns directory tracking on and off. | |
264 | |
265 \\{shell-mode-map} | |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
266 Customization: Entry to this mode runs the hooks on `comint-mode-hook' and |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
267 `shell-mode-hook' (in that order). After each shell output, the hooks on |
4938 | 268 `comint-output-filter-functions' are run. |
114 | 269 |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
270 Variables `shell-cd-regexp', `shell-pushd-regexp' and `shell-popd-regexp' |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
271 are used to match their respective commands, while `shell-pushd-tohome', |
4938 | 272 `shell-pushd-dextract' and `shell-pushd-dunique' control the behavior of the |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
273 relevant command. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
274 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
275 Variables `comint-completion-autolist', `comint-completion-addsuffix' and |
4938 | 276 `comint-completion-recexact' control the behavior of file name, command name |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
277 and variable name completion. Variable `shell-completion-execonly' controls |
4938 | 278 the behavior of command name completion. |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
279 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
280 Variables `comint-input-ring-file-name' and `comint-input-autoexpand' control |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
281 the initialisation of the input ring history, and history expansion. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
282 |
4938 | 283 Variables `comint-output-filter-functions', `comint-scroll-to-bottom-on-input', |
284 and `comint-scroll-to-bottom-on-output' control whether input and output | |
285 cause the window to scroll to the end of the buffer." | |
114 | 286 (interactive) |
287 (comint-mode) | |
252 | 288 (setq major-mode 'shell-mode) |
2556
8b6c3d4256a0
(shell-mode): Capitalize mode name.
Roland McGrath <roland@gnu.org>
parents:
2469
diff
changeset
|
289 (setq mode-name "Shell") |
114 | 290 (use-local-map shell-mode-map) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
291 (setq comint-prompt-regexp shell-prompt-pattern) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
292 (setq comint-delimiter-argument-list shell-delimiter-argument-list) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
293 (setq comint-after-partial-filename-command 'shell-after-partial-filename) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
294 (setq comint-get-current-command 'shell-get-current-command) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
295 (setq comint-dynamic-complete-command-command 'shell-dynamic-complete-command) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
296 (make-local-variable 'paragraph-start) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
297 (setq paragraph-start comint-prompt-regexp) |
114 | 298 (make-local-variable 'shell-dirstack) |
252 | 299 (setq shell-dirstack nil) |
2351
bb1ff4e31fb6
Brent Benson's patch to support `cd -'.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1801
diff
changeset
|
300 (setq shell-last-dir nil) |
252 | 301 (make-local-variable 'shell-dirtrackp) |
302 (setq shell-dirtrackp t) | |
303 (setq comint-input-sentinel 'shell-directory-tracker) | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
304 ;; shell-dependent assignments. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
305 (let ((shell (car (process-command (get-buffer-process (current-buffer)))))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
306 (setq comint-input-ring-file-name |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
307 (or (getenv "HISTFILE") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
308 (cond ((string-match "csh$" shell) "~/.history") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
309 ((string-match "bash$" shell) "~/.bash_history") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
310 ((string-match "ksh$" shell) "~/.sh_history") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
311 (t "~/.history"))))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
312 (run-hooks 'shell-mode-hook) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
313 (comint-read-input-ring) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
314 (shell-dirstack-message)) |
114 | 315 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
316 ;;;###autoload |
114 | 317 (defun shell () |
318 "Run an inferior shell, with I/O through buffer *shell*. | |
319 If buffer exists but shell process is not running, make new shell. | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
320 If buffer exists and shell process is running, just switch to buffer `*shell*'. |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
321 Program used comes from variable `explicit-shell-file-name', |
252 | 322 or (if that is nil) from the ESHELL environment variable, |
323 or else from SHELL if there is no ESHELL. | |
1076 | 324 If a file `~/.emacs_SHELLNAME' exists, it is given as initial input |
252 | 325 (Note that this may lose due to a timing error if the shell |
326 discards input when it starts up.) | |
1076 | 327 The buffer is put in Shell mode, giving commands for sending input |
328 and controlling the subjobs of the shell. See `shell-mode'. | |
329 See also the variable `shell-prompt-pattern'. | |
114 | 330 |
252 | 331 The shell file name (sans directories) is used to make a symbol name |
1801 | 332 such as `explicit-csh-args'. If that symbol is a variable, |
114 | 333 its value is used as a list of arguments when invoking the shell. |
334 Otherwise, one argument `-i' is passed to the shell. | |
335 | |
336 \(Type \\[describe-mode] in the shell buffer for a list of commands.)" | |
337 (interactive) | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
338 (if (not (comint-check-proc "*shell*")) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
339 (let* ((prog (or explicit-shell-file-name |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
340 (getenv "ESHELL") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
341 (getenv "SHELL") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
342 "/bin/sh")) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
343 (name (file-name-nondirectory prog)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
344 (startfile (concat "~/.emacs_" name)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
345 (xargs-name (intern-soft (concat "explicit-" name "-args")))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
346 (set-buffer (apply 'make-comint "shell" prog |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
347 (if (file-exists-p startfile) startfile) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
348 (if (and xargs-name (boundp xargs-name)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
349 (symbol-value xargs-name) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
350 '("-i")))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
351 (shell-mode))) |
114 | 352 (switch-to-buffer "*shell*")) |
353 | |
354 ;;; Directory tracking | |
355 ;;; =========================================================================== | |
356 ;;; This code provides the shell mode input sentinel | |
357 ;;; SHELL-DIRECTORY-TRACKER | |
358 ;;; that tracks cd, pushd, and popd commands issued to the shell, and | |
359 ;;; changes the current directory of the shell buffer accordingly. | |
360 ;;; | |
361 ;;; This is basically a fragile hack, although it's more accurate than | |
2469 | 362 ;;; the version in Emacs 18's shell.el. It has the following failings: |
114 | 363 ;;; 1. It doesn't know about the cdpath shell variable. |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
364 ;;; 2. It cannot infallibly deal with command sequences, though it does well |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
365 ;;; with these and with ignoring commands forked in another shell with ()s. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
366 ;;; 3. More generally, any complex command is going to throw it. Otherwise, |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
367 ;;; you'd have to build an entire shell interpreter in emacs lisp. Failing |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
368 ;;; that, there's no way to catch shell commands where cd's are buried |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
369 ;;; inside conditional expressions, aliases, and so forth. |
114 | 370 ;;; |
371 ;;; The whole approach is a crock. Shell aliases mess it up. File sourcing | |
372 ;;; messes it up. You run other processes under the shell; these each have | |
373 ;;; separate working directories, and some have commands for manipulating | |
374 ;;; their w.d.'s (e.g., the lcd command in ftp). Some of these programs have | |
252 | 375 ;;; commands that do *not* affect the current w.d. at all, but look like they |
114 | 376 ;;; do (e.g., the cd command in ftp). In shells that allow you job |
377 ;;; control, you can switch between jobs, all having different w.d.'s. So | |
378 ;;; simply saying %3 can shift your w.d.. | |
379 ;;; | |
380 ;;; The solution is to relax, not stress out about it, and settle for | |
381 ;;; a hack that works pretty well in typical circumstances. Remember | |
382 ;;; that a half-assed solution is more in keeping with the spirit of Unix, | |
383 ;;; anyway. Blech. | |
384 ;;; | |
385 ;;; One good hack not implemented here for users of programmable shells | |
386 ;;; is to program up the shell w.d. manipulation commands to output | |
387 ;;; a coded command sequence to the tty. Something like | |
388 ;;; ESC | <cwd> | | |
389 ;;; where <cwd> is the new current working directory. Then trash the | |
390 ;;; directory tracking machinery currently used in this package, and | |
391 ;;; replace it with a process filter that watches for and strips out | |
392 ;;; these messages. | |
393 | |
394 (defun shell-directory-tracker (str) | |
395 "Tracks cd, pushd and popd commands issued to the shell. | |
396 This function is called on each input passed to the shell. | |
397 It watches for cd, pushd and popd commands and sets the buffer's | |
398 default directory to track these commands. | |
399 | |
400 You may toggle this tracking on and off with M-x dirtrack-toggle. | |
401 If emacs gets confused, you can resync with the shell with M-x dirs. | |
402 | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
403 See variables `shell-cd-regexp', `shell-pushd-regexp', and `shell-popd-regexp', |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
404 while `shell-pushd-tohome', `shell-pushd-dextract' and `shell-pushd-dunique' |
4938 | 405 control the behavior of the relevant command. |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
406 |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
407 Environment variables are expanded, see function `substitute-in-file-name'." |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
408 (if shell-dirtrackp |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
409 ;; We fail gracefully if we think the command will fail in the shell. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
410 (condition-case chdir-failure |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
411 (let ((start (progn (string-match "^[;\\s ]*" str) ; skip whitespace |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
412 (match-end 0))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
413 end cmd arg1) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
414 (while (string-match shell-command-regexp str start) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
415 (setq end (match-end 0) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
416 cmd (comint-arguments (substring str start end) 0 0) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
417 arg1 (comint-arguments (substring str start end) 1 1)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
418 (cond ((eq (string-match shell-popd-regexp cmd) 0) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
419 (shell-process-popd (substitute-in-file-name arg1))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
420 ((eq (string-match shell-pushd-regexp cmd) 0) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
421 (shell-process-pushd (substitute-in-file-name arg1))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
422 ((eq (string-match shell-cd-regexp cmd) 0) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
423 (shell-process-cd (substitute-in-file-name arg1)))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
424 (setq start (progn (string-match "[;\\s ]*" str end) ; skip again |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
425 (match-end 0))))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
426 (error (message "Couldn't cd"))))) |
114 | 427 |
428 | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
429 ;; Like `cd', but prepends comint-file-name-prefix to absolute names. |
4677
835ecfabae68
(shell-cd): New function, like `cd' but prepend comint-filename-prefix.
Roland McGrath <roland@gnu.org>
parents:
4676
diff
changeset
|
430 (defsubst shell-cd (directory) |
835ecfabae68
(shell-cd): New function, like `cd' but prepend comint-filename-prefix.
Roland McGrath <roland@gnu.org>
parents:
4676
diff
changeset
|
431 (if (file-name-absolute-p directory) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
432 (cd-absolute (concat comint-file-name-prefix directory)) |
4677
835ecfabae68
(shell-cd): New function, like `cd' but prepend comint-filename-prefix.
Roland McGrath <roland@gnu.org>
parents:
4676
diff
changeset
|
433 (cd directory))) |
835ecfabae68
(shell-cd): New function, like `cd' but prepend comint-filename-prefix.
Roland McGrath <roland@gnu.org>
parents:
4676
diff
changeset
|
434 |
114 | 435 ;;; popd [+n] |
436 (defun shell-process-popd (arg) | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
437 (let ((num (or (shell-extract-num arg) 0))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
438 (cond ((and num (= num 0) shell-dirstack) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
439 (shell-cd (car shell-dirstack)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
440 (setq shell-dirstack (cdr shell-dirstack)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
441 (shell-dirstack-message)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
442 ((and num (> num 0) (<= num (length shell-dirstack))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
443 (let* ((ds (cons nil shell-dirstack)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
444 (cell (nthcdr (1- num) ds))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
445 (rplacd cell (cdr (cdr cell))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
446 (setq shell-dirstack (cdr ds)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
447 (shell-dirstack-message))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
448 (t |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
449 (error (message "Couldn't popd.")))))) |
114 | 450 |
451 ;;; cd [dir] | |
452 (defun shell-process-cd (arg) | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
453 (let ((new-dir (cond ((zerop (length arg)) (getenv "HOME")) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
454 ((string-equal "-" arg) shell-last-dir) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
455 (t arg)))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
456 (setq shell-last-dir default-directory) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
457 (shell-cd new-dir) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
458 (shell-dirstack-message))) |
114 | 459 |
460 ;;; pushd [+n | dir] | |
461 (defun shell-process-pushd (arg) | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
462 (let ((num (shell-extract-num arg))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
463 (cond ((zerop (length arg)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
464 ;; no arg -- swap pwd and car of stack unless shell-pushd-tohome |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
465 (cond (shell-pushd-tohome |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
466 (shell-process-pushd "~")) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
467 (shell-dirstack |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
468 (let ((old default-directory)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
469 (shell-cd (car shell-dirstack)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
470 (setq shell-dirstack |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
471 (cons old (cdr shell-dirstack))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
472 (shell-dirstack-message))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
473 (t |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
474 (message "Directory stack empty.")))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
475 ((numberp num) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
476 ;; pushd +n |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
477 (cond ((> num (length shell-dirstack)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
478 (message "Directory stack not that deep.")) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
479 ((= num 0) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
480 (error (message "Couldn't cd."))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
481 (shell-pushd-dextract |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
482 (let ((dir (nth (1- num) shell-dirstack))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
483 (shell-process-popd arg) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
484 (shell-process-pushd default-directory) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
485 (shell-cd dir) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
486 (shell-dirstack-message))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
487 (t |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
488 (let* ((ds (cons default-directory shell-dirstack)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
489 (dslen (length ds)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
490 (front (nthcdr num ds)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
491 (back (reverse (nthcdr (- dslen num) (reverse ds)))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
492 (new-ds (append front back))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
493 (shell-cd (car new-ds)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
494 (setq shell-dirstack (cdr new-ds)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
495 (shell-dirstack-message))))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
496 (t |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
497 ;; pushd <dir> |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
498 (let ((old-wd default-directory)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
499 (shell-cd arg) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
500 (if (or (null shell-pushd-dunique) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
501 (not (member old-wd shell-dirstack))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
502 (setq shell-dirstack (cons old-wd shell-dirstack))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
503 (shell-dirstack-message)))))) |
114 | 504 |
505 ;; If STR is of the form +n, for n>0, return n. Otherwise, nil. | |
506 (defun shell-extract-num (str) | |
507 (and (string-match "^\\+[1-9][0-9]*$" str) | |
508 (string-to-int str))) | |
509 | |
510 | |
511 (defun shell-dirtrack-toggle () | |
512 "Turn directory tracking on and off in a shell buffer." | |
513 (interactive) | |
514 (setq shell-dirtrackp (not shell-dirtrackp)) | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
515 (message "Directory tracking %s" (if shell-dirtrackp "ON" "OFF"))) |
114 | 516 |
517 ;;; For your typing convenience: | |
2571
b65cf676a09b
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2557
diff
changeset
|
518 (defalias 'dirtrack-toggle 'shell-dirtrack-toggle) |
114 | 519 |
520 | |
521 (defun shell-resync-dirs () | |
522 "Resync the buffer's idea of the current directory stack. | |
523 This command queries the shell with the command bound to | |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
524 `shell-dirstack-query' (default \"dirs\"), reads the next |
114 | 525 line output and parses it to form the new directory stack. |
526 DON'T issue this command unless the buffer is at a shell prompt. | |
527 Also, note that if some other subprocess decides to do output | |
528 immediately after the query, its output will be taken as the | |
529 new directory stack -- you lose. If this happens, just do the | |
530 command again." | |
531 (interactive) | |
532 (let* ((proc (get-buffer-process (current-buffer))) | |
533 (pmark (process-mark proc))) | |
534 (goto-char pmark) | |
535 (insert shell-dirstack-query) (insert "\n") | |
536 (sit-for 0) ; force redisplay | |
537 (comint-send-string proc shell-dirstack-query) | |
538 (comint-send-string proc "\n") | |
539 (set-marker pmark (point)) | |
540 (let ((pt (point))) ; wait for 1 line | |
541 ;; This extra newline prevents the user's pending input from spoofing us. | |
542 (insert "\n") (backward-char 1) | |
543 (while (not (looking-at ".+\n")) | |
544 (accept-process-output proc) | |
545 (goto-char pt))) | |
546 (goto-char pmark) (delete-char 1) ; remove the extra newline | |
547 ;; That's the dirlist. grab it & parse it. | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
548 (let* ((dl (buffer-substring (match-beginning 0) (1- (match-end 0)))) |
114 | 549 (dl-len (length dl)) |
550 (ds '()) ; new dir stack | |
551 (i 0)) | |
552 (while (< i dl-len) | |
553 ;; regexp = optional whitespace, (non-whitespace), optional whitespace | |
554 (string-match "\\s *\\(\\S +\\)\\s *" dl i) ; pick off next dir | |
555 (setq ds (cons (substring dl (match-beginning 1) (match-end 1)) | |
556 ds)) | |
557 (setq i (match-end 0))) | |
558 (let ((ds (reverse ds))) | |
559 (condition-case nil | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
560 (progn (cd (car ds)) |
114 | 561 (setq shell-dirstack (cdr ds)) |
562 (shell-dirstack-message)) | |
563 (error (message "Couldn't cd."))))))) | |
564 | |
565 ;;; For your typing convenience: | |
2571
b65cf676a09b
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2557
diff
changeset
|
566 (defalias 'dirs 'shell-resync-dirs) |
114 | 567 |
568 | |
569 ;;; Show the current dirstack on the message line. | |
570 ;;; Pretty up dirs a bit by changing "/usr/jqr/foo" to "~/foo". | |
571 ;;; (This isn't necessary if the dirlisting is generated with a simple "dirs".) | |
572 ;;; All the commands that mung the buffer's dirstack finish by calling | |
573 ;;; this guy. | |
574 (defun shell-dirstack-message () | |
4679
ed9240986f40
(shell-dirstack-message): Recognize ~ by matching the expansion of "~" with
Roland McGrath <roland@gnu.org>
parents:
4677
diff
changeset
|
575 (let* ((msg "") |
ed9240986f40
(shell-dirstack-message): Recognize ~ by matching the expansion of "~" with
Roland McGrath <roland@gnu.org>
parents:
4677
diff
changeset
|
576 (ds (cons default-directory shell-dirstack)) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
577 (home (expand-file-name (concat comint-file-name-prefix "~/"))) |
4679
ed9240986f40
(shell-dirstack-message): Recognize ~ by matching the expansion of "~" with
Roland McGrath <roland@gnu.org>
parents:
4677
diff
changeset
|
578 (homelen (length home))) |
114 | 579 (while ds |
580 (let ((dir (car ds))) | |
4679
ed9240986f40
(shell-dirstack-message): Recognize ~ by matching the expansion of "~" with
Roland McGrath <roland@gnu.org>
parents:
4677
diff
changeset
|
581 (and (>= (length dir) homelen) (string= home (substring dir 0 homelen)) |
ed9240986f40
(shell-dirstack-message): Recognize ~ by matching the expansion of "~" with
Roland McGrath <roland@gnu.org>
parents:
4677
diff
changeset
|
582 (setq dir (concat "~/" (substring dir homelen)))) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
583 ;; Strip off comint-file-name-prefix if present. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
584 (and comint-file-name-prefix |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
585 (>= (length dir) (length comint-file-name-prefix)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
586 (string= comint-file-name-prefix |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
587 (substring dir 0 (length comint-file-name-prefix))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
588 (setq dir (substring dir (length comint-file-name-prefix))) |
4679
ed9240986f40
(shell-dirstack-message): Recognize ~ by matching the expansion of "~" with
Roland McGrath <roland@gnu.org>
parents:
4677
diff
changeset
|
589 (setcar ds dir)) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
590 (setq msg (concat msg (directory-file-name dir) " ")) |
114 | 591 (setq ds (cdr ds)))) |
592 (message msg))) | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
593 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
594 (defun shell-forward-command (&optional arg) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
595 "Move forward across ARG shell command(s). Does not cross lines. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
596 See `shell-command-regexp'." |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
597 (interactive "p") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
598 (let ((limit (save-excursion (end-of-line nil) (point)))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
599 (if (re-search-forward (concat shell-command-regexp "\\([;&|][\\s ]*\\)+") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
600 limit 'move arg) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
601 (skip-syntax-backward "^\\s ")))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
602 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
603 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
604 (defun shell-backward-command (&optional arg) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
605 "Move backward across ARG shell command(s). Does not cross lines. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
606 See `shell-command-regexp'." |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
607 (interactive "p") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
608 (let ((limit (save-excursion (comint-bol nil) (point)))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
609 (skip-syntax-backward "\\s " limit) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
610 (if (re-search-backward |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
611 (format "[;&|]+[\\s ]*\\(%s\\)" shell-command-regexp) limit 'move arg) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
612 (progn (goto-char (match-beginning 1)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
613 (skip-syntax-backward "^\\s "))))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
614 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
615 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
616 (defun shell-get-current-command () |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
617 "Function that returns the current command including arguments." |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
618 (save-excursion |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
619 (if (looking-at "\\s *[^;&|]") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
620 (goto-char (match-end 0))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
621 (buffer-substring |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
622 (progn (shell-backward-command 1) (point)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
623 (progn (shell-forward-command 1) (if (eolp) (point) (match-end 1)))))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
624 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
625 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
626 (defun shell-after-partial-filename () |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
627 "Returns t if point is after a file name. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
628 File names are assumed to contain `/'s or not be the first item in the command. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
629 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
630 See also `shell-backward-command'." |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
631 (let ((filename (comint-match-partial-filename))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
632 (or (save-match-data (string-match "/" filename)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
633 (not (eq (match-beginning 0) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
634 (save-excursion (shell-backward-command 1) (point))))))) |
252 | 635 |
636 | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
637 (defun shell-dynamic-complete-command () |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
638 "Dynamically complete the command at point. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
639 This function is similar to `comint-dynamic-complete-filename', except that it |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
640 searches `exec-path' (minus the trailing emacs library path) for completion |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
641 candidates. Note that this may not be the same as the shell's idea of the |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
642 path. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
643 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
644 Completion is dependent on the value of `shell-completion-execonly', plus |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
645 those that effect file completion. See `comint-dynamic-complete-filename'." |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
646 (interactive) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
647 (let* ((completion-ignore-case nil) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
648 (filename (comint-match-partial-filename)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
649 (pathnondir (file-name-nondirectory filename)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
650 (paths (cdr (reverse exec-path))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
651 (cwd (file-name-as-directory (expand-file-name default-directory))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
652 (ignored-extensions |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
653 (mapconcat (function (lambda (x) (concat (regexp-quote x) "$"))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
654 completion-ignored-extensions "\\|")) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
655 (path "") (comps-in-path ()) (file "") (filepath "") (completions ())) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
656 ;; Go thru each path in the search path, finding completions. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
657 (while paths |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
658 (setq path (file-name-as-directory (comint-directory (or (car paths) "."))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
659 comps-in-path (and (file-accessible-directory-p path) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
660 (file-name-all-completions pathnondir path))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
661 ;; Go thru each completion found, to see whether it should be used. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
662 (while comps-in-path |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
663 (setq file (car comps-in-path) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
664 filepath (concat path file)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
665 (if (and (not (member file completions)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
666 (not (string-match ignored-extensions file)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
667 (or (string-equal path cwd) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
668 (not (file-directory-p filepath))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
669 (or (null shell-completion-execonly) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
670 (file-executable-p filepath))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
671 (setq completions (cons file completions))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
672 (setq comps-in-path (cdr comps-in-path))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
673 (setq paths (cdr paths))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
674 ;; OK, we've got a list of completions. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
675 (cond ((null completions) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
676 (message "No completions of %s" filename) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
677 (ding)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
678 ((= 1 (length completions)) ; Gotcha! |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
679 (let ((completion (car completions))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
680 (if (string-equal completion pathnondir) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
681 (message "Sole completion") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
682 (insert (substring (directory-file-name completion) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
683 (length pathnondir))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
684 (message "Completed")) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
685 (if comint-completion-addsuffix |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
686 (insert (if (file-directory-p completion) "/" " "))))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
687 (t ; There's no unique completion. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
688 (let ((completion |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
689 (try-completion pathnondir (mapcar (function (lambda (x) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
690 (list x))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
691 completions)))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
692 ;; Insert the longest substring. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
693 (insert (substring (directory-file-name completion) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
694 (length pathnondir))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
695 (cond ((and comint-completion-recexact comint-completion-addsuffix |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
696 (string-equal pathnondir completion) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
697 (member completion completions)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
698 ;; It's not unique, but user wants shortest match. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
699 (insert (if (file-directory-p completion) "/" " ")) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
700 (message "Completed shortest")) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
701 ((or comint-completion-autolist |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
702 (string-equal pathnondir completion)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
703 ;; It's not unique, list possible completions. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
704 (comint-dynamic-list-completions completions)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
705 (t |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
706 (message "Partially completed")))))))) |
252 | 707 |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
708 ;;; Do the user's customization... |
252 | 709 ;;; |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
710 ;;; Isn't this what eval-after-load is for? |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
711 ;;;(defvar shell-load-hook nil |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
712 ;;; "This hook is run when shell is loaded in. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
713 ;;;This is a good place to put keybindings.") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
714 ;;; |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
715 ;;;(run-hooks 'shell-load-hook) |
252 | 716 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
717 (provide 'shell) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
718 |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
719 ;;; shell.el ends here |