Mercurial > emacs
annotate lisp/shell.el @ 67002:c9d9dfe47d58
(menu-bar-describe-menu) <list-keybindings>: Mention "keyboard shortcuts"
in the help text.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 19 Nov 2005 11:23:04 +0000 |
parents | eadf85208391 |
children | 3bd95f4f2941 fa0da9b57058 |
rev | line source |
---|---|
38409
153f1b1f2efd
Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents:
35659
diff
changeset
|
1 ;;; shell.el --- specialized comint.el for running the shell |
6887
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, |
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
4 ;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
844
bf829a2d63b4
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
814
diff
changeset
|
5 |
38409
153f1b1f2efd
Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents:
35659
diff
changeset
|
6 ;; Author: Olin Shivers <shivers@cs.cmu.edu> |
25278 | 7 ;; Simon Marshall <simon@gnu.org> |
18805 | 8 ;; Maintainer: FSF |
814
38b2499cb3e9
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
9 ;; Keywords: processes |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
10 |
6887
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
11 ;; This file is part of GNU Emacs. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
12 |
6887
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
13 ;; GNU Emacs is free software; you can redistribute it and/or modify |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
14 ;; it under the terms of the GNU General Public License as published by |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
15 ;; the Free Software Foundation; either version 2, or (at your option) |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
16 ;; any later version. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
17 |
6887
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
18 ;; GNU Emacs is distributed in the hope that it will be useful, |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
21 ;; GNU General Public License for more details. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
22 |
6887
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
23 ;; You should have received a copy of the GNU General Public License |
14169 | 24 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
26 ;; Boston, MA 02110-1301, USA. | |
114 | 27 |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
28 ;;; Commentary: |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
29 |
14169 | 30 ;; Please send me bug reports, bug fixes, and extensions, so that I can |
31 ;; merge them into the master source. | |
32 ;; - Olin Shivers (shivers@cs.cmu.edu) | |
25278 | 33 ;; - Simon Marshall (simon@gnu.org) |
114 | 34 |
46159 | 35 ;; This file defines a shell-in-a-buffer package (shell mode) built on |
36 ;; top of comint mode. This is actually cmushell with things renamed | |
37 ;; to replace its counterpart in Emacs 18. cmushell is more | |
14169 | 38 ;; featureful, robust, and uniform than the Emacs 18 version. |
114 | 39 |
14169 | 40 ;; Since this mode is built on top of the general command-interpreter-in- |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
41 ;; a-buffer mode (comint mode), it shares a common base functionality, |
14169 | 42 ;; and a common set of bindings, with all modes derived from comint mode. |
43 ;; This makes these modes easier to use. | |
114 | 44 |
14169 | 45 ;; For documentation on the functionality provided by comint mode, and |
46 ;; the hooks available for customising it, see the file comint.el. | |
47 ;; For further information on shell mode, see the comments below. | |
114 | 48 |
14169 | 49 ;; Needs fixin: |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
50 ;; When sending text from a source file to a subprocess, the process-mark can |
14169 | 51 ;; move off the window, so you can lose sight of the process interactions. |
52 ;; Maybe I should ensure the process mark is in the window when I send | |
53 ;; text to the process? Switch selectable? | |
114 | 54 |
252 | 55 ;; YOUR .EMACS FILE |
56 ;;============================================================================= | |
57 ;; Some suggestions for your .emacs file. | |
58 ;; | |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
59 ;; ;; Define M-# to run some strange command: |
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
60 ;; (eval-after-load "shell" |
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
61 ;; '(define-key shell-mode-map "\M-#" 'shells-dynamic-spell)) |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
62 |
14169 | 63 ;; Brief Command Documentation: |
64 ;;============================================================================ | |
65 ;; Comint Mode Commands: (common to shell and all comint-derived modes) | |
66 ;; | |
22636
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
67 ;; m-p comint-previous-input Cycle backwards in input history |
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
68 ;; m-n comint-next-input Cycle forwards |
14169 | 69 ;; m-r comint-previous-matching-input Previous input matching a regexp |
70 ;; m-s comint-next-matching-input Next input that matches | |
22636
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
71 ;; m-c-l comint-show-output Show last batch of process output |
14169 | 72 ;; return comint-send-input |
22636
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
73 ;; c-d comint-delchar-or-maybe-eof Delete char unless at end of buff. |
14169 | 74 ;; c-c c-a comint-bol Beginning of line; skip prompt |
22636
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
75 ;; c-c c-u comint-kill-input ^u |
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
76 ;; c-c c-w backward-kill-word ^w |
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
77 ;; c-c c-c comint-interrupt-subjob ^c |
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
78 ;; c-c c-z comint-stop-subjob ^z |
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
79 ;; c-c c-\ comint-quit-subjob ^\ |
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
80 ;; c-c c-o comint-kill-output Delete last batch of process output |
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
81 ;; c-c c-r comint-show-output Show last batch of process output |
24738 | 82 ;; c-c c-l comint-dynamic-list-input-ring List input history |
14169 | 83 ;; send-invisible Read line w/o echo & send to proc |
22636
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
84 ;; comint-continue-subjob Useful if you accidentally suspend |
14169 | 85 ;; top-level job |
86 ;; comint-mode-hook is the comint mode hook. | |
252 | 87 |
14169 | 88 ;; Shell Mode Commands: |
89 ;; shell Fires up the shell process | |
90 ;; tab comint-dynamic-complete Complete filename/command/history | |
91 ;; m-? comint-dynamic-list-filename-completions | |
92 ;; List completions in help buffer | |
93 ;; m-c-f shell-forward-command Forward a shell command | |
94 ;; m-c-b shell-backward-command Backward a shell command | |
22636
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
95 ;; dirs Resync the buffer's dir stack |
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
96 ;; dirtrack-mode Turn dir tracking on/off |
14169 | 97 ;; comint-strip-ctrl-m Remove trailing ^Ms from output |
98 ;; | |
99 ;; The shell mode hook is shell-mode-hook | |
100 ;; comint-prompt-regexp is initialised to shell-prompt-pattern, for backwards | |
101 ;; compatibility. | |
252 | 102 |
14169 | 103 ;; Read the rest of this file for more information. |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
104 |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
105 ;;; Code: |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
106 |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
107 (require 'comint) |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
108 |
14169 | 109 ;;; Customization and Buffer Variables |
110 | |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
111 (defgroup shell nil |
64021
6c90c8ae9e80
(shell): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63507
diff
changeset
|
112 "Running shell from within Emacs buffers." |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
113 :group 'processes |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
114 :group 'unix) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
115 |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
116 (defgroup shell-directories nil |
64021
6c90c8ae9e80
(shell): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63507
diff
changeset
|
117 "Directory support in shell mode." |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
118 :group 'shell) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
119 |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
120 (defgroup shell-faces nil |
64021
6c90c8ae9e80
(shell): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63507
diff
changeset
|
121 "Faces in shell buffers." |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
122 :group 'shell) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
123 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
124 ;;;###autoload |
31617
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
125 (defcustom shell-dumb-shell-regexp "cmd\\(proxy\\)?\\.exe" |
35643
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
126 "Regexp to match shells that don't save their command history, and |
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
127 don't handle the backslash as a quote character. For shells that |
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
128 match this regexp, Emacs will write out the command history when the |
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
129 shell finishes, and won't remove backslashes when it unquotes shell |
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
130 arguments." |
31617
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
131 :type 'regexp |
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
132 :group 'shell) |
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
133 |
23744
e7128c62a0b4
(shell-prompt-pattern): Add defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
23480
diff
changeset
|
134 (defcustom shell-prompt-pattern "^[^#$%>\n]*[#$%>] *" |
252 | 135 "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
|
136 Defaults to \"^[^#$%>\\n]*[#$%>] *\", which works pretty well. |
63507
e5299a8016cb
(shell-prompt-pattern, shell-dynamic-complete-functions, shell-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
62402
diff
changeset
|
137 This variable is used to initialize `comint-prompt-regexp' in the |
252 | 138 shell buffer. |
139 | |
61876
c157250db02c
(shell-prompt-pattern): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53402
diff
changeset
|
140 If `comint-use-prompt-regexp' is nil, then this variable is only used |
c157250db02c
(shell-prompt-pattern): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53402
diff
changeset
|
141 to determine paragraph boundaries. See Info node `Shell Prompts' for |
c157250db02c
(shell-prompt-pattern): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53402
diff
changeset
|
142 how Shell mode treats paragraphs. |
30641
297909766bad
(shell-prompt-pattern): Doc change.
Miles Bader <miles@gnu.org>
parents:
25278
diff
changeset
|
143 |
4131
c9a0f06110bd
* shell.el (shell-process-pushd): Fix syntax error in
Jim Blandy <jimb@redhat.com>
parents:
3418
diff
changeset
|
144 The pattern should probably not match more than one line. If it does, |
14476
63540fa43674
Resync directories properly for the ksh.
Simon Marshall <simon@gnu.org>
parents:
14329
diff
changeset
|
145 Shell mode may become confused trying to distinguish prompt from input |
4131
c9a0f06110bd
* shell.el (shell-process-pushd): Fix syntax error in
Jim Blandy <jimb@redhat.com>
parents:
3418
diff
changeset
|
146 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
|
147 |
23744
e7128c62a0b4
(shell-prompt-pattern): Add defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
23480
diff
changeset
|
148 This is a fine thing to set in your `.emacs' file." |
e7128c62a0b4
(shell-prompt-pattern): Add defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
23480
diff
changeset
|
149 :type 'regexp |
e7128c62a0b4
(shell-prompt-pattern): Add defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
23480
diff
changeset
|
150 :group 'shell) |
252 | 151 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
152 (defcustom shell-completion-fignore nil |
6255
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
153 "*List of suffixes to be disregarded during file/command completion. |
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
154 This variable is used to initialize `comint-completion-fignore' in the shell |
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
155 buffer. The default is nil, for compatibility with most shells. |
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
156 Some people like (\"~\" \"#\" \"%\"). |
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
157 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
158 This is a fine thing to set in your `.emacs' file." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
159 :type '(repeat (string :tag "Suffix")) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
160 :group 'shell) |
6255
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
161 |
6155
2b445a954b0b
(shell-delimiter-argument-list): Now has chars, not strings.
Richard M. Stallman <rms@gnu.org>
parents:
6152
diff
changeset
|
162 (defvar shell-delimiter-argument-list '(?\| ?& ?< ?> ?\( ?\) ?\;) |
63507
e5299a8016cb
(shell-prompt-pattern, shell-dynamic-complete-functions, shell-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
62402
diff
changeset
|
163 "List of characters to recognize as separate arguments. |
6155
2b445a954b0b
(shell-delimiter-argument-list): Now has chars, not strings.
Richard M. Stallman <rms@gnu.org>
parents:
6152
diff
changeset
|
164 This variable is used to initialize `comint-delimiter-argument-list' in the |
15655
f2f66323f14a
Bind shell-file-name-quote-list and shell-file-name-regexp specially for MSDOG.
Simon Marshall <simon@gnu.org>
parents:
15370
diff
changeset
|
165 shell buffer. The value may depend on the operating system or shell. |
f2f66323f14a
Bind shell-file-name-quote-list and shell-file-name-regexp specially for MSDOG.
Simon Marshall <simon@gnu.org>
parents:
15370
diff
changeset
|
166 |
f2f66323f14a
Bind shell-file-name-quote-list and shell-file-name-regexp specially for MSDOG.
Simon Marshall <simon@gnu.org>
parents:
15370
diff
changeset
|
167 This is a fine thing to set in your `.emacs' file.") |
f2f66323f14a
Bind shell-file-name-quote-list and shell-file-name-regexp specially for MSDOG.
Simon Marshall <simon@gnu.org>
parents:
15370
diff
changeset
|
168 |
15818
574ec5119c7a
(shell-file-name-chars): Was shell-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
15655
diff
changeset
|
169 (defvar shell-file-name-chars |
49549
99be3a1e2589
Cygwin support patch.
Juanma Barranquero <lekktu@gmail.com>
parents:
48105
diff
changeset
|
170 (if (memq system-type '(ms-dos windows-nt cygwin)) |
21621
56d8224fe691
(shell-file-name-chars): Add ',' and ':'.
Geoff Voelker <voelker@cs.washington.edu>
parents:
20971
diff
changeset
|
171 "~/A-Za-z0-9_^$!#%&{}@`'.,:()-" |
53402
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
172 "[]~/A-Za-z0-9+@:_.$#%,={}-") |
15818
574ec5119c7a
(shell-file-name-chars): Was shell-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
15655
diff
changeset
|
173 "String of characters valid in a file name. |
574ec5119c7a
(shell-file-name-chars): Was shell-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
15655
diff
changeset
|
174 This variable is used to initialize `comint-file-name-chars' in the |
15655
f2f66323f14a
Bind shell-file-name-quote-list and shell-file-name-regexp specially for MSDOG.
Simon Marshall <simon@gnu.org>
parents:
15370
diff
changeset
|
175 shell buffer. The value may depend on the operating system or shell. |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
176 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
177 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
|
178 |
11186
54a20705cf02
Set comint-file-name-quote-list to new shell-file-name-quote-list.
Simon Marshall <simon@gnu.org>
parents:
11154
diff
changeset
|
179 (defvar shell-file-name-quote-list |
15655
f2f66323f14a
Bind shell-file-name-quote-list and shell-file-name-regexp specially for MSDOG.
Simon Marshall <simon@gnu.org>
parents:
15370
diff
changeset
|
180 (if (memq system-type '(ms-dos windows-nt)) |
f2f66323f14a
Bind shell-file-name-quote-list and shell-file-name-regexp specially for MSDOG.
Simon Marshall <simon@gnu.org>
parents:
15370
diff
changeset
|
181 nil |
64021
6c90c8ae9e80
(shell): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63507
diff
changeset
|
182 (append shell-delimiter-argument-list '(?\s ?\* ?\! ?\" ?\' ?\` ?\# ?\\))) |
11186
54a20705cf02
Set comint-file-name-quote-list to new shell-file-name-quote-list.
Simon Marshall <simon@gnu.org>
parents:
11154
diff
changeset
|
183 "List of characters to quote when in a file name. |
54a20705cf02
Set comint-file-name-quote-list to new shell-file-name-quote-list.
Simon Marshall <simon@gnu.org>
parents:
11154
diff
changeset
|
184 This variable is used to initialize `comint-file-name-quote-list' in the |
15655
f2f66323f14a
Bind shell-file-name-quote-list and shell-file-name-regexp specially for MSDOG.
Simon Marshall <simon@gnu.org>
parents:
15370
diff
changeset
|
185 shell buffer. The value may depend on the operating system or shell. |
11186
54a20705cf02
Set comint-file-name-quote-list to new shell-file-name-quote-list.
Simon Marshall <simon@gnu.org>
parents:
11154
diff
changeset
|
186 |
54a20705cf02
Set comint-file-name-quote-list to new shell-file-name-quote-list.
Simon Marshall <simon@gnu.org>
parents:
11154
diff
changeset
|
187 This is a fine thing to set in your `.emacs' file.") |
54a20705cf02
Set comint-file-name-quote-list to new shell-file-name-quote-list.
Simon Marshall <simon@gnu.org>
parents:
11154
diff
changeset
|
188 |
6186
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
189 (defvar shell-dynamic-complete-functions |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
190 '(comint-replace-by-expanded-history |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
191 shell-dynamic-complete-environment-variable |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
192 shell-dynamic-complete-command |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
193 shell-replace-by-expanded-directory |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
194 comint-dynamic-complete-filename) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
195 "List of functions called to perform completion. |
63507
e5299a8016cb
(shell-prompt-pattern, shell-dynamic-complete-functions, shell-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
62402
diff
changeset
|
196 This variable is used to initialize `comint-dynamic-complete-functions' in the |
6186
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
197 shell buffer. |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
198 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
199 This is a fine thing to set in your `.emacs' file.") |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
200 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
201 (defcustom shell-command-regexp "[^;&|\n]+" |
8694
67f6d4905d8c
(shell-command-regexp): Use a simpler faster regexp.
Richard M. Stallman <rms@gnu.org>
parents:
8267
diff
changeset
|
202 "*Regexp to match a single command within a pipeline. |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
203 This is used for directory tracking and does not do a perfect job." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
204 :type 'regexp |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
205 :group 'shell) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
206 |
51554
8cf86bc95fe5
(shell-command-separator-regexp): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51519
diff
changeset
|
207 (defcustom shell-command-separator-regexp "[;&|\n \t]*" |
8cf86bc95fe5
(shell-command-separator-regexp): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51519
diff
changeset
|
208 "*Regexp to match a single command within a pipeline. |
8cf86bc95fe5
(shell-command-separator-regexp): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51519
diff
changeset
|
209 This is used for directory tracking and does not do a perfect job." |
8cf86bc95fe5
(shell-command-separator-regexp): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51519
diff
changeset
|
210 :type 'regexp |
8cf86bc95fe5
(shell-command-separator-regexp): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51519
diff
changeset
|
211 :group 'shell) |
8cf86bc95fe5
(shell-command-separator-regexp): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51519
diff
changeset
|
212 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
213 (defcustom shell-completion-execonly t |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
214 "*If non-nil, use executable files only for completion candidates. |
4938 | 215 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
|
216 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
217 Detecting executability of files may slow command completion considerably." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
218 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
219 :group 'shell) |
114 | 220 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
221 (defcustom shell-popd-regexp "popd" |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
222 "*Regexp to match subshell commands equivalent to popd." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
223 :type 'regexp |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
224 :group 'shell-directories) |
114 | 225 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
226 (defcustom shell-pushd-regexp "pushd" |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
227 "*Regexp to match subshell commands equivalent to pushd." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
228 :type 'regexp |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
229 :group 'shell-directories) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
230 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
231 (defcustom shell-pushd-tohome nil |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
232 "*If non-nil, make pushd with no arg behave as \"pushd ~\" (like cd). |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
233 This mirrors the optional behavior of tcsh." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
234 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
235 :group 'shell-directories) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
236 |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
237 (defcustom shell-pushd-dextract nil |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
238 "*If non-nil, make \"pushd +n\" pop the nth dir to the stack top. |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
239 This mirrors the optional behavior of tcsh." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
240 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
241 :group 'shell-directories) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
242 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
243 (defcustom shell-pushd-dunique nil |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
244 "*If non-nil, make pushd only add unique directories to the stack. |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
245 This mirrors the optional behavior of tcsh." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
246 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
247 :group 'shell-directories) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
248 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
249 (defcustom shell-cd-regexp "cd" |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
250 "*Regexp to match subshell commands equivalent to cd." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
251 :type 'regexp |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
252 :group 'shell-directories) |
114 | 253 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
254 (defcustom shell-chdrive-regexp |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
255 (if (memq system-type '(ms-dos windows-nt)) |
15370
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
256 ; NetWare allows the five chars between upper and lower alphabetics. |
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
257 "[]a-zA-Z^_`\\[\\\\]:" |
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
258 nil) |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
259 "*If non-nil, is regexp used to track drive changes." |
19829
4344b744de2f
(shell-chdrive-regexp): Likewise.
Richard M. Stallman <rms@gnu.org>
parents:
19476
diff
changeset
|
260 :type '(choice regexp |
4344b744de2f
(shell-chdrive-regexp): Likewise.
Richard M. Stallman <rms@gnu.org>
parents:
19476
diff
changeset
|
261 (const nil)) |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
262 :group 'shell-directories) |
15370
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
263 |
24069
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
264 (defcustom shell-dirtrack-verbose t |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
265 "*If non-nil, show the directory stack following directory change. |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
266 This is effective only if directory tracking is enabled." |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
267 :type 'boolean |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
268 :group 'shell-directories) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
269 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
270 (defcustom explicit-shell-file-name nil |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
271 "*If non-nil, is file name to use for explicitly requested inferior shell." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
272 :type '(choice (const :tag "None" nil) file) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
273 :group 'shell) |
114 | 274 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
275 (defcustom explicit-csh-args |
114 | 276 (if (eq system-type 'hpux) |
277 ;; -T persuades HP's csh not to think it is smarter | |
278 ;; than us about what terminal modes to use. | |
279 '("-i" "-T") | |
280 '("-i")) | |
281 "*Args passed to inferior shell by M-x shell, if the shell is csh. | |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
282 Value is a list of strings, which may be nil." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
283 :type '(repeat (string :tag "Argument")) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
284 :group 'shell) |
114 | 285 |
46073
58a34a457ab8
(explicit-bash-args): New user option.
Andreas Schwab <schwab@suse.de>
parents:
45285
diff
changeset
|
286 (defcustom explicit-bash-args |
48105
5fbd632e1109
(explicit-bash-args): Bash 1.x doesn't grook
Kim F. Storm <storm@cua.dk>
parents:
48016
diff
changeset
|
287 ;; Tell bash not to use readline, except for bash 1.x which doesn't grook --noediting. |
5fbd632e1109
(explicit-bash-args): Bash 1.x doesn't grook
Kim F. Storm <storm@cua.dk>
parents:
48016
diff
changeset
|
288 ;; Bash 1.x has -nolineediting, but process-send-eof cannot terminate bash if we use it. |
5fbd632e1109
(explicit-bash-args): Bash 1.x doesn't grook
Kim F. Storm <storm@cua.dk>
parents:
48016
diff
changeset
|
289 (let* ((prog (or (and (boundp 'explicit-shell-file-name) explicit-shell-file-name) |
5fbd632e1109
(explicit-bash-args): Bash 1.x doesn't grook
Kim F. Storm <storm@cua.dk>
parents:
48016
diff
changeset
|
290 (getenv "ESHELL") shell-file-name)) |
5fbd632e1109
(explicit-bash-args): Bash 1.x doesn't grook
Kim F. Storm <storm@cua.dk>
parents:
48016
diff
changeset
|
291 (name (file-name-nondirectory prog))) |
5fbd632e1109
(explicit-bash-args): Bash 1.x doesn't grook
Kim F. Storm <storm@cua.dk>
parents:
48016
diff
changeset
|
292 (if (and (not purify-flag) |
5fbd632e1109
(explicit-bash-args): Bash 1.x doesn't grook
Kim F. Storm <storm@cua.dk>
parents:
48016
diff
changeset
|
293 (equal name "bash") |
5fbd632e1109
(explicit-bash-args): Bash 1.x doesn't grook
Kim F. Storm <storm@cua.dk>
parents:
48016
diff
changeset
|
294 (file-executable-p prog) |
5fbd632e1109
(explicit-bash-args): Bash 1.x doesn't grook
Kim F. Storm <storm@cua.dk>
parents:
48016
diff
changeset
|
295 (string-match "bad option" |
5fbd632e1109
(explicit-bash-args): Bash 1.x doesn't grook
Kim F. Storm <storm@cua.dk>
parents:
48016
diff
changeset
|
296 (shell-command-to-string (concat prog " --noediting")))) |
5fbd632e1109
(explicit-bash-args): Bash 1.x doesn't grook
Kim F. Storm <storm@cua.dk>
parents:
48016
diff
changeset
|
297 '("-i") |
5fbd632e1109
(explicit-bash-args): Bash 1.x doesn't grook
Kim F. Storm <storm@cua.dk>
parents:
48016
diff
changeset
|
298 '("--noediting" "-i"))) |
46073
58a34a457ab8
(explicit-bash-args): New user option.
Andreas Schwab <schwab@suse.de>
parents:
45285
diff
changeset
|
299 "*Args passed to inferior shell by M-x shell, if the shell is bash. |
58a34a457ab8
(explicit-bash-args): New user option.
Andreas Schwab <schwab@suse.de>
parents:
45285
diff
changeset
|
300 Value is a list of strings, which may be nil." |
58a34a457ab8
(explicit-bash-args): New user option.
Andreas Schwab <schwab@suse.de>
parents:
45285
diff
changeset
|
301 :type '(repeat (string :tag "Argument")) |
58a34a457ab8
(explicit-bash-args): New user option.
Andreas Schwab <schwab@suse.de>
parents:
45285
diff
changeset
|
302 :group 'shell) |
58a34a457ab8
(explicit-bash-args): New user option.
Andreas Schwab <schwab@suse.de>
parents:
45285
diff
changeset
|
303 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
304 (defcustom shell-input-autoexpand 'history |
5538
9d84549e89b4
(shell-input-autoexpand): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5474
diff
changeset
|
305 "*If non-nil, expand input command history references on completion. |
9d84549e89b4
(shell-input-autoexpand): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5474
diff
changeset
|
306 This mirrors the optional behavior of tcsh (its autoexpand and histlit). |
9d84549e89b4
(shell-input-autoexpand): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5474
diff
changeset
|
307 |
9d84549e89b4
(shell-input-autoexpand): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5474
diff
changeset
|
308 If the value is `input', then the expansion is seen on input. |
9d84549e89b4
(shell-input-autoexpand): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5474
diff
changeset
|
309 If the value is `history', then the expansion is only when inserting |
9d84549e89b4
(shell-input-autoexpand): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5474
diff
changeset
|
310 into the buffer's input ring. See also `comint-magic-space' and |
9d84549e89b4
(shell-input-autoexpand): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5474
diff
changeset
|
311 `comint-dynamic-complete'. |
9d84549e89b4
(shell-input-autoexpand): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5474
diff
changeset
|
312 |
9d84549e89b4
(shell-input-autoexpand): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5474
diff
changeset
|
313 This variable supplies a default for `comint-input-autoexpand', |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
314 for Shell mode only." |
23274
0c30ca946dba
(shell-input-autoexpand): Fix customize type.
Andreas Schwab <schwab@suse.de>
parents:
23219
diff
changeset
|
315 :type '(choice (const :tag "off" nil) |
0c30ca946dba
(shell-input-autoexpand): Fix customize type.
Andreas Schwab <schwab@suse.de>
parents:
23219
diff
changeset
|
316 (const input) |
0c30ca946dba
(shell-input-autoexpand): Fix customize type.
Andreas Schwab <schwab@suse.de>
parents:
23219
diff
changeset
|
317 (const history) |
0c30ca946dba
(shell-input-autoexpand): Fix customize type.
Andreas Schwab <schwab@suse.de>
parents:
23219
diff
changeset
|
318 (const :tag "on" t)) |
23480
2046e6b0bc8e
(shell-input-autoexpand): Fix customization group.
Richard M. Stallman <rms@gnu.org>
parents:
23274
diff
changeset
|
319 :group 'shell) |
5538
9d84549e89b4
(shell-input-autoexpand): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5474
diff
changeset
|
320 |
114 | 321 (defvar shell-dirstack nil |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
322 "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
|
323 Thus, this does not include the shell's current directory.") |
114 | 324 |
6152
34d9a0aa80d1
(shell-dirtrackp): Variable definition added.
Richard M. Stallman <rms@gnu.org>
parents:
6150
diff
changeset
|
325 (defvar shell-dirtrackp t |
34d9a0aa80d1
(shell-dirtrackp): Variable definition added.
Richard M. Stallman <rms@gnu.org>
parents:
6150
diff
changeset
|
326 "Non-nil in a shell buffer means directory tracking is enabled.") |
34d9a0aa80d1
(shell-dirtrackp): Variable definition added.
Richard M. Stallman <rms@gnu.org>
parents:
6150
diff
changeset
|
327 |
2351
bb1ff4e31fb6
Brent Benson's patch to support `cd -'.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1801
diff
changeset
|
328 (defvar shell-last-dir nil |
bb1ff4e31fb6
Brent Benson's patch to support `cd -'.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1801
diff
changeset
|
329 "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
|
330 |
7083
9630c48595d8
(shell-dirstack-query): Defaults to nil.
Richard M. Stallman <rms@gnu.org>
parents:
6887
diff
changeset
|
331 (defvar shell-dirstack-query nil |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
332 "Command used by `shell-resync-dir' to query the shell.") |
114 | 333 |
6150
c1dde384f0dd
(shell-mode-map): Use copy-keymap.
Richard M. Stallman <rms@gnu.org>
parents:
5880
diff
changeset
|
334 (defvar shell-mode-map nil) |
114 | 335 (cond ((not shell-mode-map) |
8889
323936455525
(shell-mode-map): Inherit comint-mode-map, but copy the completion menu.
Richard M. Stallman <rms@gnu.org>
parents:
8694
diff
changeset
|
336 (setq shell-mode-map (nconc (make-sparse-keymap) comint-mode-map)) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
337 (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
|
338 (define-key shell-mode-map "\C-c\C-b" 'shell-backward-command) |
43844
a0885debe0c5
(toplevel): Revert previous change to use pcomplete.
Colin Walters <walters@gnu.org>
parents:
43529
diff
changeset
|
339 (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
|
340 (define-key shell-mode-map "\M-?" |
6186
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
341 'comint-dynamic-list-filename-completions) |
8889
323936455525
(shell-mode-map): Inherit comint-mode-map, but copy the completion menu.
Richard M. Stallman <rms@gnu.org>
parents:
8694
diff
changeset
|
342 (define-key shell-mode-map [menu-bar completion] |
45284
723fdd614e34
(shell-mode): Make second part of initialisation
Francesco Potortì <pot@gnu.org>
parents:
45214
diff
changeset
|
343 (cons "Complete" |
43521
c61a65062ae1
(shell-mode-map): Add "Complete" header so completion
Kim F. Storm <storm@cua.dk>
parents:
43491
diff
changeset
|
344 (copy-keymap (lookup-key comint-mode-map [menu-bar completion])))) |
6887
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
345 (define-key-after (lookup-key shell-mode-map [menu-bar completion]) |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
346 [complete-env-variable] '("Complete Env. Variable Name" . |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
347 shell-dynamic-complete-environment-variable) |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
348 'complete-file) |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
349 (define-key-after (lookup-key shell-mode-map [menu-bar completion]) |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
350 [expand-directory] '("Expand Directory Reference" . |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
351 shell-replace-by-expanded-directory) |
9888d3b32db3
(shell-mode-map): Fix menu bar options.
Karl Heuer <kwzh@gnu.org>
parents:
6885
diff
changeset
|
352 'complete-expand))) |
114 | 353 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
354 (defcustom shell-mode-hook '() |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
355 "*Hook for customising Shell mode." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
356 :type 'hook |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16877
diff
changeset
|
357 :group 'shell) |
114 | 358 |
9383
c4fa081b416e
(shell-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9244
diff
changeset
|
359 (defvar shell-font-lock-keywords |
31037
7c81a282d217
(shell-font-lock-keywords): Remove prompt highlighting, since this is
Miles Bader <miles@gnu.org>
parents:
30641
diff
changeset
|
360 '(("[ \t]\\([+-][^ \t\n]+\\)" 1 font-lock-comment-face) |
17497
3ee027d263c6
Use EVAL form for shell-prompt-pattern.
Simon Marshall <simon@gnu.org>
parents:
17428
diff
changeset
|
361 ("^[^ \t\n]+:.*" . font-lock-string-face) |
3ee027d263c6
Use EVAL form for shell-prompt-pattern.
Simon Marshall <simon@gnu.org>
parents:
17428
diff
changeset
|
362 ("^\\[[1-9][0-9]*\\]" . font-lock-string-face)) |
9383
c4fa081b416e
(shell-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9244
diff
changeset
|
363 "Additional expressions to highlight in Shell mode.") |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
364 |
114 | 365 ;;; Basic Procedures |
366 | |
17646
0dcc993f06e4
(shell-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17497
diff
changeset
|
367 (put 'shell-mode 'mode-class 'special) |
0dcc993f06e4
(shell-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17497
diff
changeset
|
368 |
33706
8c460ceb4916
(shell-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32943
diff
changeset
|
369 (define-derived-mode shell-mode comint-mode "Shell" |
114 | 370 "Major mode for interacting with an inferior shell. |
10831
94811e4b2a06
Added shell-truncate-buffer function to restrict buffer size to
Simon Marshall <simon@gnu.org>
parents:
10791
diff
changeset
|
371 \\[comint-send-input] after the end of the process' output sends the text from |
94811e4b2a06
Added shell-truncate-buffer function to restrict buffer size to
Simon Marshall <simon@gnu.org>
parents:
10791
diff
changeset
|
372 the end of process to the end of the current line. |
94811e4b2a06
Added shell-truncate-buffer function to restrict buffer size to
Simon Marshall <simon@gnu.org>
parents:
10791
diff
changeset
|
373 \\[comint-send-input] before end of process output copies the current line minus the prompt to |
94811e4b2a06
Added shell-truncate-buffer function to restrict buffer size to
Simon Marshall <simon@gnu.org>
parents:
10791
diff
changeset
|
374 the end of the buffer and sends it (\\[comint-copy-old-input] just copies the current line). |
10377
2123413a483e
Doc fixes (simon's email address and shell-mode)
Simon Marshall <simon@gnu.org>
parents:
10019
diff
changeset
|
375 \\[send-invisible] reads a line of text without echoing it, and sends it to |
6508
965beb0c97d2
(shell-strip-ctrl-m): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6295
diff
changeset
|
376 the shell. This is useful for entering passwords. Or, add the function |
965beb0c97d2
(shell-strip-ctrl-m): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6295
diff
changeset
|
377 `comint-watch-for-password-prompt' to `comint-output-filter-functions'. |
114 | 378 |
10377
2123413a483e
Doc fixes (simon's email address and shell-mode)
Simon Marshall <simon@gnu.org>
parents:
10019
diff
changeset
|
379 If you want to make multiple shell buffers, rename the `*shell*' buffer |
2123413a483e
Doc fixes (simon's email address and shell-mode)
Simon Marshall <simon@gnu.org>
parents:
10019
diff
changeset
|
380 using \\[rename-buffer] or \\[rename-uniquely] and start a new shell. |
2123413a483e
Doc fixes (simon's email address and shell-mode)
Simon Marshall <simon@gnu.org>
parents:
10019
diff
changeset
|
381 |
10831
94811e4b2a06
Added shell-truncate-buffer function to restrict buffer size to
Simon Marshall <simon@gnu.org>
parents:
10791
diff
changeset
|
382 If you want to make shell buffers limited in length, add the function |
10832
32d4c4ca1ff8
Moved buffer truncation functionality to comint.el.
Simon Marshall <simon@gnu.org>
parents:
10831
diff
changeset
|
383 `comint-truncate-buffer' to `comint-output-filter-functions'. |
10831
94811e4b2a06
Added shell-truncate-buffer function to restrict buffer size to
Simon Marshall <simon@gnu.org>
parents:
10791
diff
changeset
|
384 |
114 | 385 If you accidentally suspend your process, use \\[comint-continue-subjob] |
386 to continue it. | |
387 | |
10377
2123413a483e
Doc fixes (simon's email address and shell-mode)
Simon Marshall <simon@gnu.org>
parents:
10019
diff
changeset
|
388 `cd', `pushd' and `popd' commands given to the shell are watched by Emacs to |
2123413a483e
Doc fixes (simon's email address and shell-mode)
Simon Marshall <simon@gnu.org>
parents:
10019
diff
changeset
|
389 keep this buffer's default directory the same as the shell's working directory. |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
390 While directory tracking is enabled, the shell's working directory is displayed |
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
391 by \\[list-buffers] or \\[mouse-buffer-menu] in the `File' field. |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
392 \\[dirs] queries the shell and resyncs Emacs' idea of what the current |
114 | 393 directory stack is. |
20971
22a407edd2f0
(shell-dirtrack-mode): Renamed from shell-dirtrack-toggle.
Karl Heuer <kwzh@gnu.org>
parents:
19829
diff
changeset
|
394 \\[dirtrack-mode] turns directory tracking on and off. |
114 | 395 |
396 \\{shell-mode-map} | |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
397 Customization: Entry to this mode runs the hooks on `comint-mode-hook' and |
6186
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
398 `shell-mode-hook' (in that order). Before each input, the hooks on |
6189
4ff931c18e4b
Rename comint-input-filter-functions and
Richard M. Stallman <rms@gnu.org>
parents:
6186
diff
changeset
|
399 `comint-input-filter-functions' are run. After each shell output, the hooks |
4ff931c18e4b
Rename comint-input-filter-functions and
Richard M. Stallman <rms@gnu.org>
parents:
6186
diff
changeset
|
400 on `comint-output-filter-functions' are run. |
114 | 401 |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
402 Variables `shell-cd-regexp', `shell-chdrive-regexp', `shell-pushd-regexp' |
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
403 and `shell-popd-regexp' are used to match their respective commands, |
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
404 while `shell-pushd-tohome', `shell-pushd-dextract' and `shell-pushd-dunique' |
15370
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
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 |
6255
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
407 Variables `comint-completion-autolist', `comint-completion-addsuffix', |
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
408 `comint-completion-recexact' and `comint-completion-fignore' control the |
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
409 behavior of file name, command name and variable name completion. Variable |
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
410 `shell-completion-execonly' controls the behavior of command name completion. |
63507
e5299a8016cb
(shell-prompt-pattern, shell-dynamic-complete-functions, shell-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
62402
diff
changeset
|
411 Variable `shell-completion-fignore' is used to initialize the value of |
6255
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
412 `comint-completion-fignore'. |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
413 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
414 Variables `comint-input-ring-file-name' and `comint-input-autoexpand' control |
65199
23741bfb23af
(shell-mode, shell-resync-dirs): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
64762
diff
changeset
|
415 the initialization of the input ring history, and history expansion. |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
416 |
6189
4ff931c18e4b
Rename comint-input-filter-functions and
Richard M. Stallman <rms@gnu.org>
parents:
6186
diff
changeset
|
417 Variables `comint-output-filter-functions', a hook, and |
6255
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
418 `comint-scroll-to-bottom-on-input' and `comint-scroll-to-bottom-on-output' |
6186
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
419 control whether input and output cause the window to scroll to the end of the |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
420 buffer." |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
421 (setq comint-prompt-regexp shell-prompt-pattern) |
6255
277d9ace9f5d
(shell-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6189
diff
changeset
|
422 (setq comint-completion-fignore shell-completion-fignore) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
423 (setq comint-delimiter-argument-list shell-delimiter-argument-list) |
15818
574ec5119c7a
(shell-file-name-chars): Was shell-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
15655
diff
changeset
|
424 (setq comint-file-name-chars shell-file-name-chars) |
11186
54a20705cf02
Set comint-file-name-quote-list to new shell-file-name-quote-list.
Simon Marshall <simon@gnu.org>
parents:
11154
diff
changeset
|
425 (setq comint-file-name-quote-list shell-file-name-quote-list) |
43844
a0885debe0c5
(toplevel): Revert previous change to use pcomplete.
Colin Walters <walters@gnu.org>
parents:
43529
diff
changeset
|
426 (setq comint-dynamic-complete-functions shell-dynamic-complete-functions) |
61876
c157250db02c
(shell-prompt-pattern): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53402
diff
changeset
|
427 (set (make-local-variable 'paragraph-separate) "\\'") |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
428 (make-local-variable 'paragraph-start) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
429 (setq paragraph-start comint-prompt-regexp) |
9485
2685c7803c18
* shell.el: (shell-font-lock-keywords): Add `\n' to [^] regexps.
Simon Marshall <simon@gnu.org>
parents:
9383
diff
changeset
|
430 (make-local-variable 'font-lock-defaults) |
2685c7803c18
* shell.el: (shell-font-lock-keywords): Add `\n' to [^] regexps.
Simon Marshall <simon@gnu.org>
parents:
9383
diff
changeset
|
431 (setq font-lock-defaults '(shell-font-lock-keywords t)) |
114 | 432 (make-local-variable 'shell-dirstack) |
252 | 433 (setq shell-dirstack nil) |
19469
41215527a262
Make shell-last-dir buffer-local.
Simon Marshall <simon@gnu.org>
parents:
19121
diff
changeset
|
434 (make-local-variable 'shell-last-dir) |
2351
bb1ff4e31fb6
Brent Benson's patch to support `cd -'.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1801
diff
changeset
|
435 (setq shell-last-dir nil) |
252 | 436 (make-local-variable 'shell-dirtrackp) |
437 (setq shell-dirtrackp t) | |
12213
59bfaac6cee2
(shell-mode): Make shell-directory-tracker a hook function locally only.
Richard M. Stallman <rms@gnu.org>
parents:
12201
diff
changeset
|
438 (add-hook 'comint-input-filter-functions 'shell-directory-tracker nil t) |
5538
9d84549e89b4
(shell-input-autoexpand): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5474
diff
changeset
|
439 (setq comint-input-autoexpand shell-input-autoexpand) |
18878
f39ae9c61a45
(shell-mode): Do set list-files-directory locally.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
440 ;; This is not really correct, since the shell buffer does not really |
f39ae9c61a45
(shell-mode): Do set list-files-directory locally.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
441 ;; edit this directory. But it is useful in the buffer list and menus. |
f39ae9c61a45
(shell-mode): Do set list-files-directory locally.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
442 (make-local-variable 'list-buffers-directory) |
f39ae9c61a45
(shell-mode): Do set list-files-directory locally.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
443 (setq list-buffers-directory (expand-file-name default-directory)) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
444 ;; shell-dependent assignments. |
45285
dc0eece6818b
(shell-mode): Use (ring-empty-p rather than (zerop (ring-length.
Francesco Potortì <pot@gnu.org>
parents:
45284
diff
changeset
|
445 (when (ring-empty-p comint-input-ring) |
44374
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
446 (let ((shell (file-name-nondirectory (car |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
447 (process-command (get-buffer-process (current-buffer))))))) |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
448 (setq comint-input-ring-file-name |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
449 (or (getenv "HISTFILE") |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
450 (cond ((string-equal shell "bash") "~/.bash_history") |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
451 ((string-equal shell "ksh") "~/.sh_history") |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
452 (t "~/.history")))) |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
453 (if (or (equal comint-input-ring-file-name "") |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
454 (equal (file-truename comint-input-ring-file-name) |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
455 (file-truename "/dev/null"))) |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
456 (setq comint-input-ring-file-name nil)) |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
457 ;; Arrange to write out the input ring on exit, if the shell doesn't |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
458 ;; do this itself. |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
459 (if (and comint-input-ring-file-name |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
460 (string-match shell-dumb-shell-regexp shell)) |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
461 (set-process-sentinel (get-buffer-process (current-buffer)) |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
462 #'shell-write-history-on-exit)) |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
463 (setq shell-dirstack-query |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
464 (cond ((string-equal shell "sh") "pwd") |
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
465 ((string-equal shell "ksh") "echo $PWD ~-") |
51482
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
466 (t "dirs"))) |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
467 ;; Bypass a bug in certain versions of bash. |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
468 (when (string-equal shell "bash") |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
469 (add-hook 'comint-output-filter-functions |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
470 'shell-filter-ctrl-a-ctrl-b nil t))) |
44374
2472e2446b55
(shell-mode): Don't reinit comint-input-ring if that was already done.
Richard M. Stallman <rms@gnu.org>
parents:
43844
diff
changeset
|
471 (comint-read-input-ring t))) |
31617
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
472 |
51482
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
473 (defun shell-filter-ctrl-a-ctrl-b (string) |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
474 "Remove `^A' and `^B' characters from comint output. |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
475 |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
476 Bash uses these characters as internal quoting characters in its |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
477 prompt. Due to a bug in some bash versions (including 2.03, |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
478 2.04, and 2.05b), they may erroneously show up when bash is |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
479 started with the `--noediting' option and Select Graphic |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
480 Rendition (SGR) control sequences (formerly known as ANSI escape |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
481 sequences) are used to color the prompt. |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
482 |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
483 This function can be put on `comint-output-filter-functions'. |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
484 The argument STRING is ignored." |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
485 (let ((pmark (process-mark (get-buffer-process (current-buffer))))) |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
486 (save-excursion |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
487 (goto-char (or comint-last-output-start (point-min))) |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
488 (while (re-search-forward "[\C-a\C-b]" pmark t) |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
489 (replace-match ""))))) |
8eb767cf7295
(shell-mode): Put `shell-filter-ctrl-a-ctrl-b' on
Lute Kamstra <lute@gnu.org>
parents:
49549
diff
changeset
|
490 |
31617
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
491 (defun shell-write-history-on-exit (process event) |
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
492 "Called when the shell process is stopped. |
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
493 |
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
494 Writes the input history to a history file |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
495 `comint-input-ring-file-name' using `comint-write-input-ring' |
31617
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
496 and inserts a short message in the shell buffer. |
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
497 |
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
498 This function is a sentinel watching the shell interpreter process. |
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
499 Sentinels will always get the two parameters PROCESS and EVENT." |
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
500 ;; Write history. |
3ed336667dbc
(shell-write-history-on-exit): New function.
Andrew Innes <andrewi@gnu.org>
parents:
31037
diff
changeset
|
501 (comint-write-input-ring) |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
502 (let ((buf (process-buffer process))) |
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
503 (when (buffer-live-p buf) |
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
504 (with-current-buffer buf |
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
505 (insert (format "\nProcess %s %s\n" process event)))))) |
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
506 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
507 ;;;###autoload |
32943
a0120c3e98f7
(shell): Add BUFFER argument.
Miles Bader <miles@gnu.org>
parents:
31617
diff
changeset
|
508 (defun shell (&optional buffer) |
a0120c3e98f7
(shell): Add BUFFER argument.
Miles Bader <miles@gnu.org>
parents:
31617
diff
changeset
|
509 "Run an inferior shell, with I/O through BUFFER (which defaults to `*shell*'). |
a0120c3e98f7
(shell): Add BUFFER argument.
Miles Bader <miles@gnu.org>
parents:
31617
diff
changeset
|
510 Interactively, a prefix arg means to prompt for BUFFER. |
a0120c3e98f7
(shell): Add BUFFER argument.
Miles Bader <miles@gnu.org>
parents:
31617
diff
changeset
|
511 If BUFFER exists but shell process is not running, make new shell. |
a0120c3e98f7
(shell): Add BUFFER argument.
Miles Bader <miles@gnu.org>
parents:
31617
diff
changeset
|
512 If BUFFER exists and shell process is running, just switch to BUFFER. |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
513 Program used comes from variable `explicit-shell-file-name', |
252 | 514 or (if that is nil) from the ESHELL environment variable, |
515 or else from SHELL if there is no ESHELL. | |
1076 | 516 If a file `~/.emacs_SHELLNAME' exists, it is given as initial input |
252 | 517 (Note that this may lose due to a timing error if the shell |
518 discards input when it starts up.) | |
1076 | 519 The buffer is put in Shell mode, giving commands for sending input |
520 and controlling the subjobs of the shell. See `shell-mode'. | |
521 See also the variable `shell-prompt-pattern'. | |
114 | 522 |
19121 | 523 To specify a coding system for converting non-ASCII characters |
524 in the input and output to the shell, use \\[universal-coding-system-argument] | |
525 before \\[shell]. You can also specify this with \\[set-buffer-process-coding-system] | |
526 in the shell buffer, after you start the shell. | |
527 The default comes from `process-coding-system-alist' and | |
528 `default-process-coding-system'. | |
529 | |
252 | 530 The shell file name (sans directories) is used to make a symbol name |
1801 | 531 such as `explicit-csh-args'. If that symbol is a variable, |
114 | 532 its value is used as a list of arguments when invoking the shell. |
533 Otherwise, one argument `-i' is passed to the shell. | |
534 | |
535 \(Type \\[describe-mode] in the shell buffer for a list of commands.)" | |
32943
a0120c3e98f7
(shell): Add BUFFER argument.
Miles Bader <miles@gnu.org>
parents:
31617
diff
changeset
|
536 (interactive |
a0120c3e98f7
(shell): Add BUFFER argument.
Miles Bader <miles@gnu.org>
parents:
31617
diff
changeset
|
537 (list |
a0120c3e98f7
(shell): Add BUFFER argument.
Miles Bader <miles@gnu.org>
parents:
31617
diff
changeset
|
538 (and current-prefix-arg |
52181
2768e13cd476
(shell): With prefix-arg, suggest a new buffer name.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
51554
diff
changeset
|
539 (read-buffer "Shell buffer: " |
2768e13cd476
(shell): With prefix-arg, suggest a new buffer name.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
51554
diff
changeset
|
540 (generate-new-buffer-name "*shell*"))))) |
41777
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
541 (setq buffer (get-buffer-create (or buffer "*shell*"))) |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
542 ;; Pop to buffer, so that the buffer's window will be correctly set |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
543 ;; when we call comint (so that comint sets the COLUMNS env var properly). |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
544 (pop-to-buffer buffer) |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
545 (unless (comint-check-proc buffer) |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
546 (let* ((prog (or explicit-shell-file-name |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
547 (getenv "ESHELL") shell-file-name)) |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
548 (name (file-name-nondirectory prog)) |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
549 (startfile (concat "~/.emacs_" name)) |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
550 (xargs-name (intern-soft (concat "explicit-" name "-args")))) |
48016
52a504c502a5
(shell): Look for .emacs_SHELL under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents:
46159
diff
changeset
|
551 (if (not (file-exists-p startfile)) |
52a504c502a5
(shell): Look for .emacs_SHELL under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents:
46159
diff
changeset
|
552 (setq startfile (concat "~/.emacs.d/.emacs_" name))) |
41777
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
553 (apply 'make-comint-in-buffer "shell" buffer prog |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
554 (if (file-exists-p startfile) startfile) |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
555 (if (and xargs-name (boundp xargs-name)) |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
556 (symbol-value xargs-name) |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
557 '("-i"))) |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
558 (shell-mode))) |
ca6dfcb53a03
(shell): Use shell-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38409
diff
changeset
|
559 buffer) |
10975
5abad4aec8e0
(shell): Use pop-to-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10878
diff
changeset
|
560 |
5abad4aec8e0
(shell): Use pop-to-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10878
diff
changeset
|
561 ;;; Don't do this when shell.el is loaded, only while dumping. |
5abad4aec8e0
(shell): Use pop-to-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10878
diff
changeset
|
562 ;;;###autoload (add-hook 'same-window-buffer-names "*shell*") |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
563 |
114 | 564 ;;; Directory tracking |
14169 | 565 ;;; |
114 | 566 ;;; This code provides the shell mode input sentinel |
567 ;;; SHELL-DIRECTORY-TRACKER | |
568 ;;; that tracks cd, pushd, and popd commands issued to the shell, and | |
569 ;;; changes the current directory of the shell buffer accordingly. | |
570 ;;; | |
571 ;;; This is basically a fragile hack, although it's more accurate than | |
2469 | 572 ;;; the version in Emacs 18's shell.el. It has the following failings: |
114 | 573 ;;; 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
|
574 ;;; 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
|
575 ;;; 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
|
576 ;;; 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
|
577 ;;; 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
|
578 ;;; 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
|
579 ;;; inside conditional expressions, aliases, and so forth. |
114 | 580 ;;; |
581 ;;; The whole approach is a crock. Shell aliases mess it up. File sourcing | |
582 ;;; messes it up. You run other processes under the shell; these each have | |
583 ;;; separate working directories, and some have commands for manipulating | |
584 ;;; their w.d.'s (e.g., the lcd command in ftp). Some of these programs have | |
252 | 585 ;;; commands that do *not* affect the current w.d. at all, but look like they |
114 | 586 ;;; do (e.g., the cd command in ftp). In shells that allow you job |
587 ;;; control, you can switch between jobs, all having different w.d.'s. So | |
588 ;;; simply saying %3 can shift your w.d.. | |
589 ;;; | |
590 ;;; The solution is to relax, not stress out about it, and settle for | |
591 ;;; a hack that works pretty well in typical circumstances. Remember | |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
592 ;;; that a half-assed solution is more in keeping with the spirit of Unix, |
114 | 593 ;;; anyway. Blech. |
594 ;;; | |
595 ;;; One good hack not implemented here for users of programmable shells | |
596 ;;; is to program up the shell w.d. manipulation commands to output | |
597 ;;; a coded command sequence to the tty. Something like | |
598 ;;; ESC | <cwd> | | |
599 ;;; where <cwd> is the new current working directory. Then trash the | |
600 ;;; directory tracking machinery currently used in this package, and | |
601 ;;; replace it with a process filter that watches for and strips out | |
602 ;;; these messages. | |
603 | |
604 (defun shell-directory-tracker (str) | |
605 "Tracks cd, pushd and popd commands issued to the shell. | |
606 This function is called on each input passed to the shell. | |
607 It watches for cd, pushd and popd commands and sets the buffer's | |
608 default directory to track these commands. | |
609 | |
20971
22a407edd2f0
(shell-dirtrack-mode): Renamed from shell-dirtrack-toggle.
Karl Heuer <kwzh@gnu.org>
parents:
19829
diff
changeset
|
610 You may toggle this tracking on and off with M-x dirtrack-mode. |
114 | 611 If emacs gets confused, you can resync with the shell with M-x dirs. |
612 | |
15370
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
613 See variables `shell-cd-regexp', `shell-chdrive-regexp', `shell-pushd-regexp', |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
614 and `shell-popd-regexp', while `shell-pushd-tohome', `shell-pushd-dextract', |
15370
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
615 and `shell-pushd-dunique' 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
|
616 |
2609
af46e8faaa32
(shell-prompt-pattern): Undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
2573
diff
changeset
|
617 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
|
618 (if shell-dirtrackp |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
619 ;; 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
|
620 (condition-case chdir-failure |
51554
8cf86bc95fe5
(shell-command-separator-regexp): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51519
diff
changeset
|
621 (let ((start (progn (string-match |
8cf86bc95fe5
(shell-command-separator-regexp): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51519
diff
changeset
|
622 (concat "^" shell-command-separator-regexp) |
8cf86bc95fe5
(shell-command-separator-regexp): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51519
diff
changeset
|
623 str) ; skip whitespace |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
624 (match-end 0))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
625 end cmd arg1) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
626 (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
|
627 (setq end (match-end 0) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
628 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
|
629 arg1 (comint-arguments (substring str start end) 1 1)) |
24967
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
630 (if arg1 |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
631 (setq arg1 (shell-unquote-argument arg1))) |
12323
a48a0352b344
(shell-directory-tracker): Check for terminator after
Karl Heuer <kwzh@gnu.org>
parents:
12213
diff
changeset
|
632 (cond ((string-match (concat "\\`\\(" shell-popd-regexp |
a48a0352b344
(shell-directory-tracker): Check for terminator after
Karl Heuer <kwzh@gnu.org>
parents:
12213
diff
changeset
|
633 "\\)\\($\\|[ \t]\\)") |
a48a0352b344
(shell-directory-tracker): Check for terminator after
Karl Heuer <kwzh@gnu.org>
parents:
12213
diff
changeset
|
634 cmd) |
15370
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
635 (shell-process-popd (comint-substitute-in-file-name arg1))) |
12323
a48a0352b344
(shell-directory-tracker): Check for terminator after
Karl Heuer <kwzh@gnu.org>
parents:
12213
diff
changeset
|
636 ((string-match (concat "\\`\\(" shell-pushd-regexp |
a48a0352b344
(shell-directory-tracker): Check for terminator after
Karl Heuer <kwzh@gnu.org>
parents:
12213
diff
changeset
|
637 "\\)\\($\\|[ \t]\\)") |
a48a0352b344
(shell-directory-tracker): Check for terminator after
Karl Heuer <kwzh@gnu.org>
parents:
12213
diff
changeset
|
638 cmd) |
15370
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
639 (shell-process-pushd (comint-substitute-in-file-name arg1))) |
12323
a48a0352b344
(shell-directory-tracker): Check for terminator after
Karl Heuer <kwzh@gnu.org>
parents:
12213
diff
changeset
|
640 ((string-match (concat "\\`\\(" shell-cd-regexp |
a48a0352b344
(shell-directory-tracker): Check for terminator after
Karl Heuer <kwzh@gnu.org>
parents:
12213
diff
changeset
|
641 "\\)\\($\\|[ \t]\\)") |
a48a0352b344
(shell-directory-tracker): Check for terminator after
Karl Heuer <kwzh@gnu.org>
parents:
12213
diff
changeset
|
642 cmd) |
15370
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
643 (shell-process-cd (comint-substitute-in-file-name arg1))) |
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
644 ((and shell-chdrive-regexp |
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
645 (string-match (concat "\\`\\(" shell-chdrive-regexp |
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
646 "\\)\\($\\|[ \t]\\)") |
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
647 cmd)) |
b75fc8f3b376
(shell-directory-tracker): Use comint-substitute-in-file-name to
Richard M. Stallman <rms@gnu.org>
parents:
15327
diff
changeset
|
648 (shell-process-cd (comint-substitute-in-file-name cmd)))) |
51554
8cf86bc95fe5
(shell-command-separator-regexp): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51519
diff
changeset
|
649 (setq start (progn (string-match shell-command-separator-regexp |
8cf86bc95fe5
(shell-command-separator-regexp): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51519
diff
changeset
|
650 str end) |
8cf86bc95fe5
(shell-command-separator-regexp): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51519
diff
changeset
|
651 ;; skip again |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
652 (match-end 0))))) |
6189
4ff931c18e4b
Rename comint-input-filter-functions and
Richard M. Stallman <rms@gnu.org>
parents:
6186
diff
changeset
|
653 (error "Couldn't cd")))) |
114 | 654 |
24967
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
655 (defun shell-unquote-argument (string) |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
656 "Remove all kinds of shell quoting from STRING." |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
657 (save-match-data |
35643
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
658 (let ((idx 0) next inside |
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
659 (quote-chars |
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
660 (if (string-match shell-dumb-shell-regexp |
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
661 (file-name-nondirectory |
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
662 (car (process-command (get-buffer-process (current-buffer)))))) |
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
663 "['`\"]" |
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
664 "[\\'`\"]"))) |
24967
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
665 (while (and (< idx (length string)) |
35643
cafc43e2ccfd
(shell-unquote-argument): If the shell is one of the
Eli Zaretskii <eliz@gnu.org>
parents:
33706
diff
changeset
|
666 (setq next (string-match quote-chars string next))) |
24967
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
667 (cond ((= (aref string next) ?\\) |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
668 (setq string (replace-match "" nil nil string)) |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
669 (setq next (1+ next))) |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
670 ((and inside (= (aref string next) inside)) |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
671 (setq string (replace-match "" nil nil string)) |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
672 (setq inside nil)) |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
673 (inside |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
674 (setq next (1+ next))) |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
675 (t |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
676 (setq inside (aref string next)) |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
677 (setq string (replace-match "" nil nil string))))) |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
678 string))) |
03990f1d9e2d
(shell-unquote-argument): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24738
diff
changeset
|
679 |
114 | 680 ;;; popd [+n] |
681 (defun shell-process-popd (arg) | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
682 (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
|
683 (cond ((and num (= num 0) shell-dirstack) |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
684 (shell-cd (car shell-dirstack)) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
685 (setq shell-dirstack (cdr shell-dirstack)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
686 (shell-dirstack-message)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
687 ((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
|
688 (let* ((ds (cons nil shell-dirstack)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
689 (cell (nthcdr (1- num) ds))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
690 (rplacd cell (cdr (cdr cell))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
691 (setq shell-dirstack (cdr ds)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
692 (shell-dirstack-message))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
693 (t |
6189
4ff931c18e4b
Rename comint-input-filter-functions and
Richard M. Stallman <rms@gnu.org>
parents:
6186
diff
changeset
|
694 (error "Couldn't popd"))))) |
114 | 695 |
5474
239620e1795d
(shell-cd): Function removed.
Roland McGrath <roland@gnu.org>
parents:
5335
diff
changeset
|
696 ;; Return DIR prefixed with comint-file-name-prefix as appropriate. |
8033
bedead77e86f
(shell-prefixed-directory-name): Do nothing if
Richard M. Stallman <rms@gnu.org>
parents:
7610
diff
changeset
|
697 (defun shell-prefixed-directory-name (dir) |
bedead77e86f
(shell-prefixed-directory-name): Do nothing if
Richard M. Stallman <rms@gnu.org>
parents:
7610
diff
changeset
|
698 (if (= (length comint-file-name-prefix) 0) |
bedead77e86f
(shell-prefixed-directory-name): Do nothing if
Richard M. Stallman <rms@gnu.org>
parents:
7610
diff
changeset
|
699 dir |
bedead77e86f
(shell-prefixed-directory-name): Do nothing if
Richard M. Stallman <rms@gnu.org>
parents:
7610
diff
changeset
|
700 (if (file-name-absolute-p dir) |
bedead77e86f
(shell-prefixed-directory-name): Do nothing if
Richard M. Stallman <rms@gnu.org>
parents:
7610
diff
changeset
|
701 ;; The name is absolute, so prepend the prefix. |
bedead77e86f
(shell-prefixed-directory-name): Do nothing if
Richard M. Stallman <rms@gnu.org>
parents:
7610
diff
changeset
|
702 (concat comint-file-name-prefix dir) |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
703 ;; For relative name we assume default-directory already has the prefix. |
8033
bedead77e86f
(shell-prefixed-directory-name): Do nothing if
Richard M. Stallman <rms@gnu.org>
parents:
7610
diff
changeset
|
704 (expand-file-name dir)))) |
5474
239620e1795d
(shell-cd): Function removed.
Roland McGrath <roland@gnu.org>
parents:
5335
diff
changeset
|
705 |
114 | 706 ;;; cd [dir] |
707 (defun shell-process-cd (arg) | |
5474
239620e1795d
(shell-cd): Function removed.
Roland McGrath <roland@gnu.org>
parents:
5335
diff
changeset
|
708 (let ((new-dir (cond ((zerop (length arg)) (concat comint-file-name-prefix |
239620e1795d
(shell-cd): Function removed.
Roland McGrath <roland@gnu.org>
parents:
5335
diff
changeset
|
709 "~")) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
710 ((string-equal "-" arg) shell-last-dir) |
5474
239620e1795d
(shell-cd): Function removed.
Roland McGrath <roland@gnu.org>
parents:
5335
diff
changeset
|
711 (t (shell-prefixed-directory-name arg))))) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
712 (setq shell-last-dir default-directory) |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
713 (shell-cd new-dir) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
714 (shell-dirstack-message))) |
114 | 715 |
716 ;;; pushd [+n | dir] | |
717 (defun shell-process-pushd (arg) | |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
718 (let ((num (shell-extract-num arg))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
719 (cond ((zerop (length arg)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
720 ;; 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
|
721 (cond (shell-pushd-tohome |
5474
239620e1795d
(shell-cd): Function removed.
Roland McGrath <roland@gnu.org>
parents:
5335
diff
changeset
|
722 (shell-process-pushd (concat comint-file-name-prefix "~"))) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
723 (shell-dirstack |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
724 (let ((old default-directory)) |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
725 (shell-cd (car shell-dirstack)) |
14476
63540fa43674
Resync directories properly for the ksh.
Simon Marshall <simon@gnu.org>
parents:
14329
diff
changeset
|
726 (setq shell-dirstack (cons old (cdr shell-dirstack))) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
727 (shell-dirstack-message))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
728 (t |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
729 (message "Directory stack empty.")))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
730 ((numberp num) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
731 ;; pushd +n |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
732 (cond ((> num (length shell-dirstack)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
733 (message "Directory stack not that deep.")) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
734 ((= num 0) |
38409
153f1b1f2efd
Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents:
35659
diff
changeset
|
735 (error (message "Couldn't cd"))) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
736 (shell-pushd-dextract |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
737 (let ((dir (nth (1- num) shell-dirstack))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
738 (shell-process-popd arg) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
739 (shell-process-pushd default-directory) |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
740 (shell-cd dir) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
741 (shell-dirstack-message))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
742 (t |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
743 (let* ((ds (cons default-directory shell-dirstack)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
744 (dslen (length ds)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
745 (front (nthcdr num ds)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
746 (back (reverse (nthcdr (- dslen num) (reverse ds)))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
747 (new-ds (append front back))) |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
748 (shell-cd (car new-ds)) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
749 (setq shell-dirstack (cdr new-ds)) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
750 (shell-dirstack-message))))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
751 (t |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
752 ;; pushd <dir> |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
753 (let ((old-wd default-directory)) |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
754 (shell-cd (shell-prefixed-directory-name arg)) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
755 (if (or (null shell-pushd-dunique) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
756 (not (member old-wd shell-dirstack))) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
757 (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
|
758 (shell-dirstack-message)))))) |
114 | 759 |
760 ;; If STR is of the form +n, for n>0, return n. Otherwise, nil. | |
761 (defun shell-extract-num (str) | |
762 (and (string-match "^\\+[1-9][0-9]*$" str) | |
62402
a7e02ef1e3d6
Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents:
61876
diff
changeset
|
763 (string-to-number str))) |
114 | 764 |
765 | |
20971
22a407edd2f0
(shell-dirtrack-mode): Renamed from shell-dirtrack-toggle.
Karl Heuer <kwzh@gnu.org>
parents:
19829
diff
changeset
|
766 (defun shell-dirtrack-mode () |
114 | 767 "Turn directory tracking on and off in a shell buffer." |
768 (interactive) | |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
769 (if (setq shell-dirtrackp (not shell-dirtrackp)) |
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
770 (setq list-buffers-directory default-directory) |
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
771 (setq list-buffers-directory nil)) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
772 (message "Directory tracking %s" (if shell-dirtrackp "ON" "OFF"))) |
114 | 773 |
774 ;;; For your typing convenience: | |
20971
22a407edd2f0
(shell-dirtrack-mode): Renamed from shell-dirtrack-toggle.
Karl Heuer <kwzh@gnu.org>
parents:
19829
diff
changeset
|
775 (defalias 'shell-dirtrack-toggle 'shell-dirtrack-mode) |
22a407edd2f0
(shell-dirtrack-mode): Renamed from shell-dirtrack-toggle.
Karl Heuer <kwzh@gnu.org>
parents:
19829
diff
changeset
|
776 (defalias 'dirtrack-toggle 'shell-dirtrack-mode) |
22a407edd2f0
(shell-dirtrack-mode): Renamed from shell-dirtrack-toggle.
Karl Heuer <kwzh@gnu.org>
parents:
19829
diff
changeset
|
777 (defalias 'dirtrack-mode 'shell-dirtrack-mode) |
114 | 778 |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
779 (defun shell-cd (dir) |
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
780 "Do normal `cd' to DIR, and set `list-buffers-directory'." |
10878
9556a4d578f2
Make sure shell-cd sets list-buffers-directory to a directory ending with `/'.
Simon Marshall <simon@gnu.org>
parents:
10832
diff
changeset
|
781 (if shell-dirtrackp |
9556a4d578f2
Make sure shell-cd sets list-buffers-directory to a directory ending with `/'.
Simon Marshall <simon@gnu.org>
parents:
10832
diff
changeset
|
782 (setq list-buffers-directory (file-name-as-directory |
9556a4d578f2
Make sure shell-cd sets list-buffers-directory to a directory ending with `/'.
Simon Marshall <simon@gnu.org>
parents:
10832
diff
changeset
|
783 (expand-file-name dir)))) |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
784 (cd dir)) |
114 | 785 |
786 (defun shell-resync-dirs () | |
787 "Resync the buffer's idea of the current directory stack. | |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
788 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
|
789 `shell-dirstack-query' (default \"dirs\"), reads the next |
114 | 790 line output and parses it to form the new directory stack. |
791 DON'T issue this command unless the buffer is at a shell prompt. | |
792 Also, note that if some other subprocess decides to do output | |
793 immediately after the query, its output will be taken as the | |
65199
23741bfb23af
(shell-mode, shell-resync-dirs): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
64762
diff
changeset
|
794 new directory stack -- you lose. If this happens, just do the |
114 | 795 command again." |
796 (interactive) | |
797 (let* ((proc (get-buffer-process (current-buffer))) | |
798 (pmark (process-mark proc))) | |
799 (goto-char pmark) | |
65573
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
800 ;; If the process echoes commands, don't insert a fake command in |
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
801 ;; the buffer or it will appear twice. |
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
802 (unless comint-process-echoes |
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
803 (insert shell-dirstack-query) (insert "\n")) |
114 | 804 (sit-for 0) ; force redisplay |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
805 (comint-send-string proc shell-dirstack-query) |
114 | 806 (comint-send-string proc "\n") |
807 (set-marker pmark (point)) | |
65573
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
808 (let ((pt (point)) |
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
809 (regexp |
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
810 (concat |
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
811 (if comint-process-echoes |
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
812 ;; Skip command echo if the process echoes |
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
813 (concat "\\(" (regexp-quote shell-dirstack-query) "\n\\)") |
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
814 "\\(\\)") |
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
815 "\\(.+\n\\)"))) |
114 | 816 ;; This extra newline prevents the user's pending input from spoofing us. |
817 (insert "\n") (backward-char 1) | |
65573
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
818 ;; Wait for one line. |
eadf85208391
(shell-resync-dirs): Handle echoing processes more reliably. Don't
Romain Francoise <romain@orebokech.com>
parents:
65199
diff
changeset
|
819 (while (not (looking-at regexp)) |
114 | 820 (accept-process-output proc) |
821 (goto-char pt))) | |
822 (goto-char pmark) (delete-char 1) ; remove the extra newline | |
823 ;; That's the dirlist. grab it & parse it. | |
51519
9933cebac174
(shell-resync-dirs): Tolerate an extra line of output before the list of
Juanma Barranquero <lekktu@gmail.com>
parents:
51482
diff
changeset
|
824 (let* ((dl (buffer-substring (match-beginning 2) (1- (match-end 2)))) |
114 | 825 (dl-len (length dl)) |
826 (ds '()) ; new dir stack | |
827 (i 0)) | |
828 (while (< i dl-len) | |
829 ;; regexp = optional whitespace, (non-whitespace), optional whitespace | |
830 (string-match "\\s *\\(\\S +\\)\\s *" dl i) ; pick off next dir | |
5474
239620e1795d
(shell-cd): Function removed.
Roland McGrath <roland@gnu.org>
parents:
5335
diff
changeset
|
831 (setq ds (cons (concat comint-file-name-prefix |
239620e1795d
(shell-cd): Function removed.
Roland McGrath <roland@gnu.org>
parents:
5335
diff
changeset
|
832 (substring dl (match-beginning 1) |
239620e1795d
(shell-cd): Function removed.
Roland McGrath <roland@gnu.org>
parents:
5335
diff
changeset
|
833 (match-end 1))) |
114 | 834 ds)) |
835 (setq i (match-end 0))) | |
5474
239620e1795d
(shell-cd): Function removed.
Roland McGrath <roland@gnu.org>
parents:
5335
diff
changeset
|
836 (let ((ds (nreverse ds))) |
114 | 837 (condition-case nil |
10791
1d1db37a4bb7
Change all `cd's to `shell-cd's, where `shell-cd' changes the value of
Simon Marshall <simon@gnu.org>
parents:
10657
diff
changeset
|
838 (progn (shell-cd (car ds)) |
14476
63540fa43674
Resync directories properly for the ksh.
Simon Marshall <simon@gnu.org>
parents:
14329
diff
changeset
|
839 (setq shell-dirstack (cdr ds) |
63540fa43674
Resync directories properly for the ksh.
Simon Marshall <simon@gnu.org>
parents:
14329
diff
changeset
|
840 shell-last-dir (car shell-dirstack)) |
114 | 841 (shell-dirstack-message)) |
38409
153f1b1f2efd
Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents:
35659
diff
changeset
|
842 (error (message "Couldn't cd"))))))) |
114 | 843 |
844 ;;; For your typing convenience: | |
2571
b65cf676a09b
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2557
diff
changeset
|
845 (defalias 'dirs 'shell-resync-dirs) |
114 | 846 |
847 | |
848 ;;; Show the current dirstack on the message line. | |
849 ;;; Pretty up dirs a bit by changing "/usr/jqr/foo" to "~/foo". | |
850 ;;; (This isn't necessary if the dirlisting is generated with a simple "dirs".) | |
851 ;;; All the commands that mung the buffer's dirstack finish by calling | |
852 ;;; this guy. | |
853 (defun shell-dirstack-message () | |
24069
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
854 (when shell-dirtrack-verbose |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
855 (let* ((msg "") |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
856 (ds (cons default-directory shell-dirstack)) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
857 (home (expand-file-name (concat comint-file-name-prefix "~/"))) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
858 (homelen (length home))) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
859 (while ds |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
860 (let ((dir (car ds))) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
861 (and (>= (length dir) homelen) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
862 (string= home (substring dir 0 homelen)) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
863 (setq dir (concat "~/" (substring dir homelen)))) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
864 ;; Strip off comint-file-name-prefix if present. |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
865 (and comint-file-name-prefix |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
866 (>= (length dir) (length comint-file-name-prefix)) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
867 (string= comint-file-name-prefix |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
868 (substring dir 0 (length comint-file-name-prefix))) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
869 (setq dir (substring dir (length comint-file-name-prefix))) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
870 (setcar ds dir)) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
871 (setq msg (concat msg (directory-file-name dir) " ")) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
872 (setq ds (cdr ds)))) |
8d500ceed9d1
* shell.el (shell-dirtrack-verbose): New custom variable.
Simon Marshall <simon@gnu.org>
parents:
23744
diff
changeset
|
873 (message "%s" msg)))) |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
874 |
19476
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
875 ;; This was mostly copied from shell-resync-dirs. |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
876 (defun shell-snarf-envar (var) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
877 "Return as a string the shell's value of environment variable VAR." |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
878 (let* ((cmd (format "printenv '%s'\n" var)) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
879 (proc (get-buffer-process (current-buffer))) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
880 (pmark (process-mark proc))) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
881 (goto-char pmark) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
882 (insert cmd) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
883 (sit-for 0) ; force redisplay |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
884 (comint-send-string proc cmd) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
885 (set-marker pmark (point)) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
886 (let ((pt (point))) ; wait for 1 line |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
887 ;; This extra newline prevents the user's pending input from spoofing us. |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
888 (insert "\n") (backward-char 1) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
889 (while (not (looking-at ".+\n")) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
890 (accept-process-output proc) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
891 (goto-char pt))) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
892 (goto-char pmark) (delete-char 1) ; remove the extra newline |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
893 (buffer-substring (match-beginning 0) (1- (match-end 0))))) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
894 |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
895 (defun shell-copy-environment-variable (variable) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
896 "Copy the environment variable VARIABLE from the subshell to Emacs. |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
897 This command reads the value of the specified environment variable |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
898 in the shell, and sets the same environment variable in Emacs |
22636
f15c3c6ad8ae
(shell-copy-environment-variable): Fix doc typo.
Richard M. Stallman <rms@gnu.org>
parents:
21621
diff
changeset
|
899 \(what `getenv' in Emacs would return) to that value. |
19476
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
900 That value will affect any new subprocesses that you subsequently start |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
901 from Emacs." |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
902 (interactive (list (read-envvar-name "\ |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
903 Copy Shell environment variable to Emacs: "))) |
4ae9466b064e
(shell-snarf-envar, shell-copy-environment-variable): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
19469
diff
changeset
|
904 (setenv variable (shell-snarf-envar variable))) |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
905 |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
906 (defun shell-forward-command (&optional arg) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
907 "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
|
908 See `shell-command-regexp'." |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
909 (interactive "p") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
910 (let ((limit (save-excursion (end-of-line nil) (point)))) |
7377
027616e7b1e4
(shell-forward-command, shell-backward-command): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents:
7083
diff
changeset
|
911 (if (re-search-forward (concat shell-command-regexp "\\([;&|][\t ]*\\)+") |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
912 limit 'move arg) |
5335
abf0d4d01681
(shell-backward-command): If comint-bol moves forward,
Richard M. Stallman <rms@gnu.org>
parents:
5285
diff
changeset
|
913 (skip-syntax-backward " ")))) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
914 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
915 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
916 (defun shell-backward-command (&optional arg) |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
917 "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
|
918 See `shell-command-regexp'." |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
919 (interactive "p") |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
920 (let ((limit (save-excursion (comint-bol nil) (point)))) |
30641
297909766bad
(shell-prompt-pattern): Doc change.
Miles Bader <miles@gnu.org>
parents:
25278
diff
changeset
|
921 (when (> limit (point)) |
297909766bad
(shell-prompt-pattern): Doc change.
Miles Bader <miles@gnu.org>
parents:
25278
diff
changeset
|
922 (setq limit (line-beginning-position))) |
5335
abf0d4d01681
(shell-backward-command): If comint-bol moves forward,
Richard M. Stallman <rms@gnu.org>
parents:
5285
diff
changeset
|
923 (skip-syntax-backward " " limit) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
924 (if (re-search-backward |
7377
027616e7b1e4
(shell-forward-command, shell-backward-command): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents:
7083
diff
changeset
|
925 (format "[;&|]+[\t ]*\\(%s\\)" shell-command-regexp) limit 'move arg) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
926 (progn (goto-char (match-beginning 1)) |
5335
abf0d4d01681
(shell-backward-command): If comint-bol moves forward,
Richard M. Stallman <rms@gnu.org>
parents:
5285
diff
changeset
|
927 (skip-chars-forward ";&|"))))) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
928 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
929 (defun shell-dynamic-complete-command () |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
930 "Dynamically complete the command at point. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
931 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
|
932 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
|
933 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
|
934 path. |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
935 |
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
936 Completion is dependent on the value of `shell-completion-execonly', plus |
6186
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
937 those that effect file completion. See `shell-dynamic-complete-as-command'. |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
938 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
939 Returns t if successful." |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
940 (interactive) |
6186
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
941 (let ((filename (comint-match-partial-filename))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
942 (if (and filename |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
943 (save-match-data (not (string-match "[~/]" filename))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
944 (eq (match-beginning 0) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
945 (save-excursion (shell-backward-command 1) (point)))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
946 (prog2 (message "Completing command name...") |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
947 (shell-dynamic-complete-as-command))))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
948 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
949 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
950 (defun shell-dynamic-complete-as-command () |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
951 "Dynamically complete at point as a command. |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
952 See `shell-dynamic-complete-filename'. Returns t if successful." |
6508
965beb0c97d2
(shell-strip-ctrl-m): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6295
diff
changeset
|
953 (let* ((filename (or (comint-match-partial-filename) "")) |
53402
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
954 (filenondir (file-name-nondirectory filename)) |
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
955 (path-dirs (cdr (reverse exec-path))) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
956 (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
|
957 (ignored-extensions |
6295
59a6684e8057
(shell-dynamic-complete-as-command): Make ignored-extensions
Richard M. Stallman <rms@gnu.org>
parents:
6255
diff
changeset
|
958 (and comint-completion-fignore |
59a6684e8057
(shell-dynamic-complete-as-command): Make ignored-extensions
Richard M. Stallman <rms@gnu.org>
parents:
6255
diff
changeset
|
959 (mapconcat (function (lambda (x) (concat (regexp-quote x) "$"))) |
59a6684e8057
(shell-dynamic-complete-as-command): Make ignored-extensions
Richard M. Stallman <rms@gnu.org>
parents:
6255
diff
changeset
|
960 comint-completion-fignore "\\|"))) |
63507
e5299a8016cb
(shell-prompt-pattern, shell-dynamic-complete-functions, shell-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
62402
diff
changeset
|
961 (dir "") (comps-in-dir ()) |
53402
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
962 (file "") (abs-file-name "") (completions ())) |
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
963 ;; Go thru each dir in the search path, finding completions. |
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
964 (while path-dirs |
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
965 (setq dir (file-name-as-directory (comint-directory (or (car path-dirs) "."))) |
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
966 comps-in-dir (and (file-accessible-directory-p dir) |
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
967 (file-name-all-completions filenondir dir))) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
968 ;; Go thru each completion found, to see whether it should be used. |
53402
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
969 (while comps-in-dir |
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
970 (setq file (car comps-in-dir) |
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
971 abs-file-name (concat dir file)) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
972 (if (and (not (member file completions)) |
6885
3c007de39916
(shell-dynamic-complete-as-command): Don't match ignored-extensions if it's nil.
Karl Heuer <kwzh@gnu.org>
parents:
6508
diff
changeset
|
973 (not (and ignored-extensions |
3c007de39916
(shell-dynamic-complete-as-command): Don't match ignored-extensions if it's nil.
Karl Heuer <kwzh@gnu.org>
parents:
6508
diff
changeset
|
974 (string-match ignored-extensions file))) |
53402
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
975 (or (string-equal dir cwd) |
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
976 (not (file-directory-p abs-file-name))) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
977 (or (null shell-completion-execonly) |
53402
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
978 (file-executable-p abs-file-name))) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
979 (setq completions (cons file completions))) |
53402
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
980 (setq comps-in-dir (cdr comps-in-dir))) |
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
981 (setq path-dirs (cdr path-dirs))) |
4871
30a614eb52f7
(shell-after-partial-filename): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
4679
diff
changeset
|
982 ;; OK, we've got a list of completions. |
6508
965beb0c97d2
(shell-strip-ctrl-m): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6295
diff
changeset
|
983 (let ((success (let ((comint-completion-addsuffix nil)) |
53402
7e645ea92195
(shell-file-name-chars): Add [].
Richard M. Stallman <rms@gnu.org>
parents:
53273
diff
changeset
|
984 (comint-dynamic-simple-complete filenondir completions)))) |
6508
965beb0c97d2
(shell-strip-ctrl-m): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6295
diff
changeset
|
985 (if (and (memq success '(sole shortest)) comint-completion-addsuffix |
965beb0c97d2
(shell-strip-ctrl-m): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6295
diff
changeset
|
986 (not (file-directory-p (comint-match-partial-filename)))) |
965beb0c97d2
(shell-strip-ctrl-m): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6295
diff
changeset
|
987 (insert " ")) |
965beb0c97d2
(shell-strip-ctrl-m): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6295
diff
changeset
|
988 success))) |
6186
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
989 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
990 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
991 (defun shell-match-partial-variable () |
15327
2c508f2c884d
(shell-match-partial-variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14476
diff
changeset
|
992 "Return the shell variable at point, or nil if none is found." |
6186
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
993 (save-excursion |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
994 (let ((limit (point))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
995 (if (re-search-backward "[^A-Za-z0-9_{}]" nil 'move) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
996 (or (looking-at "\\$") (forward-char 1))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
997 ;; Anchor the search forwards. |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
998 (if (or (eolp) (looking-at "[^A-Za-z0-9_{}$]")) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
999 nil |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1000 (re-search-forward "\\$?{?[A-Za-z0-9_]*}?" limit) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1001 (buffer-substring (match-beginning 0) (match-end 0)))))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1002 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1003 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1004 (defun shell-dynamic-complete-environment-variable () |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1005 "Dynamically complete the environment variable at point. |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1006 Completes if after a variable, i.e., if it starts with a \"$\". |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1007 See `shell-dynamic-complete-as-environment-variable'. |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1008 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1009 This function is similar to `comint-dynamic-complete-filename', except that it |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1010 searches `process-environment' for completion candidates. Note that this may |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1011 not be the same as the interpreter's idea of variable names. The main problem |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1012 with this type of completion is that `process-environment' is the environment |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1013 which Emacs started with. Emacs does not track changes to the environment made |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1014 by the interpreter. Perhaps it would be more accurate if this function was |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1015 called `shell-dynamic-complete-process-environment-variable'. |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1016 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1017 Returns non-nil if successful." |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1018 (interactive) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1019 (let ((variable (shell-match-partial-variable))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1020 (if (and variable (string-match "^\\$" variable)) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1021 (prog2 (message "Completing variable name...") |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1022 (shell-dynamic-complete-as-environment-variable))))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1023 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1024 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1025 (defun shell-dynamic-complete-as-environment-variable () |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1026 "Dynamically complete at point as an environment variable. |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1027 Used by `shell-dynamic-complete-environment-variable'. |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1028 Uses `comint-dynamic-simple-complete'." |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1029 (let* ((var (or (shell-match-partial-variable) "")) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1030 (variable (substring var (or (string-match "[^$({]\\|$" var) 0))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1031 (variables (mapcar (function (lambda (x) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1032 (substring x 0 (string-match "=" x)))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1033 process-environment)) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1034 (addsuffix comint-completion-addsuffix) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1035 (comint-completion-addsuffix nil) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1036 (success (comint-dynamic-simple-complete variable variables))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1037 (if (memq success '(sole shortest)) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1038 (let* ((var (shell-match-partial-variable)) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1039 (variable (substring var (string-match "[^$({]" var))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1040 (protection (cond ((string-match "{" var) "}") |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1041 ((string-match "(" var) ")") |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1042 (t ""))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1043 (suffix (cond ((null addsuffix) "") |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1044 ((file-directory-p |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1045 (comint-directory (getenv variable))) "/") |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1046 (t " ")))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1047 (insert protection suffix))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1048 success)) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1049 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1050 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1051 (defun shell-replace-by-expanded-directory () |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1052 "Expand directory stack reference before point. |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1053 Directory stack references are of the form \"=digit\" or \"=-\". |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1054 See `default-directory' and `shell-dirstack'. |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1055 |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1056 Returns t if successful." |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1057 (interactive) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1058 (if (comint-match-partial-filename) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1059 (save-excursion |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1060 (goto-char (match-beginning 0)) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1061 (let ((stack (cons default-directory shell-dirstack)) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1062 (index (cond ((looking-at "=-/?") |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1063 (length shell-dirstack)) |
45214
793403e94381
(shell-replace-by-expanded-directory):
Richard M. Stallman <rms@gnu.org>
parents:
44374
diff
changeset
|
1064 ((looking-at "=\\([0-9]+\\)/?") |
6186
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1065 (string-to-number |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1066 (buffer-substring |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1067 (match-beginning 1) (match-end 1))))))) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1068 (cond ((null index) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1069 nil) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1070 ((>= index (length stack)) |
38409
153f1b1f2efd
Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents:
35659
diff
changeset
|
1071 (error "Directory stack not that deep")) |
6186
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1072 (t |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1073 (replace-match (file-name-as-directory (nth index stack)) t t) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1074 (message "Directory item: %d" index) |
84df7a6f6240
(shell-dynamic-complete-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6155
diff
changeset
|
1075 t)))))) |
35659
aa45cec8f927
shell-write-history-on-exit: make sure the error message goes to the right buffer
Sam Steingold <sds@gnu.org>
parents:
35643
diff
changeset
|
1076 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
1077 (provide 'shell) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
1078 |
52401 | 1079 ;;; arch-tag: bcb5f12a-c1f4-4aea-a809-2504bd5bd797 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
252
diff
changeset
|
1080 ;;; shell.el ends here |