Mercurial > emacs
annotate lisp/comint.el @ 110534:826d60163924
Merge changes from emacs-23 branch.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Thu, 23 Sep 2010 22:10:54 -0400 |
parents | 2c341056a7ec |
children | 515d80e174ba |
rev | line source |
---|---|
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
638
diff
changeset
|
1 ;;; comint.el --- general command interpreter in a window stuff |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
2 |
110496 | 3 ;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, |
4 ;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, | |
5 ;; 2010 Free Software Foundation, Inc. | |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
638
diff
changeset
|
6 |
38409
153f1b1f2efd
Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents:
38073
diff
changeset
|
7 ;; Author: Olin Shivers <shivers@cs.cmu.edu> |
25278 | 8 ;; Simon Marshall <simon@gnu.org> |
18805 | 9 ;; Maintainer: FSF |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2025
diff
changeset
|
10 ;; Keywords: processes |
110015
280c8ae2476d
Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents:
109658
diff
changeset
|
11 ;; Package: emacs |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
811
diff
changeset
|
12 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
13 ;; This file is part of GNU Emacs. |
114 | 14 |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93134
diff
changeset
|
15 ;; GNU Emacs is free software: you can redistribute it and/or modify |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
16 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93134
diff
changeset
|
17 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93134
diff
changeset
|
18 ;; (at your option) any later version. |
114 | 19 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
20 ;; GNU Emacs is distributed in the hope that it will be useful, |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
21 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
23 ;; GNU General Public License for more details. |
114 | 24 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
25 ;; You should have received a copy of the GNU General Public License |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93134
diff
changeset
|
26 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
114 | 27 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
793
diff
changeset
|
28 ;;; Commentary: |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
793
diff
changeset
|
29 |
14169 | 30 ;; This file defines a general command-interpreter-in-a-buffer package |
54879 | 31 ;; (comint mode). The idea is that you can build specific process-in-a-buffer |
32 ;; modes on top of comint mode -- e.g., Lisp, shell, scheme, T, soar, .... | |
32326 | 33 ;; This way, all these specific packages share a common base functionality, |
14169 | 34 ;; and a common set of bindings, which makes them easier to use (and |
35 ;; saves code, implementation time, etc., etc.). | |
114 | 36 |
14169 | 37 ;; Several packages are already defined using comint mode: |
38 ;; - shell.el defines a shell-in-a-buffer mode. | |
39 ;; - cmulisp.el defines a simple lisp-in-a-buffer mode. | |
40 ;; | |
41 ;; - The file cmuscheme.el defines a scheme-in-a-buffer mode. | |
42 ;; - The file tea.el tunes scheme and inferior-scheme modes for T. | |
54879 | 43 ;; - The file soar.el tunes Lisp and inferior-lisp modes for Soar. |
44 ;; - cmutex.el defines TeX and LaTeX modes that invoke TeX, LaTeX, BibTeX, | |
45 ;; previewers, and printers from within Emacs. | |
46 ;; - background.el allows csh-like job control inside Emacs. | |
14169 | 47 ;; It is pretty easy to make new derived modes for other processes. |
584 | 48 |
54879 | 49 ;; For documentation on the functionality provided by Comint mode, and |
14169 | 50 ;; the hooks available for customising it, see the comments below. |
32326 | 51 ;; For further information on the standard derived modes (shell, |
14169 | 52 ;; inferior-lisp, inferior-scheme, ...), see the relevant source files. |
114 | 53 |
14169 | 54 ;; For hints on converting existing process modes (e.g., tex-mode, |
55 ;; background, dbx, gdb, kermit, prolog, telnet) to use comint-mode | |
56 ;; instead of shell-mode, see the notes at the end of this file. | |
114 | 57 |
58 | |
14169 | 59 ;; Brief Command Documentation: |
60 ;;============================================================================ | |
61 ;; Comint Mode Commands: (common to all derived modes, like shell & cmulisp | |
62 ;; mode) | |
63 ;; | |
54879 | 64 ;; M-p comint-previous-input Cycle backwards in input history |
65 ;; M-n comint-next-input Cycle forwards | |
106326
b7dca98d92a9
(comint-mode-map): Rebind `M-r' from
Juri Linkov <juri@jurta.org>
parents:
106206
diff
changeset
|
66 ;; M-r comint-history-isearch-backward-regexp Isearch input regexp backward |
54879 | 67 ;; M-C-l comint-show-output Show last batch of process output |
68 ;; RET comint-send-input | |
69 ;; C-d comint-delchar-or-maybe-eof Delete char unless at end of buff | |
70 ;; C-c C-a comint-bol-or-process-mark First time, move point to bol; | |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
71 ;; second time, move to process-mark. |
54879 | 72 ;; C-c C-u comint-kill-input ^u |
73 ;; C-c C-w backward-kill-word ^w | |
74 ;; C-c C-c comint-interrupt-subjob ^c | |
75 ;; C-c C-z comint-stop-subjob ^z | |
76 ;; C-c C-\ comint-quit-subjob ^\ | |
77 ;; C-c C-o comint-delete-output Delete last batch of process output | |
78 ;; C-c C-r comint-show-output Show last batch of process output | |
79 ;; C-c C-l comint-dynamic-list-input-ring List input history | |
14169 | 80 ;; |
81 ;; Not bound by default in comint-mode (some are in shell mode) | |
82 ;; comint-run Run a program under comint-mode | |
83 ;; send-invisible Read a line w/o echo, and send to proc | |
84 ;; comint-dynamic-complete-filename Complete filename at point. | |
85 ;; comint-dynamic-list-filename-completions List completions in help buffer. | |
86 ;; comint-replace-by-expanded-filename Expand and complete filename at point; | |
87 ;; replace with expanded/completed name. | |
88 ;; comint-replace-by-expanded-history Expand history at point; | |
89 ;; replace with expanded name. | |
90 ;; comint-magic-space Expand history and add (a) space(s). | |
91 ;; comint-kill-subjob No mercy. | |
92 ;; comint-show-maximum-output Show as much output as possible. | |
93 ;; comint-continue-subjob Send CONT signal to buffer's process | |
54879 | 94 ;; group. Useful if you accidentally |
14169 | 95 ;; suspend your process (with C-c C-z). |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
96 ;; comint-get-next-from-history Fetch successive input history lines |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
97 ;; comint-accumulate Combine lines to send them together |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
98 ;; as input. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
99 ;; comint-goto-process-mark Move point to where process-mark is. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
100 ;; comint-set-process-mark Set process-mark to point. |
114 | 101 |
54879 | 102 ;; comint-mode-hook is the Comint mode hook. Basically for your keybindings. |
584 | 103 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
793
diff
changeset
|
104 ;;; Code: |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
793
diff
changeset
|
105 |
1131 | 106 (require 'ring) |
114 | 107 |
14169 | 108 ;; Buffer Local Variables: |
109 ;;============================================================================ | |
110 ;; Comint mode buffer local variables: | |
32326 | 111 ;; comint-prompt-regexp string comint-bol uses to match prompt |
15654
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
112 ;; comint-delimiter-argument-list list For delimiters and arguments |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
113 ;; comint-last-input-start marker Handy if inferior always echoes |
32613
6aece997f0f9
(comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents:
32598
diff
changeset
|
114 ;; comint-last-input-end marker For comint-delete-output command |
15654
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
115 ;; comint-input-ring-size integer For the input history |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
116 ;; comint-input-ring ring mechanism |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
117 ;; comint-input-ring-index number ... |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
118 ;; comint-save-input-ring-index number ... |
15654
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
119 ;; comint-input-autoexpand symbol ... |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
120 ;; comint-input-ignoredups boolean ... |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
121 ;; comint-dynamic-complete-functions hook For the completion mechanism |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
122 ;; comint-completion-fignore list ... |
15817
9e94b5fdaab1
(comint-file-name-chars): Was comint-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
15727
diff
changeset
|
123 ;; comint-file-name-chars string ... |
15654
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
124 ;; comint-file-name-quote-list list ... |
32326 | 125 ;; comint-get-old-input function Hooks for specific |
15654
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
126 ;; comint-input-filter-functions hook process-in-a-buffer |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
127 ;; comint-output-filter-functions hook function modes. |
19515
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
128 ;; comint-preoutput-filter-functions hook |
15654
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
129 ;; comint-input-filter function ... |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
130 ;; comint-input-sender function ... |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
131 ;; comint-eol-on-send boolean ... |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
132 ;; comint-process-echoes boolean ... |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
133 ;; comint-scroll-to-bottom-on-input symbol For scroll behavior |
74693 | 134 ;; comint-move-point-for-output symbol ... |
32326 | 135 ;; comint-scroll-show-maximum-output boolean ... |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
136 ;; comint-accum-marker maker For comint-accumulate |
14169 | 137 ;; |
138 ;; Comint mode non-buffer local variables: | |
15654
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
139 ;; comint-completion-addsuffix boolean/cons For file name |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
140 ;; comint-completion-autolist boolean completion behavior |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
141 ;; comint-completion-recexact boolean ... |
114 | 142 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
143 (defgroup comint nil |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
144 "General command interpreter in a window stuff." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
145 :group 'processes) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
146 |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
147 (defgroup comint-completion nil |
64000
e1ccb8b46dea
(comint-completion, comint-source): Finsh `degroup' descriptions with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63813
diff
changeset
|
148 "Completion facilities in comint." |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
149 :group 'comint) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
150 |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
151 (defgroup comint-source nil |
64000
e1ccb8b46dea
(comint-completion, comint-source): Finsh `degroup' descriptions with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63813
diff
changeset
|
152 "Source finding facilities in comint." |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
153 :prefix "comint-" |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
154 :group 'comint) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
155 |
584 | 156 (defvar comint-prompt-regexp "^" |
63502
f0f76b7d0f74
(comint-replace-by-expanded-filename, comint-prompt-regexp,
Juanma Barranquero <lekktu@gmail.com>
parents:
63175
diff
changeset
|
157 "Regexp to recognize prompts in the inferior process. |
584 | 158 Defaults to \"^\", the null string at BOL. |
114 | 159 |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
160 This variable is only used if the variable |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
161 `comint-use-prompt-regexp' is non-nil. |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
162 |
114 | 163 Good choices: |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
164 Canonical Lisp: \"^[^> \\n]*>+:? *\" (Lucid, franz, kcl, T, cscheme, oaklisp) |
3985
fc25d1816641
* comint.el (comint-prompt-regexp): Double the backslashes in the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
165 Lucid Common Lisp: \"^\\\\(>\\\\|\\\\(->\\\\)+\\\\) *\" |
fc25d1816641
* comint.el (comint-prompt-regexp): Double the backslashes in the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
166 franz: \"^\\\\(->\\\\|<[0-9]*>:\\\\) *\" |
584 | 167 kcl: \"^>+ *\" |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
168 shell: \"^[^#$%>\\n]*[#$%>] *\" |
584 | 169 T: \"^>+ *\" |
114 | 170 |
584 | 171 This is a good thing to set in mode hooks.") |
114 | 172 |
55223
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
173 (defcustom comint-prompt-read-only nil |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
174 "If non-nil, the comint prompt is read only. |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
175 The read only region includes the newline before the prompt. |
55223
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
176 This does not affect existing prompts. |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
177 Certain derived modes may override this option. |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
178 |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
179 If you set this option to t, then the safe way to temporarily |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
180 override the read-only-ness of comint prompts is to call |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
181 `comint-kill-whole-line' or `comint-kill-region' with no |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
182 narrowing in effect. This way you will be certain that none of |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
183 the remaining prompts will be accidentally messed up. You may |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
184 wish to put something like the following in your `.emacs' file: |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
185 |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
186 \(add-hook 'comint-mode-hook |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
187 (lambda () |
61302
aedce81482bf
(comint-prompt-read-only): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
60898
diff
changeset
|
188 (define-key comint-mode-map \"\\C-w\" 'comint-kill-region) |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
189 (define-key comint-mode-map [C-S-backspace] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
190 'comint-kill-whole-line))) |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
191 |
61368
015e8d66f6a0
(comint-prompt-read-only): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61302
diff
changeset
|
192 If you sometimes use comint-mode on text-only terminals or with `emacs -nw', |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
193 you might wish to use another binding for `comint-kill-whole-line'." |
55223
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
194 :type 'boolean |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
195 :group 'comint |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59776
diff
changeset
|
196 :version "22.1") |
55223
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
197 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
198 (defvar comint-delimiter-argument-list () |
63502
f0f76b7d0f74
(comint-replace-by-expanded-filename, comint-prompt-regexp,
Juanma Barranquero <lekktu@gmail.com>
parents:
63175
diff
changeset
|
199 "List of characters to recognize as separate arguments in input. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
200 Strings comprising a character in this list will separate the arguments |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
201 surrounding them, and also be regarded as arguments in their own right (unlike |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
202 whitespace). See `comint-arguments'. |
6154
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
203 Defaults to the empty list. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
204 |
6154
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
205 For shells, a good value is (?\\| ?& ?< ?> ?\\( ?\\) ?;). |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
206 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
207 This is a good thing to set in mode hooks.") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
208 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
209 (defcustom comint-input-autoexpand nil |
100171 | 210 "If non-nil, expand input command history references on completion. |
54879 | 211 This mirrors the optional behavior of tcsh (its autoexpand and histlist). |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
212 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
213 If the value is `input', then the expansion is seen on input. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
214 If the value is `history', then the expansion is only when inserting |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
215 into the buffer's input ring. See also `comint-magic-space' and |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
216 `comint-dynamic-complete'. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
217 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
218 This variable is buffer-local." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
219 :type '(choice (const :tag "off" nil) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
220 (const input) |
22569
b5923f76f35b
(comint-input-autoexpand): Use `other' widget type.
Andreas Schwab <schwab@suse.de>
parents:
22272
diff
changeset
|
221 (const history) |
b5923f76f35b
(comint-input-autoexpand): Use `other' widget type.
Andreas Schwab <schwab@suse.de>
parents:
22272
diff
changeset
|
222 (other :tag "on" t)) |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
223 :group 'comint) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
224 |
42450
c32f238e8a16
(comint-highlight-input): Use :weight, not :bold.
Richard M. Stallman <rms@gnu.org>
parents:
42341
diff
changeset
|
225 (defface comint-highlight-input '((t (:weight bold))) |
45727
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
226 "Face to use to highlight user input." |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
227 :group 'comint) |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
228 |
32743
fd31939b0747
(comint-highlight-input, comint-highlight-prompt):
Miles Bader <miles@gnu.org>
parents:
32635
diff
changeset
|
229 (defface comint-highlight-prompt |
61404
f6ddc48bc826
(comint-highlight-prompt): Fix face spec.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61396
diff
changeset
|
230 '((((min-colors 88) (background dark)) (:foreground "cyan1")) |
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61368
diff
changeset
|
231 (((background dark)) (:foreground "cyan")) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
232 (t (:foreground "dark blue"))) |
45727
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
233 "Face to use to highlight prompts." |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
234 :group 'comint) |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
235 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
236 (defcustom comint-input-ignoredups nil |
100171 | 237 "If non-nil, don't add input matching the last on the input ring. |
4923
63aed739d09d
(comint-postoutput-scroll-to-bottom):
Richard M. Stallman <rms@gnu.org>
parents:
4899
diff
changeset
|
238 This mirrors the optional behavior of bash. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
239 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
240 This variable is buffer-local." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
241 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
242 :group 'comint) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
243 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
244 (defcustom comint-input-ring-file-name nil |
100171 | 245 "If non-nil, name of the file to read/write input history. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
246 See also `comint-read-input-ring' and `comint-write-input-ring'. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
247 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
248 This variable is buffer-local, and is a good thing to set in mode hooks." |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
249 :type '(choice (const :tag "nil" nil) |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
250 file) |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
251 :group 'comint) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
252 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
253 (defcustom comint-scroll-to-bottom-on-input nil |
100171 | 254 "Controls whether input to interpreter causes window to scroll. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
255 If nil, then do not scroll. If t or `all', scroll all windows showing buffer. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
256 If `this', scroll only the selected window. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
257 |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
258 The default is nil. |
4880
a658d0e341b1
(comint-scroll-to-bottom-on-input)
Richard M. Stallman <rms@gnu.org>
parents:
4872
diff
changeset
|
259 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
260 See `comint-preinput-scroll-to-bottom'. This variable is buffer-local." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
261 :type '(choice (const :tag "off" nil) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
262 (const t) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
263 (const all) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
264 (const this)) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
265 :group 'comint) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
266 |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
267 (defcustom comint-move-point-for-output nil |
100171 | 268 "Controls whether interpreter output moves point to the end of the output. |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
269 If nil, then output never moves point to the output. |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
270 (If the output occurs at point, it is inserted before point.) |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
271 If t or `all', move point in all windows showing the buffer. |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
272 If `this', move point only the selected window. |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
273 If `others', move point only in other windows, not in the selected window. |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
274 |
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
275 The default is nil. |
4880
a658d0e341b1
(comint-scroll-to-bottom-on-input)
Richard M. Stallman <rms@gnu.org>
parents:
4872
diff
changeset
|
276 |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
277 See the variable `comint-scroll-show-maximum-output' and the function |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
278 `comint-postoutput-scroll-to-bottom'. |
54879 | 279 This variable is buffer-local in all Comint buffers." |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
280 :type '(choice (const :tag "off" nil) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
281 (const t) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
282 (const all) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
283 (const this) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
284 (const others)) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
285 :group 'comint) |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
286 |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
287 (defvaralias 'comint-scroll-to-bottom-on-output 'comint-move-point-for-output) |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
288 |
43028
5a7c132708d2
(comint-scroll-show-maximum-output): Default is t.
Richard M. Stallman <rms@gnu.org>
parents:
42887
diff
changeset
|
289 (defcustom comint-scroll-show-maximum-output t |
100171 | 290 "Controls how to scroll due to interpreter output. |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
291 This variable applies when point is at the end of the buffer |
52081
5468f0e299c4
(comint-read-noecho): Use `clear-string' instead of `fillarray'.
Juanma Barranquero <lekktu@gmail.com>
parents:
51421
diff
changeset
|
292 \(either because it was originally there, or because |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
293 `comint-move-point-for-output' said to move it there) |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
294 and output from the subprocess is inserted. |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
295 |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
296 Non-nil means scroll so that the window is full of text |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
297 and point is on the last line. A value of nil |
54879 | 298 means don't do anything special--scroll normally. |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
299 |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
300 See also the variable `comint-move-point-for-output' and the function |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
301 `comint-postoutput-scroll-to-bottom'. |
54879 | 302 This variable is buffer-local in all Comint buffers." |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
303 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
304 :group 'comint) |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
305 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
306 (defcustom comint-buffer-maximum-size 1024 |
100171 | 307 "The maximum size in lines for Comint buffers. |
10833
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
308 Comint buffers are truncated from the top to be no greater than this number, if |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
309 the function `comint-truncate-buffer' is on `comint-output-filter-functions'." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
310 :type 'integer |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
311 :group 'comint) |
10833
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
312 |
106690
4d6afab8b7cb
* comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents:
106485
diff
changeset
|
313 (defcustom comint-input-ring-size 500 |
4d6afab8b7cb
* comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents:
106485
diff
changeset
|
314 "Size of the input history ring in `comint-mode'." |
4d6afab8b7cb
* comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents:
106485
diff
changeset
|
315 :type 'integer |
4d6afab8b7cb
* comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents:
106485
diff
changeset
|
316 :group 'comint |
4d6afab8b7cb
* comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents:
106485
diff
changeset
|
317 :version "23.2") |
114 | 318 |
25443
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
319 (defvar comint-input-ring-separator "\n" |
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
320 "Separator between commands in the history file.") |
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
321 |
34977
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
322 (defvar comint-input-history-ignore "^#" |
54879 | 323 "Regexp for history entries that should be ignored when Comint initializes.") |
34977
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
324 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
325 (defcustom comint-process-echoes nil |
100171 | 326 "If non-nil, assume that the subprocess echoes any input. |
2539
577c77cfd199
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
2518
diff
changeset
|
327 If so, delete one copy of the input so that only one copy eventually |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
328 appears in the buffer. |
2539
577c77cfd199
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
2518
diff
changeset
|
329 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
330 This variable is buffer-local." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
331 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
332 :group 'comint) |
2539
577c77cfd199
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
2518
diff
changeset
|
333 |
24471
cddc33d259d4
(comint-password-prompt-regexp): Accept "login password:"
Karl Heuer <kwzh@gnu.org>
parents:
23615
diff
changeset
|
334 ;; AIX puts the name of the person being su'd to in front of the prompt. |
24698
57bcdf84ce42
(comint-password-prompt-regexp): Modified so that it matches the
Joel N. Weber II <devnull@gnu.org>
parents:
24471
diff
changeset
|
335 ;; kinit prints a prompt like `Password for devnull@GNU.ORG: '. |
24719
a0382c9f41ce
(comint-password-prompt-regexp): Modified to match the output of ksu
Joel N. Weber II <devnull@gnu.org>
parents:
24700
diff
changeset
|
336 ;; ksu prints a prompt like `Kerberos password for devnull/root@GNU.ORG: '. |
a0382c9f41ce
(comint-password-prompt-regexp): Modified to match the output of ksu
Joel N. Weber II <devnull@gnu.org>
parents:
24700
diff
changeset
|
337 ;; ssh-add prints a prompt like `Enter passphrase: '. |
78193
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
338 ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '. |
79178
4577723dbc65
Chris Moore <christopher.ian.moore at gmail.com>
Glenn Morris <rgm@gnu.org>
parents:
79062
diff
changeset
|
339 ;; Ubuntu's sudo prompts like `[sudo] password for user:' |
24893
c74f4b5eb657
(comint-password-prompt-regexp): Allow "(again)".
Karl Heuer <kwzh@gnu.org>
parents:
24765
diff
changeset
|
340 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. |
79591
c5f06cb9fa56
(comint-password-prompt-regexp): Match `Enter Password'.
Richard M. Stallman <rms@gnu.org>
parents:
79178
diff
changeset
|
341 ;; Something called "perforce" uses "Enter password:". |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
342 (defcustom comint-password-prompt-regexp |
107824
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
343 (concat |
108969
cdae067c62d3
Fix for comint-password-prompt-regexp (Bug#6367).
Chong Yidong <cyd@stupidchicken.com>
parents:
108716
diff
changeset
|
344 "\\(" |
107824
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
345 (regexp-opt |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
346 '("Enter" "Enter same" "Old" "old" "New" "new" "'s" "login" |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
347 "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad")) |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
348 " +\\)?" |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
349 (regexp-opt |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
350 '("password" "Password" "passphrase" "Passphrase" |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
351 "pass phrase" "Pass phrase")) |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
352 "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\ |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
353 \\(?: for [^:]+\\)?:\\s *\\'") |
100171 | 354 "Regexp matching prompts for passwords in the inferior process. |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
355 This is used by `comint-watch-for-password-prompt'." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
356 :type 'regexp |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
357 :group 'comint) |
8087
c22d7c5168f5
comint-password-prompt-regexp: New variable.
Noah Friedman <friedman@splode.com>
parents:
8060
diff
changeset
|
358 |
14169 | 359 ;; Here are the per-interpreter hooks. |
584 | 360 (defvar comint-get-old-input (function comint-get-old-input-default) |
54879 | 361 "Function that returns old text in Comint mode. |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
362 This function is called when return is typed while the point is in old |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
363 text. It returns the text to be submitted as process input. The |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
364 default is `comint-get-old-input-default', which either grabs the |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
365 current input field or grabs the current line and strips off leading |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
366 text matching `comint-prompt-regexp', depending on the value of |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
367 `comint-use-prompt-regexp'.") |
114 | 368 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
369 (defvar comint-dynamic-complete-functions |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
370 '(comint-replace-by-expanded-history comint-dynamic-complete-filename) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
371 "List of functions called to perform completion. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
372 Functions should return non-nil if completion was performed. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
373 See also `comint-dynamic-complete'. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
374 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
375 This is a good thing to set in mode hooks.") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
376 |
584 | 377 (defvar comint-input-filter |
378 (function (lambda (str) (not (string-match "\\`\\s *\\'" str)))) | |
379 "Predicate for filtering additions to input history. | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
380 Takes one argument, the input. If non-nil, the input may be saved on the input |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
381 history list. Default is to save anything that isn't all whitespace.") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
382 |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
383 (defvar comint-input-filter-functions '() |
57603
bdfa227d18a8
(comint-insert-input): Use @ in `interactive'.
Richard M. Stallman <rms@gnu.org>
parents:
57539
diff
changeset
|
384 "Abnormal hook run before input is sent to the process. |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
385 These functions get one argument, a string containing the text to send.") |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
386 |
61922
073c1d646ae1
(comint-output-filter-functions): Add autoload cookie.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61873
diff
changeset
|
387 ;;;###autoload |
57539
8c6fc4afae74
(comint-output-filter-functions): Add comint-watch-for-password-prompt.
Richard M. Stallman <rms@gnu.org>
parents:
57420
diff
changeset
|
388 (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
389 "Functions to call after output is inserted into the buffer. |
4890
dab300dfe449
(comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
4880
diff
changeset
|
390 One possible function is `comint-postoutput-scroll-to-bottom'. |
15654
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
391 These functions get one argument, a string containing the text as originally |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
392 inserted. Note that this might not be the same as the buffer contents between |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
393 `comint-last-output-start' and the buffer's `process-mark', if other filter |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
394 functions have already modified the buffer. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
395 |
19515
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
396 See also `comint-preoutput-filter-functions'. |
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
397 |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
398 You can use `add-hook' to add functions to this list |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
399 either globally or locally.") |
584 | 400 |
42693
13a21b2786c0
(comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42669
diff
changeset
|
401 (defvar comint-input-sender-no-newline nil |
13a21b2786c0
(comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42669
diff
changeset
|
402 "Non-nil directs the `comint-input-sender' function not to send a newline.") |
13a21b2786c0
(comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42669
diff
changeset
|
403 |
584 | 404 (defvar comint-input-sender (function comint-simple-send) |
405 "Function to actually send to PROCESS the STRING submitted by user. | |
32326 | 406 Usually this is just `comint-simple-send', but if your mode needs to |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
407 massage the input string, put a different function here. |
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
408 `comint-simple-send' just sends the string plus a newline. |
42693
13a21b2786c0
(comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42669
diff
changeset
|
409 \(If `comint-input-sender-no-newline' is non-nil, it omits the newline.) |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
410 This is called from the user command `comint-send-input'.") |
584 | 411 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
412 (defcustom comint-eol-on-send t |
100171 | 413 "Non-nil means go to the end of the line before sending input. |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
414 See `comint-send-input'." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
415 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
416 :group 'comint) |
114 | 417 |
110496 | 418 (define-obsolete-variable-alias 'comint-use-prompt-regexp-instead-of-fields |
419 'comint-use-prompt-regexp "22.1") | |
420 | |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
421 ;; Note: If it is decided to purge comint-prompt-regexp from the source |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
422 ;; entirely, searching for uses of this variable will help to identify |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
423 ;; places that need attention. |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
424 (defcustom comint-use-prompt-regexp nil |
100171 | 425 "If non-nil, use `comint-prompt-regexp' to recognize prompts. |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
426 If nil, then program output and user-input are given different `field' |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
427 properties, which Emacs commands can use to distinguish them (in |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
428 particular, common movement commands such as `beginning-of-line' |
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
429 respect field boundaries in a natural way)." |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
430 :type 'boolean |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
431 :group 'comint) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
432 |
63172
14e29b4d395f
(comint-mode-hook): Do not enable Font Lock by default.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63170
diff
changeset
|
433 (defcustom comint-mode-hook nil |
54879 | 434 "Hook run upon entry to `comint-mode'. |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
435 This is run before the process is cranked up." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
436 :type 'hook |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
437 :group 'comint) |
584 | 438 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
439 (defcustom comint-exec-hook '() |
54879 | 440 "Hook run each time a process is exec'd by `comint-exec'. |
584 | 441 This is called after the process is cranked up. It is useful for things that |
54879 | 442 must be done each time a process is executed in a Comint mode buffer (e.g., |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
443 `(process-kill-without-query)'). In contrast, the `comint-mode-hook' is only |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
444 executed once when the buffer is created." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
445 :type 'hook |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
446 :group 'comint) |
584 | 447 |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
448 (defvar comint-mode-map |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
449 (let ((map (make-sparse-keymap))) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
450 ;; Keys: |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
451 (define-key map "\ep" 'comint-previous-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
452 (define-key map "\en" 'comint-next-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
453 (define-key map [C-up] 'comint-previous-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
454 (define-key map [C-down] 'comint-next-input) |
106326
b7dca98d92a9
(comint-mode-map): Rebind `M-r' from
Juri Linkov <juri@jurta.org>
parents:
106206
diff
changeset
|
455 (define-key map "\er" 'comint-history-isearch-backward-regexp) |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
456 (define-key map [?\C-c ?\M-r] 'comint-previous-matching-input-from-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
457 (define-key map [?\C-c ?\M-s] 'comint-next-matching-input-from-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
458 (define-key map "\e\C-l" 'comint-show-output) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
459 (define-key map "\C-m" 'comint-send-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
460 (define-key map "\C-d" 'comint-delchar-or-maybe-eof) |
79623
4a3bc3d3d492
(comint-mode-map): Explicitly bind `delete' and `kp-delete'
Richard M. Stallman <rms@gnu.org>
parents:
79591
diff
changeset
|
461 ;; The following two are standardly aliased to C-d, |
4a3bc3d3d492
(comint-mode-map): Explicitly bind `delete' and `kp-delete'
Richard M. Stallman <rms@gnu.org>
parents:
79591
diff
changeset
|
462 ;; but they should never do EOF, just delete. |
4a3bc3d3d492
(comint-mode-map): Explicitly bind `delete' and `kp-delete'
Richard M. Stallman <rms@gnu.org>
parents:
79591
diff
changeset
|
463 (define-key map [delete] 'delete-char) |
4a3bc3d3d492
(comint-mode-map): Explicitly bind `delete' and `kp-delete'
Richard M. Stallman <rms@gnu.org>
parents:
79591
diff
changeset
|
464 (define-key map [kp-delete] 'delete-char) |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
465 (define-key map "\C-c " 'comint-accumulate) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
466 (define-key map "\C-c\C-x" 'comint-get-next-from-history) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
467 (define-key map "\C-c\C-a" 'comint-bol-or-process-mark) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
468 (define-key map "\C-c\C-u" 'comint-kill-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
469 (define-key map "\C-c\C-w" 'backward-kill-word) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
470 (define-key map "\C-c\C-c" 'comint-interrupt-subjob) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
471 (define-key map "\C-c\C-z" 'comint-stop-subjob) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
472 (define-key map "\C-c\C-\\" 'comint-quit-subjob) |
70575
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
473 (define-key map "\C-c\C-m" 'comint-copy-old-input) |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
474 (define-key map "\C-c\C-o" 'comint-delete-output) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
475 (define-key map "\C-c\C-r" 'comint-show-output) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
476 (define-key map "\C-c\C-e" 'comint-show-maximum-output) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
477 (define-key map "\C-c\C-l" 'comint-dynamic-list-input-ring) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
478 (define-key map "\C-c\C-n" 'comint-next-prompt) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
479 (define-key map "\C-c\C-p" 'comint-previous-prompt) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
480 (define-key map "\C-c\C-d" 'comint-send-eof) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
481 (define-key map "\C-c\C-s" 'comint-write-output) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
482 (define-key map "\C-c." 'comint-insert-previous-argument) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
483 ;; Mouse Buttons: |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
484 (define-key map [mouse-2] 'comint-insert-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
485 ;; Menu bars: |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
486 ;; completion: |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
487 (define-key map [menu-bar completion] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
488 (cons "Complete" (make-sparse-keymap "Complete"))) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
489 (define-key map [menu-bar completion complete-expand] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
490 '("Expand File Name" . comint-replace-by-expanded-filename)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
491 (define-key map [menu-bar completion complete-listing] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
492 '("File Completion Listing" . comint-dynamic-list-filename-completions)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
493 (define-key map [menu-bar completion complete-file] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
494 '("Complete File Name" . comint-dynamic-complete-filename)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
495 (define-key map [menu-bar completion complete] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
496 '("Complete Before Point" . comint-dynamic-complete)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
497 ;; Input history: |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
498 (define-key map [menu-bar inout] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
499 (cons "In/Out" (make-sparse-keymap "In/Out"))) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
500 (define-key map [menu-bar inout delete-output] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
501 '("Delete Current Output Group" . comint-delete-output)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
502 (define-key map [menu-bar inout append-output-to-file] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
503 '("Append Current Output Group to File" . comint-append-output-to-file)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
504 (define-key map [menu-bar inout write-output] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
505 '("Write Current Output Group to File" . comint-write-output)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
506 (define-key map [menu-bar inout next-prompt] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
507 '("Forward Output Group" . comint-next-prompt)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
508 (define-key map [menu-bar inout previous-prompt] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
509 '("Backward Output Group" . comint-previous-prompt)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
510 (define-key map [menu-bar inout show-maximum-output] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
511 '("Show Maximum Output" . comint-show-maximum-output)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
512 (define-key map [menu-bar inout show-output] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
513 '("Show Current Output Group" . comint-show-output)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
514 (define-key map [menu-bar inout kill-input] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
515 '("Kill Current Input" . comint-kill-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
516 (define-key map [menu-bar inout copy-input] |
70575
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
517 '("Copy Old Input" . comint-copy-old-input)) |
106326
b7dca98d92a9
(comint-mode-map): Rebind `M-r' from
Juri Linkov <juri@jurta.org>
parents:
106206
diff
changeset
|
518 (define-key map [menu-bar inout history-isearch-backward-regexp] |
b7dca98d92a9
(comint-mode-map): Rebind `M-r' from
Juri Linkov <juri@jurta.org>
parents:
106206
diff
changeset
|
519 '("Isearch Input Regexp Backward..." . comint-history-isearch-backward-regexp)) |
b7dca98d92a9
(comint-mode-map): Rebind `M-r' from
Juri Linkov <juri@jurta.org>
parents:
106206
diff
changeset
|
520 (define-key map [menu-bar inout history-isearch-backward] |
b7dca98d92a9
(comint-mode-map): Rebind `M-r' from
Juri Linkov <juri@jurta.org>
parents:
106206
diff
changeset
|
521 '("Isearch Input String Backward..." . comint-history-isearch-backward)) |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
522 (define-key map [menu-bar inout forward-matching-history] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
523 '("Forward Matching Input..." . comint-forward-matching-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
524 (define-key map [menu-bar inout backward-matching-history] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
525 '("Backward Matching Input..." . comint-backward-matching-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
526 (define-key map [menu-bar inout next-matching-history] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
527 '("Next Matching Input..." . comint-next-matching-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
528 (define-key map [menu-bar inout previous-matching-history] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
529 '("Previous Matching Input..." . comint-previous-matching-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
530 (define-key map [menu-bar inout next-matching-history-from-input] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
531 '("Next Matching Current Input" . comint-next-matching-input-from-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
532 (define-key map [menu-bar inout previous-matching-history-from-input] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
533 '("Previous Matching Current Input" . comint-previous-matching-input-from-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
534 (define-key map [menu-bar inout next-history] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
535 '("Next Input" . comint-next-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
536 (define-key map [menu-bar inout previous-history] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
537 '("Previous Input" . comint-previous-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
538 (define-key map [menu-bar inout list-history] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
539 '("List Input History" . comint-dynamic-list-input-ring)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
540 (define-key map [menu-bar inout expand-history] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
541 '("Expand History Before Point" . comint-replace-by-expanded-history)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
542 ;; Signals |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
543 (let ((signals-map (make-sparse-keymap "Signals"))) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
544 (define-key map [menu-bar signals] (cons "Signals" signals-map)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
545 (define-key signals-map [eof] '("EOF" . comint-send-eof)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
546 (define-key signals-map [kill] '("KILL" . comint-kill-subjob)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
547 (define-key signals-map [quit] '("QUIT" . comint-quit-subjob)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
548 (define-key signals-map [cont] '("CONT" . comint-continue-subjob)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
549 (define-key signals-map [stop] '("STOP" . comint-stop-subjob)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
550 (define-key signals-map [break] '("BREAK" . comint-interrupt-subjob))) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
551 ;; Put them in the menu bar: |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
552 (setq menu-bar-final-items (append '(completion inout signals) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
553 menu-bar-final-items)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
554 map)) |
114 | 555 |
54879 | 556 ;; Fixme: Is this still relevant? |
1131 | 557 (defvar comint-ptyp t |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
558 "Non-nil if communications via pty; false if by pipe. Buffer local. |
13971
49207f2e2130
(comint-ptyp, comint-completion-autolist): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
13702
diff
changeset
|
559 This is to work around a bug in Emacs process signaling.") |
1131 | 560 |
932
a93f0b1ba909
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
925
diff
changeset
|
561 (defvar comint-input-ring nil) |
54879 | 562 (defvar comint-last-input-start nil) |
563 (defvar comint-last-input-end nil) | |
564 (defvar comint-last-output-start nil) | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
565 (defvar comint-input-ring-index nil |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
566 "Index of last matched history element.") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
567 (defvar comint-matching-input-from-input-string "" |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
568 "Input previously used to match input history.") |
100577
0e2212f6d1b0
(comint-save-input-ring-index): Add missing initial value.
Glenn Morris <rgm@gnu.org>
parents:
100171
diff
changeset
|
569 (defvar comint-save-input-ring-index nil |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
570 "Last input ring index which you copied. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
571 This is to support the command \\[comint-get-next-from-history].") |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
572 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
573 (defvar comint-accum-marker nil |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
574 "Non-nil if you are accumulating input lines to send as input together. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
575 The command \\[comint-accumulate] sets this.") |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
576 |
70108
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
577 (defvar comint-stored-incomplete-input nil |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
578 "Stored input for history cycling.") |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
579 |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
580 (put 'comint-replace-by-expanded-history 'menu-enable 'comint-input-autoexpand) |
1131 | 581 (put 'comint-input-ring 'permanent-local t) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
582 (put 'comint-input-ring-index 'permanent-local t) |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
583 (put 'comint-save-input-ring-index 'permanent-local t) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
584 (put 'comint-input-autoexpand 'permanent-local t) |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
585 (put 'comint-input-filter-functions 'permanent-local t) |
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
586 (put 'comint-output-filter-functions 'permanent-local t) |
19515
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
587 (put 'comint-preoutput-filter-functions 'permanent-local t) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
588 (put 'comint-scroll-to-bottom-on-input 'permanent-local t) |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
589 (put 'comint-move-point-for-output 'permanent-local t) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
590 (put 'comint-scroll-show-maximum-output 'permanent-local t) |
1131 | 591 (put 'comint-ptyp 'permanent-local t) |
861
345296f94a1e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
592 |
17652
0d08e67b280f
(comint-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17583
diff
changeset
|
593 (put 'comint-mode 'mode-class 'special) |
0d08e67b280f
(comint-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17583
diff
changeset
|
594 |
31970
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
595 (define-derived-mode comint-mode fundamental-mode "Comint" |
114 | 596 "Major mode for interacting with an inferior interpreter. |
597 Interpreter name is same as buffer name, sans the asterisks. | |
598 Return at end of buffer sends line as input. | |
599 Return not at end copies rest of line to end and sends it. | |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
600 Setting variable `comint-eol-on-send' means jump to the end of the line |
584 | 601 before submitting new input. |
114 | 602 |
63175
b09a11c8c73e
(comint-check-proc, make-comint-in-buffer, comint-source-default): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
63172
diff
changeset
|
603 This mode is customized to create major modes such as Inferior Lisp |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
604 mode, Shell mode, etc. This can be done by setting the hooks |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
605 `comint-input-filter-functions', `comint-input-filter', `comint-input-sender' |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
606 and `comint-get-old-input' to appropriate functions, and the variable |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
607 `comint-prompt-regexp' to the appropriate regular expression. |
114 | 608 |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
609 An input history is maintained of size `comint-input-ring-size', and |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
610 can be accessed with the commands \\[comint-next-input], \\[comint-previous-input], and \\[comint-dynamic-list-input-ring]. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
611 Input ring history expansion can be achieved with the commands |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
612 \\[comint-replace-by-expanded-history] or \\[comint-magic-space]. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
613 Input ring expansion is controlled by the variable `comint-input-autoexpand', |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
614 and addition is controlled by the variable `comint-input-ignoredups'. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
615 |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
616 Commands with no default key bindings include `send-invisible', |
32326 | 617 `comint-dynamic-complete', `comint-dynamic-list-filename-completions', and |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
618 `comint-magic-space'. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
619 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
620 Input to, and output from, the subprocess can cause the window to scroll to |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
621 the end of the buffer. See variables `comint-output-filter-functions', |
19515
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
622 `comint-preoutput-filter-functions', `comint-scroll-to-bottom-on-input', |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
623 and `comint-move-point-for-output'. |
114 | 624 |
625 If you accidentally suspend your process, use \\[comint-continue-subjob] | |
626 to continue it. | |
627 | |
628 \\{comint-mode-map} | |
629 | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
630 Entry to this mode runs the hooks on `comint-mode-hook'." |
7071
058f19d36c07
(comint-mode): Remove space after `:' in mode-line-process.
Richard M. Stallman <rms@gnu.org>
parents:
7048
diff
changeset
|
631 (setq mode-line-process '(":%s")) |
95777
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
632 (set (make-local-variable 'window-point-insertion-type) t) |
41143
f1315eeb4c0b
(comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40828
diff
changeset
|
633 (set (make-local-variable 'comint-last-input-start) (point-min-marker)) |
f1315eeb4c0b
(comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40828
diff
changeset
|
634 (set (make-local-variable 'comint-last-input-end) (point-min-marker)) |
f1315eeb4c0b
(comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40828
diff
changeset
|
635 (set (make-local-variable 'comint-last-output-start) (make-marker)) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
636 (make-local-variable 'comint-last-prompt-overlay) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
637 (make-local-variable 'comint-prompt-regexp) ; Don't set; default |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
638 (make-local-variable 'comint-input-ring-size) ; ...to global val. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
639 (make-local-variable 'comint-input-ring) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
640 (make-local-variable 'comint-input-ring-file-name) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
641 (or (and (boundp 'comint-input-ring) comint-input-ring) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
642 (setq comint-input-ring (make-ring comint-input-ring-size))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
643 (make-local-variable 'comint-input-ring-index) |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
644 (make-local-variable 'comint-save-input-ring-index) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
645 (or (and (boundp 'comint-input-ring-index) comint-input-ring-index) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
646 (setq comint-input-ring-index nil)) |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
647 (or (and (boundp 'comint-save-input-ring-index) comint-save-input-ring-index) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
648 (setq comint-save-input-ring-index nil)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
649 (make-local-variable 'comint-matching-input-from-input-string) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
650 (make-local-variable 'comint-input-autoexpand) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
651 (make-local-variable 'comint-input-ignoredups) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
652 (make-local-variable 'comint-delimiter-argument-list) |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
653 (make-local-variable 'comint-completion-fignore) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
654 (make-local-variable 'comint-get-old-input) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
655 (make-local-variable 'comint-input-filter) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
656 (make-local-variable 'comint-input-sender) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
657 (make-local-variable 'comint-eol-on-send) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
658 (make-local-variable 'comint-scroll-to-bottom-on-input) |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
659 (make-local-variable 'comint-move-point-for-output) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
660 (make-local-variable 'comint-scroll-show-maximum-output) |
70108
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
661 (make-local-variable 'comint-stored-incomplete-input) |
78717
2f4f1185baf4
(comint-mode): Don't set scroll-conservatively.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
662 ;; Following disabled because it seems to break the case when |
2f4f1185baf4
(comint-mode): Don't set scroll-conservatively.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
663 ;; comint-scroll-show-maximum-output is nil, and no-one can remember |
2f4f1185baf4
(comint-mode): Don't set scroll-conservatively.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
664 ;; what the original problem was. If there are problems with point |
2f4f1185baf4
(comint-mode): Don't set scroll-conservatively.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
665 ;; not going to the end, consider re-enabling this. |
2f4f1185baf4
(comint-mode): Don't set scroll-conservatively.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
666 ;; http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00827.html |
2f4f1185baf4
(comint-mode): Don't set scroll-conservatively.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
667 ;; |
48987
0bf251ecfd1a
(comint-mode): Localy set scroll-conservatively.
Richard M. Stallman <rms@gnu.org>
parents:
47377
diff
changeset
|
668 ;; This makes it really work to keep point at the bottom. |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
669 ;; (make-local-variable 'scroll-conservatively) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
670 ;; (setq scroll-conservatively 10000) |
23347
49e47671810d
make pre-command-hook & comint-exec-hook local hooks.
Simon Marshall <simon@gnu.org>
parents:
23209
diff
changeset
|
671 (add-hook 'pre-command-hook 'comint-preinput-scroll-to-bottom t t) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
672 (make-local-variable 'comint-ptyp) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
673 (make-local-variable 'comint-process-echoes) |
15817
9e94b5fdaab1
(comint-file-name-chars): Was comint-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
15727
diff
changeset
|
674 (make-local-variable 'comint-file-name-chars) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
675 (make-local-variable 'comint-file-name-quote-list) |
109658
8865dff431b0
* comint.el (comint-mode): Make directory tracking functions
Michael Albinus <michael.albinus@gmx.de>
parents:
109302
diff
changeset
|
676 ;; dir tracking on remote files |
8865dff431b0
* comint.el (comint-mode): Make directory tracking functions
Michael Albinus <michael.albinus@gmx.de>
parents:
109302
diff
changeset
|
677 (set (make-local-variable 'comint-file-name-prefix) |
8865dff431b0
* comint.el (comint-mode): Make directory tracking functions
Michael Albinus <michael.albinus@gmx.de>
parents:
109302
diff
changeset
|
678 (or (file-remote-p default-directory) "")) |
73154
7efd5d5388ea
(comint-mode): Bind font-lock-defaults non-nil.
Richard M. Stallman <rms@gnu.org>
parents:
72833
diff
changeset
|
679 (make-local-variable 'comint-accum-marker) |
7efd5d5388ea
(comint-mode): Bind font-lock-defaults non-nil.
Richard M. Stallman <rms@gnu.org>
parents:
72833
diff
changeset
|
680 (setq comint-accum-marker (make-marker)) |
7efd5d5388ea
(comint-mode): Bind font-lock-defaults non-nil.
Richard M. Stallman <rms@gnu.org>
parents:
72833
diff
changeset
|
681 (make-local-variable 'font-lock-defaults) |
75562
44a852ca2266
- Prevent non-keyword fontification by default.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
75491
diff
changeset
|
682 (setq font-lock-defaults '(nil t)) |
47377
5ce6684c420c
(comint-mode): Add font-lock-defontify to change-major-mode-hook.
Richard M. Stallman <rms@gnu.org>
parents:
47073
diff
changeset
|
683 (add-hook 'change-major-mode-hook 'font-lock-defontify nil t) |
106206
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
684 (add-hook 'isearch-mode-hook 'comint-history-isearch-setup nil t) |
32892
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
685 ;; This behavior is not useful in comint buffers, and is annoying |
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
686 (set (make-local-variable 'next-line-add-newlines) nil)) |
114 | 687 |
584 | 688 (defun comint-check-proc (buffer) |
63175
b09a11c8c73e
(comint-check-proc, make-comint-in-buffer, comint-source-default): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
63172
diff
changeset
|
689 "Return non-nil if there is a living process associated w/buffer BUFFER. |
9388
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
690 Living means the status is `open', `run', or `stop'. |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
691 BUFFER can be either a buffer or the name of one." |
584 | 692 (let ((proc (get-buffer-process buffer))) |
9388
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
693 (and proc (memq (process-status proc) '(open run stop))))) |
114 | 694 |
14644
325bc6726a7b
(make-comint, comint-run): Fix autoload cookie.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
695 ;;;###autoload |
32942
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
696 (defun make-comint-in-buffer (name buffer program &optional startfile &rest switches) |
54879 | 697 "Make a Comint process NAME in BUFFER, running PROGRAM. |
32942
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
698 If BUFFER is nil, it defaults to NAME surrounded by `*'s. |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
699 PROGRAM should be either a string denoting an executable program to create |
81801
2e8d5916d236
* comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents:
76897
diff
changeset
|
700 via `start-file-process', or a cons pair of the form (HOST . SERVICE) denoting |
2e8d5916d236
* comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents:
76897
diff
changeset
|
701 a TCP connection to be opened via `open-network-stream'. If there is already |
2e8d5916d236
* comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents:
76897
diff
changeset
|
702 a running process in that buffer, it is not restarted. Optional fourth arg |
105195
5b4bbf79ac2a
* comint.el (comint-exec, comint-run, make-comint): Doc
Chong Yidong <cyd@stupidchicken.com>
parents:
104740
diff
changeset
|
703 STARTFILE is the name of a file, whose contents are sent to the |
5b4bbf79ac2a
* comint.el (comint-exec, comint-run, make-comint): Doc
Chong Yidong <cyd@stupidchicken.com>
parents:
104740
diff
changeset
|
704 process as its initial input. |
32942
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
705 |
109273 | 706 If PROGRAM is a string, any more args are arguments to PROGRAM. |
707 | |
708 Returns the (possibly newly created) process buffer." | |
81801
2e8d5916d236
* comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents:
76897
diff
changeset
|
709 (or (fboundp 'start-file-process) |
32942
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
710 (error "Multi-processing is not supported for this system")) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
711 (setq buffer (get-buffer-create (or buffer (concat "*" name "*")))) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
712 ;; If no process, or nuked process, crank up a new one and put buffer in |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
713 ;; comint mode. Otherwise, leave buffer and existing process alone. |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
714 (unless (comint-check-proc buffer) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
715 (with-current-buffer buffer |
41143
f1315eeb4c0b
(comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40828
diff
changeset
|
716 (unless (derived-mode-p 'comint-mode) |
f1315eeb4c0b
(comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40828
diff
changeset
|
717 (comint-mode))) ; Install local vars, mode, keymap, ... |
32942
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
718 (comint-exec buffer name program startfile switches)) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
719 buffer) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
720 |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
721 ;;;###autoload |
114 | 722 (defun make-comint (name program &optional startfile &rest switches) |
54879 | 723 "Make a Comint process NAME in a buffer, running PROGRAM. |
1839
e10cdcb857d2
(make-comint): Added docstring.
Roland McGrath <roland@gnu.org>
parents:
1821
diff
changeset
|
724 The name of the buffer is made by surrounding NAME with `*'s. |
9388
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
725 PROGRAM should be either a string denoting an executable program to create |
81801
2e8d5916d236
* comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents:
76897
diff
changeset
|
726 via `start-file-process', or a cons pair of the form (HOST . SERVICE) denoting |
2e8d5916d236
* comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents:
76897
diff
changeset
|
727 a TCP connection to be opened via `open-network-stream'. If there is already |
2e8d5916d236
* comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents:
76897
diff
changeset
|
728 a running process in that buffer, it is not restarted. Optional third arg |
105195
5b4bbf79ac2a
* comint.el (comint-exec, comint-run, make-comint): Doc
Chong Yidong <cyd@stupidchicken.com>
parents:
104740
diff
changeset
|
729 STARTFILE is the name of a file, whose contents are sent to the |
5b4bbf79ac2a
* comint.el (comint-exec, comint-run, make-comint): Doc
Chong Yidong <cyd@stupidchicken.com>
parents:
104740
diff
changeset
|
730 process as its initial input. |
9388
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
731 |
109273 | 732 If PROGRAM is a string, any more args are arguments to PROGRAM. |
733 | |
734 Returns the (possibly newly created) process buffer." | |
32942
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
735 (apply #'make-comint-in-buffer name nil program startfile switches)) |
114 | 736 |
14644
325bc6726a7b
(make-comint, comint-run): Fix autoload cookie.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
737 ;;;###autoload |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
738 (defun comint-run (program) |
54879 | 739 "Run PROGRAM in a Comint buffer and switch to it. |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
740 The buffer name is made by surrounding the file name of PROGRAM with `*'s. |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
741 The file name is used to make a symbol name, such as `comint-sh-hook', and any |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
742 hooks on this symbol are run in the buffer. |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
743 See `make-comint' and `comint-exec'." |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
744 (interactive "sRun program: ") |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
745 (let ((name (file-name-nondirectory program))) |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
746 (switch-to-buffer (make-comint name program)) |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
747 (run-hooks (intern-soft (concat "comint-" name "-hook"))))) |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
748 |
114 | 749 (defun comint-exec (buffer name command startfile switches) |
54879 | 750 "Start up a process named NAME in buffer BUFFER for Comint modes. |
105195
5b4bbf79ac2a
* comint.el (comint-exec, comint-run, make-comint): Doc
Chong Yidong <cyd@stupidchicken.com>
parents:
104740
diff
changeset
|
751 Runs the given COMMAND with SWITCHES, and initial input from STARTFILE. |
1839
e10cdcb857d2
(make-comint): Added docstring.
Roland McGrath <roland@gnu.org>
parents:
1821
diff
changeset
|
752 Blasts any old process running in the buffer. Doesn't set the buffer mode. |
54879 | 753 You can use this to cheaply run a series of processes in the same Comint |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
754 buffer. The hook `comint-exec-hook' is run after each exec." |
50966
379cf00d7016
(comint-carriage-motion, comint-output-filter):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49549
diff
changeset
|
755 (with-current-buffer buffer |
114 | 756 (let ((proc (get-buffer-process buffer))) ; Blast any old process. |
757 (if proc (delete-process proc))) | |
758 ;; Crank up a new process | |
9388
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
759 (let ((proc |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
760 (if (consp command) |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
761 (open-network-stream name buffer (car command) (cdr command)) |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
762 (comint-exec-1 name buffer command switches)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
763 (set-process-filter proc 'comint-output-filter) |
584 | 764 (make-local-variable 'comint-ptyp) |
42205 | 765 (setq comint-ptyp process-connection-type) ; t if pty, nil if pipe. |
114 | 766 ;; Jump to the end, and set the process mark. |
584 | 767 (goto-char (point-max)) |
705 | 768 (set-marker (process-mark proc) (point)) |
114 | 769 ;; Feed it the startfile. |
770 (cond (startfile | |
771 ;;This is guaranteed to wait long enough | |
772 ;;but has bad results if the comint does not prompt at all | |
773 ;; (while (= size (buffer-size)) | |
774 ;; (sleep-for 1)) | |
775 ;;I hope 1 second is enough! | |
776 (sleep-for 1) | |
777 (goto-char (point-max)) | |
778 (insert-file-contents startfile) | |
779 (setq startfile (buffer-substring (point) (point-max))) | |
780 (delete-region (point) (point-max)) | |
584 | 781 (comint-send-string proc startfile))) |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
782 (run-hooks 'comint-exec-hook) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
783 buffer))) |
114 | 784 |
14169 | 785 ;; This auxiliary function cranks up the process for comint-exec in |
786 ;; the appropriate environment. | |
114 | 787 |
788 (defun comint-exec-1 (name buffer command switches) | |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
789 (let ((process-environment |
6750
a864110c6fc7
(comint-exec-1): Handle both termcap and terminfo.
Karl Heuer <kwzh@gnu.org>
parents:
6507
diff
changeset
|
790 (nconc |
7327 | 791 ;; If using termcap, we specify `emacs' as the terminal type |
792 ;; because that lets us specify a width. | |
14814
3793008500cd
(comint-exec-1): Use dumb instead of unknown, for terminfo.
Richard M. Stallman <rms@gnu.org>
parents:
14644
diff
changeset
|
793 ;; If using terminfo, we specify `dumb' because that is |
7327 | 794 ;; a defined terminal type. `emacs' is not a defined terminal type |
795 ;; and there is no way for us to define it here. | |
796 ;; Some programs that use terminfo get very confused | |
797 ;; if TERM is not a valid terminal type. | |
42341 | 798 ;; ;; There is similar code in compile.el. |
6750
a864110c6fc7
(comint-exec-1): Handle both termcap and terminfo.
Karl Heuer <kwzh@gnu.org>
parents:
6507
diff
changeset
|
799 (if (and (boundp 'system-uses-terminfo) system-uses-terminfo) |
17159
6f1e715cbd58
minor bug fixes/enhancements to comint-delchar-or-maybe-eof, send-invisible, comint-exec-1.
Simon Marshall <simon@gnu.org>
parents:
16944
diff
changeset
|
800 (list "TERM=dumb" "TERMCAP=" |
36896
76fed386fc02
(comint-exec-1): Set columns of the terminal to
Gerd Moellmann <gerd@gnu.org>
parents:
36695
diff
changeset
|
801 (format "COLUMNS=%d" (window-width))) |
13271
6a084ce822e0
(comint-exec-1): Don't alter EMACS envvar if it's already defined.
Richard M. Stallman <rms@gnu.org>
parents:
13094
diff
changeset
|
802 (list "TERM=emacs" |
36896
76fed386fc02
(comint-exec-1): Set columns of the terminal to
Gerd Moellmann <gerd@gnu.org>
parents:
36695
diff
changeset
|
803 (format "TERMCAP=emacs:co#%d:tc=unknown:" (window-width)))) |
72833
81a55a7dc3c3
* etc/NEWS: In terminal-oriented subshells, the EMACS environment
Paul Eggert <eggert@twinsun.com>
parents:
71142
diff
changeset
|
804 (unless (getenv "EMACS") |
74058
05d799bc0cda
(comint-exec-1): Set EMACS and INSIDE_EMACS to t.
Chong Yidong <cyd@stupidchicken.com>
parents:
73154
diff
changeset
|
805 (list "EMACS=t")) |
74280
548fcfa53e5e
(comint-exec-1): Provide Emacs version and `comint' in INSIDE_EMACS.
Richard M. Stallman <rms@gnu.org>
parents:
74058
diff
changeset
|
806 (list (format "INSIDE_EMACS=%s,comint" emacs-version)) |
9873
03f3cfdb6a11
(comint-exec-1): Make sure default-directory is a real dir.
Richard M. Stallman <rms@gnu.org>
parents:
9764
diff
changeset
|
807 process-environment)) |
03f3cfdb6a11
(comint-exec-1): Make sure default-directory is a real dir.
Richard M. Stallman <rms@gnu.org>
parents:
9764
diff
changeset
|
808 (default-directory |
16944
54108c7f46e6
(comint-exec-1): Use file-accessible-directory-p.
Richard M. Stallman <rms@gnu.org>
parents:
16849
diff
changeset
|
809 (if (file-accessible-directory-p default-directory) |
9873
03f3cfdb6a11
(comint-exec-1): Make sure default-directory is a real dir.
Richard M. Stallman <rms@gnu.org>
parents:
9764
diff
changeset
|
810 default-directory |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
811 "/")) |
22652
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
812 proc decoding encoding changed) |
104740
dc5b8d58abfe
(comint-exec-1): Check command is non-null first.
Nick Roberts <nickrob@snap.net.nz>
parents:
104725
diff
changeset
|
813 (let ((exec-path (if (and command (file-name-directory command)) |
28064
34cb92c8c3e4
(comint-exec-1): Add the current-dir to the exec-path when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26734
diff
changeset
|
814 ;; If the command has slashes, make sure we |
34cb92c8c3e4
(comint-exec-1): Add the current-dir to the exec-path when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26734
diff
changeset
|
815 ;; first look relative to the current directory. |
34cb92c8c3e4
(comint-exec-1): Add the current-dir to the exec-path when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26734
diff
changeset
|
816 (cons default-directory exec-path) exec-path))) |
81801
2e8d5916d236
* comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents:
76897
diff
changeset
|
817 (setq proc (apply 'start-file-process name buffer command switches))) |
82765
a8c46cf3e7aa
* comint.el (comint-exec-1): Raise an error if
Michael Albinus <michael.albinus@gmx.de>
parents:
82140
diff
changeset
|
818 ;; Some file name handler cannot start a process, fe ange-ftp. |
a8c46cf3e7aa
* comint.el (comint-exec-1): Raise an error if
Michael Albinus <michael.albinus@gmx.de>
parents:
82140
diff
changeset
|
819 (unless (processp proc) (error "No process started")) |
22652
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
820 (let ((coding-systems (process-coding-system proc))) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
821 (setq decoding (car coding-systems) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
822 encoding (cdr coding-systems))) |
81801
2e8d5916d236
* comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents:
76897
diff
changeset
|
823 ;; Even if start-file-process left the coding system for encoding data |
22652
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
824 ;; sent from the process undecided, we had better use the same one |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
825 ;; as what we use for decoding. But, we should suppress EOL |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
826 ;; conversion. |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
827 (if (and decoding (not encoding)) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
828 (setq encoding (coding-system-change-eol-conversion decoding 'unix) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
829 changed t)) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
830 (if changed |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
831 (set-process-coding-system proc decoding encoding)) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
832 proc)) |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
833 |
70575
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
834 (defun comint-insert-input (event) |
75491
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
835 "In a Comint buffer, set the current input to the previous input at point. |
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
836 If there is no previous input at point, run the command specified |
103560
10c7d2fa1e40
(comint-insert-input): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
837 by the global keymap (usually `mouse-yank-at-click')." |
70575
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
838 (interactive "e") |
104725
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
839 ;; Don't set the mouse here, since it may otherwise change the behavior |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
840 ;; of the command on which we fallback if there's no field at point. |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
841 ;; (mouse-set-point event) |
75491
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
842 (let ((pos (posn-point (event-end event))) |
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
843 field input) |
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
844 (with-selected-window (posn-window (event-end event)) |
106362
d19d1b12196e
(comint-insert-input): Ignore clicks to the right of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106326
diff
changeset
|
845 ;; If pos is at the very end of a field, the mouse-click was |
d19d1b12196e
(comint-insert-input): Ignore clicks to the right of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106326
diff
changeset
|
846 ;; probably outside (to the right) of the field. |
d19d1b12196e
(comint-insert-input): Ignore clicks to the right of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106326
diff
changeset
|
847 (and (< pos (field-end pos)) |
d19d1b12196e
(comint-insert-input): Ignore clicks to the right of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106326
diff
changeset
|
848 (setq field (field-at-pos pos)) |
75491
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
849 (setq input (field-string-no-properties pos)))) |
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
850 (if (or (null comint-accum-marker) |
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
851 (not (eq field 'input))) |
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
852 ;; Fall back to the global definition if (i) the selected |
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
853 ;; buffer is not a comint buffer (which can happen if a |
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
854 ;; non-comint window was selected and we clicked in a comint |
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
855 ;; window), or (ii) there is no input at POS. |
70575
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
856 (let* ((keys (this-command-keys)) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
857 (last-key (and (vectorp keys) (aref keys (1- (length keys))))) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
858 (fun (and last-key (lookup-key global-map (vector last-key))))) |
75491
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
859 (and fun (not (eq fun 'comint-insert-input)) |
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
860 (call-interactively fun))) |
104725
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
861 (with-selected-window (posn-window (event-end event)) |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
862 ;; Otherwise, insert the previous input. |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
863 (goto-char (point-max)) |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
864 ;; First delete any old unsent input at the end |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
865 (delete-region |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
866 (or (marker-position comint-accum-marker) |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
867 (process-mark (get-buffer-process (current-buffer)))) |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
868 (point)) |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
869 ;; Insert the input at point |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
870 (insert input))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
871 |
14169 | 872 ;; Input history processing in a buffer |
873 ;; =========================================================================== | |
874 ;; Useful input history functions, courtesy of the Ergo group. | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
875 |
14169 | 876 ;; Eleven commands: |
877 ;; comint-dynamic-list-input-ring List history in help buffer. | |
878 ;; comint-previous-input Previous input... | |
879 ;; comint-previous-matching-input ...matching a string. | |
880 ;; comint-previous-matching-input-from-input ... matching the current input. | |
881 ;; comint-next-input Next input... | |
882 ;; comint-next-matching-input ...matching a string. | |
883 ;; comint-next-matching-input-from-input ... matching the current input. | |
884 ;; comint-backward-matching-input Backwards input... | |
885 ;; comint-forward-matching-input ...matching a string. | |
886 ;; comint-replace-by-expanded-history Expand history at point; | |
887 ;; replace with expanded history. | |
888 ;; comint-magic-space Expand history and insert space. | |
889 ;; | |
890 ;; Three functions: | |
891 ;; comint-read-input-ring Read into comint-input-ring... | |
892 ;; comint-write-input-ring Write to comint-input-ring-file-name. | |
893 ;; comint-replace-by-expanded-history-before-point Workhorse function. | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
894 |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
895 (defun comint-read-input-ring (&optional silent) |
54879 | 896 "Set the buffer's `comint-input-ring' from a history file. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
897 The name of the file is given by the variable `comint-input-ring-file-name'. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
898 The history ring is of size `comint-input-ring-size', regardless of file size. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
899 If `comint-input-ring-file-name' is nil this function does nothing. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
900 |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
901 If the optional argument SILENT is non-nil, we say nothing about a |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
902 failure to read the history file. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
903 |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
904 This function is useful for major mode commands and mode hooks. |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
905 |
25443
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
906 The commands stored in the history file are separated by the |
34977
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
907 `comint-input-ring-separator', and entries that match |
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
908 `comint-input-history-ignore' are ignored. The most recent command |
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
909 comes last. |
25443
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
910 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
911 See also `comint-input-ignoredups' and `comint-write-input-ring'." |
5016
11f0a3153f63
(comint-read-input-ring, comint-write-input-ring):
Richard M. Stallman <rms@gnu.org>
parents:
4993
diff
changeset
|
912 (cond ((or (null comint-input-ring-file-name) |
11f0a3153f63
(comint-read-input-ring, comint-write-input-ring):
Richard M. Stallman <rms@gnu.org>
parents:
4993
diff
changeset
|
913 (equal comint-input-ring-file-name "")) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
914 nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
915 ((not (file-readable-p comint-input-ring-file-name)) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
916 (or silent |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
917 (message "Cannot read history file %s" |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
918 comint-input-ring-file-name))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
919 (t |
28880
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
920 (let* ((history-buf (get-buffer-create " *temp*")) |
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
921 (file comint-input-ring-file-name) |
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
922 (count 0) |
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
923 (size comint-input-ring-size) |
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
924 (ring (make-ring size))) |
8032
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
925 (unwind-protect |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
926 (with-current-buffer history-buf |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
927 (widen) |
8032
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
928 (erase-buffer) |
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
929 (insert-file-contents file) |
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
930 ;; Save restriction in case file is already visited... |
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
931 ;; Watch for those date stamps in history files! |
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
932 (goto-char (point-max)) |
32623
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
933 (let (start end history) |
76102
47b27cdb3ec2
(comint-read-input-ring): Use comint-input-ring-size from the comint buffer
Eli Zaretskii <eliz@gnu.org>
parents:
75571
diff
changeset
|
934 (while (and (< count size) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
935 (re-search-backward comint-input-ring-separator |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
936 nil t) |
32623
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
937 (setq end (match-beginning 0))) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
938 (setq start |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
939 (if (re-search-backward comint-input-ring-separator |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
940 nil t) |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
941 (match-end 0) |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
942 (point-min))) |
32623
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
943 (setq history (buffer-substring start end)) |
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
944 (goto-char start) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
945 (if (and (not (string-match comint-input-history-ignore |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
946 history)) |
34977
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
947 (or (null comint-input-ignoredups) |
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
948 (ring-empty-p ring) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
949 (not (string-equal (ring-ref ring 0) |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
950 history)))) |
32623
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
951 (progn |
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
952 (ring-insert-at-beginning ring history) |
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
953 (setq count (1+ count))))))) |
8032
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
954 (kill-buffer history-buf)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
955 (setq comint-input-ring ring |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
956 comint-input-ring-index nil))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
957 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
958 (defun comint-write-input-ring () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
959 "Writes the buffer's `comint-input-ring' to a history file. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
960 The name of the file is given by the variable `comint-input-ring-file-name'. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
961 The original contents of the file are lost if `comint-input-ring' is not empty. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
962 If `comint-input-ring-file-name' is nil this function does nothing. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
963 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
964 Useful within process sentinels. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
965 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
966 See also `comint-read-input-ring'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
967 (cond ((or (null comint-input-ring-file-name) |
5016
11f0a3153f63
(comint-read-input-ring, comint-write-input-ring):
Richard M. Stallman <rms@gnu.org>
parents:
4993
diff
changeset
|
968 (equal comint-input-ring-file-name "") |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
969 (null comint-input-ring) (ring-empty-p comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
970 nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
971 ((not (file-writable-p comint-input-ring-file-name)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
972 (message "Cannot write history file %s" comint-input-ring-file-name)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
973 (t |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
974 (let* ((history-buf (get-buffer-create " *Temp Input History*")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
975 (ring comint-input-ring) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
976 (file comint-input-ring-file-name) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
977 (index (ring-length ring))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
978 ;; Write it all out into a buffer first. Much faster, but messier, |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
979 ;; than writing it one line at a time. |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
980 (with-current-buffer history-buf |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
981 (erase-buffer) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
982 (while (> index 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
983 (setq index (1- index)) |
32326 | 984 (insert (ring-ref ring index) comint-input-ring-separator)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
985 (write-region (buffer-string) nil file nil 'no-message) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
986 (kill-buffer nil)))))) |
584 | 987 |
114 | 988 |
42119
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
989 (defvar comint-dynamic-list-input-ring-window-conf) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
990 |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
991 (defun comint-dynamic-list-input-ring-select () |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
992 "Choose the input history entry that point is in or next to." |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
993 (interactive) |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
994 (let ((buffer completion-reference-buffer) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
995 beg end completion) |
42119
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
996 (if (and (not (eobp)) (get-text-property (point) 'mouse-face)) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
997 (setq end (point) beg (1+ (point)))) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
998 (if (and (not (bobp)) (get-text-property (1- (point)) 'mouse-face)) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
999 (setq end (1- (point)) beg (point))) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1000 (if (null beg) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1001 (error "No history entry here")) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1002 (setq beg (previous-single-property-change beg 'mouse-face)) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1003 (setq end (or (next-single-property-change end 'mouse-face) (point-max))) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1004 (setq completion (buffer-substring beg end)) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1005 (set-window-configuration comint-dynamic-list-input-ring-window-conf) |
105601
68686d39c93a
Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105372
diff
changeset
|
1006 (choose-completion-string completion buffer))) |
42119
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1007 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1008 (defun comint-dynamic-list-input-ring () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1009 "List in help buffer the buffer's input history." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1010 (interactive) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1011 (if (or (not (ring-p comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1012 (ring-empty-p comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1013 (message "No history") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1014 (let ((history nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1015 (history-buffer " *Input History*") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1016 (index (1- (ring-length comint-input-ring))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1017 (conf (current-window-configuration))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1018 ;; We have to build up a list ourselves from the ring vector. |
105601
68686d39c93a
Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105372
diff
changeset
|
1019 (dotimes (index (ring-length comint-input-ring)) |
68686d39c93a
Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105372
diff
changeset
|
1020 (push (ring-ref comint-input-ring index) history)) |
68686d39c93a
Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105372
diff
changeset
|
1021 ;; Show them most-recent-first. |
68686d39c93a
Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105372
diff
changeset
|
1022 (setq history (nreverse history)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1023 ;; Change "completion" to "history reference" |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1024 ;; to make the display accurate. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1025 (with-output-to-temp-buffer history-buffer |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1026 (display-completion-list history) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1027 (set-buffer history-buffer) |
42119
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1028 (let ((keymap (make-sparse-keymap))) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1029 (set-keymap-parent keymap (current-local-map)) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1030 (define-key keymap "\C-m" 'comint-dynamic-list-input-ring-select) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1031 (use-local-map keymap)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1032 (forward-line 3) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1033 (while (search-backward "completion" nil 'move) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1034 (replace-match "history reference"))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1035 (sit-for 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1036 (message "Hit space to flush") |
42119
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1037 (setq comint-dynamic-list-input-ring-window-conf conf) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1038 (let ((ch (read-event))) |
64000
e1ccb8b46dea
(comint-completion, comint-source): Finsh `degroup' descriptions with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63813
diff
changeset
|
1039 (if (eq ch ?\s) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1040 (set-window-configuration conf) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1041 (setq unread-command-events (list ch))))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1042 |
584 | 1043 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1044 (defun comint-regexp-arg (prompt) |
54879 | 1045 "Return list of regexp and prefix arg using PROMPT." |
20020
c03bbe136bd0
(comint-regexp-arg): No need to bind
Karl Heuer <kwzh@gnu.org>
parents:
19842
diff
changeset
|
1046 (let* (;; Don't clobber this. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1047 (last-command last-command) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1048 (regexp (read-from-minibuffer prompt nil nil nil |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1049 'minibuffer-history-search-history))) |
79852
32dc15103b58
(comint-regexp-arg): Fix no-input case.
Glenn Morris <rgm@gnu.org>
parents:
79814
diff
changeset
|
1050 ;; If the user didn't enter anything, nothing is added to m-h-s-h. |
32dc15103b58
(comint-regexp-arg): Fix no-input case.
Glenn Morris <rgm@gnu.org>
parents:
79814
diff
changeset
|
1051 ;; Use the previous search regexp, if there is one. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1052 (list (if (string-equal regexp "") |
79852
32dc15103b58
(comint-regexp-arg): Fix no-input case.
Glenn Morris <rgm@gnu.org>
parents:
79814
diff
changeset
|
1053 (or (car minibuffer-history-search-history) |
32dc15103b58
(comint-regexp-arg): Fix no-input case.
Glenn Morris <rgm@gnu.org>
parents:
79814
diff
changeset
|
1054 regexp) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1055 regexp) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1056 (prefix-numeric-value current-prefix-arg)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1057 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1058 (defun comint-search-arg (arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1059 ;; First make sure there is a ring and that we are after the process mark |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1060 (cond ((not (comint-after-pmark-p)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1061 (error "Not at command line")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1062 ((or (null comint-input-ring) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1063 (ring-empty-p comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1064 (error "Empty input ring")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1065 ((zerop arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1066 ;; arg of zero resets search from beginning, and uses arg of 1 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1067 (setq comint-input-ring-index nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1068 1) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1069 (t |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1070 arg))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1071 |
70108
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1072 (defun comint-restore-input () |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1073 "Restore unfinished input." |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1074 (interactive) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1075 (when comint-input-ring-index |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1076 (comint-delete-input) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1077 (when (> (length comint-stored-incomplete-input) 0) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1078 (insert comint-stored-incomplete-input) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1079 (message "Input restored")) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1080 (setq comint-input-ring-index nil))) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1081 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1082 (defun comint-search-start (arg) |
54879 | 1083 "Index to start a directional search, starting at `comint-input-ring-index'." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1084 (if comint-input-ring-index |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1085 ;; If a search is running, offset by 1 in direction of arg |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1086 (mod (+ comint-input-ring-index (if (> arg 0) 1 -1)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1087 (ring-length comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1088 ;; For a new search, start from beginning or end, as appropriate |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1089 (if (>= arg 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1090 0 ; First elt for forward search |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1091 (1- (ring-length comint-input-ring))))) ; Last elt for backward search |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1092 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1093 (defun comint-previous-input-string (arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1094 "Return the string ARG places along the input ring. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1095 Moves relative to `comint-input-ring-index'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1096 (ring-ref comint-input-ring (if comint-input-ring-index |
32326 | 1097 (mod (+ arg comint-input-ring-index) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1098 (ring-length comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1099 arg))) |
114 | 1100 |
1101 (defun comint-previous-input (arg) | |
70108
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1102 "Cycle backwards through input history, saving input." |
114 | 1103 (interactive "*p") |
71142
f912b6f4d358
(comint-send-input): Do not add help-echo and mouse-face to input if
Luc Teirlinck <teirllm@auburn.edu>
parents:
70963
diff
changeset
|
1104 (if (and comint-input-ring-index |
70108
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1105 (or ;; leaving the "end" of the ring |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1106 (and (< arg 0) ; going down |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1107 (eq comint-input-ring-index 0)) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1108 (and (> arg 0) ; going up |
71142
f912b6f4d358
(comint-send-input): Do not add help-echo and mouse-face to input if
Luc Teirlinck <teirllm@auburn.edu>
parents:
70963
diff
changeset
|
1109 (eq comint-input-ring-index |
70108
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1110 (1- (ring-length comint-input-ring))))) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1111 comint-stored-incomplete-input) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1112 (comint-restore-input) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1113 (comint-previous-matching-input "." arg))) |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1114 |
114 | 1115 (defun comint-next-input (arg) |
1116 "Cycle forwards through input history." | |
1117 (interactive "*p") | |
1118 (comint-previous-input (- arg))) | |
1119 | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1120 (defun comint-previous-matching-input-string (regexp arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1121 "Return the string matching REGEXP ARG places along the input ring. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1122 Moves relative to `comint-input-ring-index'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1123 (let* ((pos (comint-previous-matching-input-string-position regexp arg))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1124 (if pos (ring-ref comint-input-ring pos)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1125 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1126 (defun comint-previous-matching-input-string-position (regexp arg &optional start) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1127 "Return the index matching REGEXP ARG places along the input ring. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1128 Moves relative to START, or `comint-input-ring-index'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1129 (if (or (not (ring-p comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1130 (ring-empty-p comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1131 (error "No history")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1132 (let* ((len (ring-length comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1133 (motion (if (> arg 0) 1 -1)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1134 (n (mod (- (or start (comint-search-start arg)) motion) len)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1135 (tried-each-ring-item nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1136 (prev nil)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1137 ;; Do the whole search as many times as the argument says. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1138 (while (and (/= arg 0) (not tried-each-ring-item)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1139 ;; Step once. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1140 (setq prev n |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1141 n (mod (+ n motion) len)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1142 ;; If we haven't reached a match, step some more. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1143 (while (and (< n len) (not tried-each-ring-item) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1144 (not (string-match regexp (ring-ref comint-input-ring n)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1145 (setq n (mod (+ n motion) len) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1146 ;; If we have gone all the way around in this search. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1147 tried-each-ring-item (= n prev))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1148 (setq arg (if (> arg 0) (1- arg) (1+ arg)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1149 ;; Now that we know which ring element to use, if we found it, return that. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1150 (if (string-match regexp (ring-ref comint-input-ring n)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1151 n))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1152 |
70108
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1153 (defun comint-delete-input () |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1154 "Delete all input between accumulation or process mark and point." |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1155 (delete-region |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1156 ;; Can't use kill-region as it sets this-command |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1157 (or (marker-position comint-accum-marker) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1158 (process-mark (get-buffer-process (current-buffer)))) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1159 (point-max))) |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1160 |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1161 (defun comint-previous-matching-input (regexp n) |
2673
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1162 "Search backwards through input history for match for REGEXP. |
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1163 \(Previous history elements are earlier commands.) |
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1164 With prefix argument N, search for Nth previous match. |
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1165 If N is negative, find the next or Nth next match." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1166 (interactive (comint-regexp-arg "Previous input matching (regexp): ")) |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1167 (setq n (comint-search-arg n)) |
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1168 (let ((pos (comint-previous-matching-input-string-position regexp n))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1169 ;; Has a match been found? |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1170 (if (null pos) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1171 (error "Not found") |
70108
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1172 ;; If leaving the edit line, save partial input |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1173 (if (null comint-input-ring-index) ;not yet on ring |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1174 (setq comint-stored-incomplete-input |
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1175 (funcall comint-get-old-input))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1176 (setq comint-input-ring-index pos) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1177 (message "History item: %d" (1+ pos)) |
70108
3233d9998115
(comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents:
69687
diff
changeset
|
1178 (comint-delete-input) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1179 (insert (ring-ref comint-input-ring pos))))) |
584 | 1180 |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1181 (defun comint-next-matching-input (regexp n) |
2673
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1182 "Search forwards through input history for match for REGEXP. |
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1183 \(Later history elements are more recent commands.) |
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1184 With prefix argument N, search for Nth following match. |
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1185 If N is negative, find the previous or Nth previous match." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1186 (interactive (comint-regexp-arg "Next input matching (regexp): ")) |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1187 (comint-previous-matching-input regexp (- n))) |
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1188 |
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1189 (defun comint-previous-matching-input-from-input (n) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1190 "Search backwards through input history for match for current input. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1191 \(Previous history elements are earlier commands.) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1192 With prefix argument N, search for Nth previous match. |
5323
44a59f6e114e
(comint-next-matching-input-from-input): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5284
diff
changeset
|
1193 If N is negative, search forwards for the -Nth following match." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1194 (interactive "p") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1195 (if (not (memq last-command '(comint-previous-matching-input-from-input |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1196 comint-next-matching-input-from-input))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1197 ;; Starting a new search |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1198 (setq comint-matching-input-from-input-string |
32326 | 1199 (buffer-substring |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
1200 (or (marker-position comint-accum-marker) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
1201 (process-mark (get-buffer-process (current-buffer)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1202 (point)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1203 comint-input-ring-index nil)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1204 (comint-previous-matching-input |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1205 (concat "^" (regexp-quote comint-matching-input-from-input-string)) |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1206 n)) |
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1207 |
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1208 (defun comint-next-matching-input-from-input (n) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1209 "Search forwards through input history for match for current input. |
5323
44a59f6e114e
(comint-next-matching-input-from-input): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5284
diff
changeset
|
1210 \(Following history elements are more recent commands.) |
44a59f6e114e
(comint-next-matching-input-from-input): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5284
diff
changeset
|
1211 With prefix argument N, search for Nth following match. |
44a59f6e114e
(comint-next-matching-input-from-input): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5284
diff
changeset
|
1212 If N is negative, search backwards for the -Nth previous match." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1213 (interactive "p") |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1214 (comint-previous-matching-input-from-input (- n))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1215 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1216 |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1217 (defun comint-replace-by-expanded-history (&optional silent start) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1218 "Expand input command history references before point. |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1219 Expansion is dependent on the value of `comint-input-autoexpand'. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1220 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1221 This function depends on the buffer's idea of the input history, which may not |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1222 match the command interpreter's idea, assuming it has one. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1223 |
54879 | 1224 Assumes history syntax is like typical Un*x shells'. However, since Emacs |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1225 cannot know the interpreter's idea of input line numbers, assuming it has one, |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1226 it cannot expand absolute input line number references. |
584 | 1227 |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1228 If the optional argument SILENT is non-nil, never complain |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1229 even if history reference seems erroneous. |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1230 |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1231 If the optional argument START is non-nil, that specifies the |
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1232 start of the text to scan for history references, rather |
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1233 than the logical beginning of line. |
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1234 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1235 See `comint-magic-space' and `comint-replace-by-expanded-history-before-point'. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1236 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1237 Returns t if successful." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1238 (interactive) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1239 (if (and comint-input-autoexpand |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
1240 (if comint-use-prompt-regexp |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1241 ;; Use comint-prompt-regexp |
33053
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1242 (save-excursion |
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1243 (beginning-of-line) |
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1244 (looking-at (concat comint-prompt-regexp "!\\|\\^"))) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1245 ;; Use input fields. User input that hasn't been entered |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1246 ;; yet, at the end of the buffer, has a nil `field' property. |
33053
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1247 (and (null (get-char-property (point) 'field)) |
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1248 (string-match "!\\|^\\^" (field-string))))) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1249 ;; Looks like there might be history references in the command. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1250 (let ((previous-modified-tick (buffer-modified-tick))) |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1251 (comint-replace-by-expanded-history-before-point silent start) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1252 (/= previous-modified-tick (buffer-modified-tick))))) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1253 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1254 |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1255 (defun comint-replace-by-expanded-history-before-point (silent &optional start) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1256 "Expand directory stack reference before point. |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1257 See `comint-replace-by-expanded-history'. Returns t if successful. |
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1258 |
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1259 If the optional argument START is non-nil, that specifies the |
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1260 start of the text to scan for history references, rather |
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1261 than the logical beginning of line." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1262 (save-excursion |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1263 (let ((toend (- (line-end-position) (point))) |
55881
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
1264 (start (or start (comint-line-beginning-position)))) |
35514
e25ec5ecc3f5
(comint-replace-by-expanded-history-before-point): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
35236
diff
changeset
|
1265 (goto-char start) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1266 (while (progn |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1267 (skip-chars-forward "^!^" (- (line-end-position) toend)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1268 (< (point) (- (line-end-position) toend))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1269 ;; This seems a bit complex. We look for references such as !!, !-num, |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1270 ;; !foo, !?foo, !{bar}, !?{bar}, ^oh, ^my^, ^god^it, ^never^ends^. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1271 ;; If that wasn't enough, the plings can be suffixed with argument |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1272 ;; range specifiers. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1273 ;; Argument ranges are complex too, so we hive off the input line, |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1274 ;; referenced with plings, with the range string to `comint-args'. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1275 (setq comint-input-ring-index nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1276 (cond ((or (= (preceding-char) ?\\) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1277 (comint-within-quotes start (point))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1278 ;; The history is quoted, or we're in quotes. |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1279 (goto-char (1+ (point)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1280 ((looking-at "![0-9]+\\($\\|[^-]\\)") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1281 ;; We cannot know the interpreter's idea of input line numbers. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1282 (goto-char (match-end 0)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1283 (message "Absolute reference cannot be expanded")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1284 ((looking-at "!-\\([0-9]+\\)\\(:?[0-9^$*-]+\\)?") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1285 ;; Just a number of args from `number' lines backward. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1286 (let ((number (1- (string-to-number |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1287 (buffer-substring (match-beginning 1) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1288 (match-end 1)))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1289 (if (<= number (ring-length comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1290 (progn |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1291 (replace-match |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1292 (comint-args (comint-previous-input-string number) |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1293 (match-beginning 2) (match-end 2)) |
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1294 t t) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1295 (setq comint-input-ring-index number) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1296 (message "History item: %d" (1+ number))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1297 (goto-char (match-end 0)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1298 (message "Relative reference exceeds input history size")))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1299 ((or (looking-at "!!?:?\\([0-9^$*-]+\\)") (looking-at "!!")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1300 ;; Just a number of args from the previous input line. |
105828
3d8945f5688d
* comint.el (comint-replace-by-expanded-history-before-point):
Chong Yidong <cyd@stupidchicken.com>
parents:
105740
diff
changeset
|
1301 (replace-match (comint-previous-input-string 0) t t) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1302 (message "History item: previous")) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1303 ((looking-at |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1304 "!\\??\\({\\(.+\\)}\\|\\(\\sw+\\)\\)\\(:?[0-9^$*-]+\\)?") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1305 ;; Most recent input starting with or containing (possibly |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1306 ;; protected) string, maybe just a number of args. Phew. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1307 (let* ((mb1 (match-beginning 1)) (me1 (match-end 1)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1308 (mb2 (match-beginning 2)) (me2 (match-end 2)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1309 (exp (buffer-substring (or mb2 mb1) (or me2 me1))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1310 (pref (if (save-match-data (looking-at "!\\?")) "" "^")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1311 (pos (save-match-data |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1312 (comint-previous-matching-input-string-position |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1313 (concat pref (regexp-quote exp)) 1)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1314 (if (null pos) |
6886
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1315 (progn |
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1316 (goto-char (match-end 0)) |
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1317 (or silent |
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1318 (progn (message "Not found") |
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1319 (ding)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1320 (setq comint-input-ring-index pos) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1321 (replace-match |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1322 (comint-args (ring-ref comint-input-ring pos) |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1323 (match-beginning 4) (match-end 4)) |
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1324 t t) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1325 (message "History item: %d" (1+ pos))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1326 ((looking-at "\\^\\([^^]+\\)\\^?\\([^^]*\\)\\^?") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1327 ;; Quick substitution on the previous input line. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1328 (let ((old (buffer-substring (match-beginning 1) (match-end 1))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1329 (new (buffer-substring (match-beginning 2) (match-end 2))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1330 (pos nil)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1331 (replace-match (comint-previous-input-string 0) t t) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1332 (setq pos (point)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1333 (goto-char (match-beginning 0)) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1334 (if (not (search-forward old pos t)) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1335 (or silent |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1336 (error "Not found")) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1337 (replace-match new t t) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1338 (message "History item: substituted")))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1339 (t |
21951
ab7fa71c0957
(comint-replace-by-expanded-history-before-point):
Richard M. Stallman <rms@gnu.org>
parents:
21714
diff
changeset
|
1340 (forward-char 1))))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1341 |
114 | 1342 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1343 (defun comint-magic-space (arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1344 "Expand input history references before point and insert ARG spaces. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1345 A useful command to bind to SPC. See `comint-replace-by-expanded-history'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1346 (interactive "p") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1347 (comint-replace-by-expanded-history) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1348 (self-insert-command arg)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1349 |
106206
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1350 ;; Isearch in comint input history |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1351 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1352 (defcustom comint-history-isearch nil |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1353 "Non-nil to Isearch in input history only, not in comint buffer output. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1354 If t, usual Isearch keys like `C-r' and `C-M-r' in comint mode search |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1355 in the input history. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1356 If `dwim', Isearch keys search in the input history only when initial |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1357 point position is at the comint command line. When starting Isearch |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1358 from other parts of the comint buffer, they search in the comint buffer. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1359 If nil, Isearch operates on the whole comint buffer." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1360 :type '(choice (const :tag "Don't search in input history" nil) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1361 (const :tag "When point is on command line initially, search history" dwim) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1362 (const :tag "Always search in input history" t)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1363 :group 'comint |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1364 :version "23.2") |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1365 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1366 (defun comint-history-isearch-backward () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1367 "Search for a string backward in input history using Isearch." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1368 (interactive) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1369 (let ((comint-history-isearch t)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1370 (isearch-backward))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1371 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1372 (defun comint-history-isearch-backward-regexp () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1373 "Search for a regular expression backward in input history using Isearch." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1374 (interactive) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1375 (let ((comint-history-isearch t)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1376 (isearch-backward-regexp))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1377 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1378 (defvar comint-history-isearch-message-overlay nil) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1379 (make-variable-buffer-local 'comint-history-isearch-message-overlay) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1380 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1381 (defun comint-history-isearch-setup () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1382 "Set up a comint for using Isearch to search the input history. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1383 Intended to be added to `isearch-mode-hook' in `comint-mode'." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1384 (when (or (eq comint-history-isearch t) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1385 (and (eq comint-history-isearch 'dwim) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1386 ;; Point is at command line. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1387 (comint-after-pmark-p))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1388 (setq isearch-message-prefix-add "history ") |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1389 (set (make-local-variable 'isearch-search-fun-function) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1390 'comint-history-isearch-search) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1391 (set (make-local-variable 'isearch-message-function) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1392 'comint-history-isearch-message) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1393 (set (make-local-variable 'isearch-wrap-function) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1394 'comint-history-isearch-wrap) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1395 (set (make-local-variable 'isearch-push-state-function) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1396 'comint-history-isearch-push-state) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1397 (add-hook 'isearch-mode-end-hook 'comint-history-isearch-end nil t))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1398 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1399 (defun comint-history-isearch-end () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1400 "Clean up the comint after terminating Isearch in comint." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1401 (if comint-history-isearch-message-overlay |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1402 (delete-overlay comint-history-isearch-message-overlay)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1403 (setq isearch-message-prefix-add nil) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1404 (setq isearch-search-fun-function nil) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1405 (setq isearch-message-function nil) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1406 (setq isearch-wrap-function nil) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1407 (setq isearch-push-state-function nil) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1408 (remove-hook 'isearch-mode-end-hook 'comint-history-isearch-end t)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1409 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1410 (defun comint-goto-input (pos) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1411 "Put input history item of the absolute history position POS." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1412 ;; If leaving the edit line, save partial unfinished input. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1413 (if (null comint-input-ring-index) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1414 (setq comint-stored-incomplete-input |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1415 (funcall comint-get-old-input))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1416 (setq comint-input-ring-index pos) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1417 (comint-delete-input) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1418 (if (and pos (not (ring-empty-p comint-input-ring))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1419 (insert (ring-ref comint-input-ring pos)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1420 ;; Restore partial unfinished input. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1421 (when (> (length comint-stored-incomplete-input) 0) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1422 (insert comint-stored-incomplete-input)))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1423 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1424 (defun comint-history-isearch-search () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1425 "Return the proper search function, for Isearch in input history." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1426 (cond |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1427 (isearch-word |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1428 (if isearch-forward 'word-search-forward 'word-search-backward)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1429 (t |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1430 (lambda (string bound noerror) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1431 (let ((search-fun |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1432 ;; Use standard functions to search within comint text |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1433 (cond |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1434 (isearch-regexp |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1435 (if isearch-forward 're-search-forward 're-search-backward)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1436 (t |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1437 (if isearch-forward 'search-forward 'search-backward)))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1438 found) |
106485
85eebb6799d7
Don't lazy-highlight the comint output in history Isearch mode.
Juri Linkov <juri@jurta.org>
parents:
106362
diff
changeset
|
1439 ;; Avoid lazy-highlighting matches in the comint prompt and in the |
85eebb6799d7
Don't lazy-highlight the comint output in history Isearch mode.
Juri Linkov <juri@jurta.org>
parents:
106362
diff
changeset
|
1440 ;; output when searching forward. Lazy-highlight calls this lambda |
85eebb6799d7
Don't lazy-highlight the comint output in history Isearch mode.
Juri Linkov <juri@jurta.org>
parents:
106362
diff
changeset
|
1441 ;; with the bound arg, so skip the prompt and the output. |
85eebb6799d7
Don't lazy-highlight the comint output in history Isearch mode.
Juri Linkov <juri@jurta.org>
parents:
106362
diff
changeset
|
1442 (if (and bound isearch-forward (not (comint-after-pmark-p))) |
85eebb6799d7
Don't lazy-highlight the comint output in history Isearch mode.
Juri Linkov <juri@jurta.org>
parents:
106362
diff
changeset
|
1443 (goto-char (process-mark (get-buffer-process (current-buffer))))) |
106206
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1444 (or |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1445 ;; 1. First try searching in the initial comint text |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1446 (funcall search-fun string |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1447 (if isearch-forward bound (comint-line-beginning-position)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1448 noerror) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1449 ;; 2. If the above search fails, start putting next/prev history |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1450 ;; elements in the comint successively, and search the string |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1451 ;; in them. Do this only when bound is nil (i.e. not while |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1452 ;; lazy-highlighting search strings in the current comint text). |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1453 (unless bound |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1454 (condition-case nil |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1455 (progn |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1456 (while (not found) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1457 (cond (isearch-forward |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1458 ;; Signal an error here explicitly, because |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1459 ;; `comint-next-input' doesn't signal an error. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1460 (when (null comint-input-ring-index) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1461 (error "End of history; no next item")) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1462 (comint-next-input 1) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1463 (goto-char (comint-line-beginning-position))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1464 (t |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1465 ;; Signal an error here explicitly, because |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1466 ;; `comint-previous-input' doesn't signal an error. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1467 (when (eq comint-input-ring-index |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1468 (1- (ring-length comint-input-ring))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1469 (error "Beginning of history; no preceding item")) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1470 (comint-previous-input 1) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1471 (goto-char (point-max)))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1472 (setq isearch-barrier (point) isearch-opoint (point)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1473 ;; After putting the next/prev history element, search |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1474 ;; the string in them again, until comint-next-input |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1475 ;; or comint-previous-input raises an error at the |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1476 ;; beginning/end of history. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1477 (setq found (funcall search-fun string |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1478 (unless isearch-forward |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1479 ;; For backward search, don't search |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1480 ;; in the comint prompt |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1481 (comint-line-beginning-position)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1482 noerror))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1483 ;; Return point of the new search result |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1484 (point)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1485 ;; Return nil on the error "no next/preceding item" |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1486 (error nil))))))))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1487 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1488 (defun comint-history-isearch-message (&optional c-q-hack ellipsis) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1489 "Display the input history search prompt. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1490 If there are no search errors, this function displays an overlay with |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1491 the Isearch prompt which replaces the original comint prompt. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1492 Otherwise, it displays the standard Isearch message returned from |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1493 `isearch-message'." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1494 (if (not (and isearch-success (not isearch-error))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1495 ;; Use standard function `isearch-message' when not in comint prompt, |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1496 ;; or search fails, or has an error (like incomplete regexp). |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1497 ;; This function displays isearch message in the echo area, |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1498 ;; so it's possible to see what is wrong in the search string. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1499 (isearch-message c-q-hack ellipsis) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1500 ;; Otherwise, put the overlay with the standard isearch prompt over |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1501 ;; the initial comint prompt. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1502 (if (overlayp comint-history-isearch-message-overlay) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1503 (move-overlay comint-history-isearch-message-overlay |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1504 (save-excursion (forward-line 0) (point)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1505 (comint-line-beginning-position)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1506 (setq comint-history-isearch-message-overlay |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1507 (make-overlay (save-excursion (forward-line 0) (point)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1508 (comint-line-beginning-position))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1509 (overlay-put comint-history-isearch-message-overlay 'evaporate t)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1510 (overlay-put comint-history-isearch-message-overlay |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1511 'display (isearch-message-prefix c-q-hack ellipsis)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1512 ;; And clear any previous isearch message. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1513 (message ""))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1514 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1515 (defun comint-history-isearch-wrap () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1516 "Wrap the input history search when search fails. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1517 Move point to the first history element for a forward search, |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1518 or to the last history element for a backward search." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1519 (unless isearch-word |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1520 ;; When `comint-history-isearch-search' fails on reaching the |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1521 ;; beginning/end of the history, wrap the search to the first/last |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1522 ;; input history element. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1523 (if isearch-forward |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1524 (comint-goto-input (1- (ring-length comint-input-ring))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1525 (comint-goto-input nil)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1526 (setq isearch-success t)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1527 (goto-char (if isearch-forward (comint-line-beginning-position) (point-max)))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1528 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1529 (defun comint-history-isearch-push-state () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1530 "Save a function restoring the state of input history search. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1531 Save `comint-input-ring-index' to the additional state parameter |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1532 in the search status stack." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1533 `(lambda (cmd) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1534 (comint-history-isearch-pop-state cmd ,comint-input-ring-index))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1535 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1536 (defun comint-history-isearch-pop-state (cmd hist-pos) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1537 "Restore the input history search state. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1538 Go to the history element by the absolute history position HIST-POS." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1539 (comint-goto-input hist-pos)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1540 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1541 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1542 (defun comint-within-quotes (beg end) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1543 "Return t if the number of quotes between BEG and END is odd. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1544 Quotes are single and double." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1545 (let ((countsq (comint-how-many-region "\\(^\\|[^\\\\]\\)\'" beg end)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1546 (countdq (comint-how-many-region "\\(^\\|[^\\\\]\\)\"" beg end))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1547 (or (= (mod countsq 2) 1) (= (mod countdq 2) 1)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1548 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1549 (defun comint-how-many-region (regexp beg end) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1550 "Return number of matches for REGEXP from BEG to END." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1551 (let ((count 0)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1552 (save-excursion |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1553 (save-match-data |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1554 (goto-char beg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1555 (while (re-search-forward regexp end t) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1556 (setq count (1+ count))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1557 count)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1558 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1559 (defun comint-args (string begin end) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1560 ;; From STRING, return the args depending on the range specified in the text |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1561 ;; from BEGIN to END. If BEGIN is nil, assume all args. Ignore leading `:'. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1562 ;; Range can be x-y, x-, -y, where x/y can be [0-9], *, ^, $. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1563 (save-match-data |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1564 (if (null begin) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1565 (comint-arguments string 0 nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1566 (let* ((range (buffer-substring |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1567 (if (eq (char-after begin) ?:) (1+ begin) begin) end)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1568 (nth (cond ((string-match "^[*^]" range) 1) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1569 ((string-match "^-" range) 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1570 ((string-equal range "$") nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1571 (t (string-to-number range)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1572 (mth (cond ((string-match "[-*$]$" range) nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1573 ((string-match "-" range) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1574 (string-to-number (substring range (match-end 0)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1575 (t nth)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1576 (comint-arguments string nth mth))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1577 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1578 (defun comint-delim-arg (arg) |
54879 | 1579 "Return a list of arguments from ARG. |
1580 Break it up at the delimiters in `comint-delimiter-argument-list'. | |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1581 Returned list is backwards. |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1582 |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1583 Characters with non-nil values of the text property `literal' are |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1584 assumed to have literal values (e.g., backslash-escaped |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1585 characters), and are not considered to be delimiters." |
6154
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1586 (if (null comint-delimiter-argument-list) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1587 (list arg) |
6154
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1588 (let ((args nil) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1589 (pos 0) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1590 (len (length arg))) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1591 (while (< pos len) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1592 (let ((char (aref arg pos)) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1593 (start pos)) |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1594 (if (and (memq char comint-delimiter-argument-list) |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1595 ;; Ignore backslash-escaped characters. |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1596 (not (get-text-property pos 'literal arg))) |
6154
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1597 (while (and (< pos len) (eq (aref arg pos) char)) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1598 (setq pos (1+ pos))) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1599 (while (and (< pos len) |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1600 (not (and (memq (aref arg pos) |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1601 comint-delimiter-argument-list) |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1602 (not (get-text-property |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1603 pos 'literal arg))))) |
6154
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1604 (setq pos (1+ pos)))) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1605 (setq args (cons (substring arg start pos) args)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1606 args))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1607 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1608 (defun comint-arguments (string nth mth) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1609 "Return from STRING the NTH to MTH arguments. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1610 NTH and/or MTH can be nil, which means the last argument. |
6154
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1611 Returned arguments are separated by single spaces. |
24968
ced85898ea55
(comint-arguments): Handle \ followed by space or tab.
Karl Heuer <kwzh@gnu.org>
parents:
24893
diff
changeset
|
1612 We assume whitespace separates arguments, except within quotes |
ced85898ea55
(comint-arguments): Handle \ followed by space or tab.
Karl Heuer <kwzh@gnu.org>
parents:
24893
diff
changeset
|
1613 and except for a space or tab that immediately follows a backslash. |
6154
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1614 Also, a run of one or more of a single character |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1615 in `comint-delimiter-argument-list' is a separate argument. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1616 Argument 0 is the command name." |
23209
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1617 ;; The first line handles ordinary characters and backslash-sequences |
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1618 ;; (except with w32 msdos-like shells, where backslashes are valid). |
21018
edbd4156cf68
(comint-arguments): Treat \" and such as part of one arg.
Richard M. Stallman <rms@gnu.org>
parents:
20986
diff
changeset
|
1619 ;; The second matches "-quoted strings. |
edbd4156cf68
(comint-arguments): Treat \" and such as part of one arg.
Richard M. Stallman <rms@gnu.org>
parents:
20986
diff
changeset
|
1620 ;; The third matches '-quoted strings. |
edbd4156cf68
(comint-arguments): Treat \" and such as part of one arg.
Richard M. Stallman <rms@gnu.org>
parents:
20986
diff
changeset
|
1621 ;; The fourth matches `-quoted strings. |
edbd4156cf68
(comint-arguments): Treat \" and such as part of one arg.
Richard M. Stallman <rms@gnu.org>
parents:
20986
diff
changeset
|
1622 ;; This seems to fit the syntax of BASH 2.0. |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1623 (let* ((backslash-escape (not (and (fboundp 'w32-shell-dos-semantics) |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1624 (w32-shell-dos-semantics)))) |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1625 (first (if backslash-escape |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1626 "[^ \n\t\"'`\\]\\|\\(\\\\.\\)\\|" |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1627 "[^ \n\t\"'`]+\\|")) |
23209
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1628 (argpart (concat first |
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1629 "\\(\"\\([^\"\\]\\|\\\\.\\)*\"\\|\ |
21018
edbd4156cf68
(comint-arguments): Treat \" and such as part of one arg.
Richard M. Stallman <rms@gnu.org>
parents:
20986
diff
changeset
|
1630 '[^']*'\\|\ |
23209
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1631 `[^`]*`\\)")) |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1632 (quote-subexpr (if backslash-escape 2 1)) |
23209
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1633 (args ()) (pos 0) |
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1634 (count 0) |
54879 | 1635 beg str quotes) |
8616
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1636 ;; Build a list of all the args until we have as many as we want. |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1637 (while (and (or (null mth) (<= count mth)) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1638 (string-match argpart string pos)) |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1639 ;; Apply the `literal' text property to backslash-escaped |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1640 ;; characters, so that `comint-delim-arg' won't break them up. |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1641 (and backslash-escape |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1642 (match-beginning 1) |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1643 (put-text-property (match-beginning 1) (match-end 1) |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1644 'literal t string)) |
8616
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1645 (if (and beg (= pos (match-beginning 0))) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1646 ;; It's contiguous, part of the same arg. |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1647 (setq pos (match-end 0) |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1648 quotes (or quotes (match-beginning quote-subexpr))) |
8616
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1649 ;; It's a new separate arg. |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1650 (if beg |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1651 ;; Put the previous arg, if there was one, onto ARGS. |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1652 (setq str (substring string beg pos) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1653 args (if quotes (cons str args) |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
1654 (nconc (comint-delim-arg str) args)))) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
1655 (setq count (length args)) |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1656 (setq quotes (match-beginning quote-subexpr)) |
8616
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1657 (setq beg (match-beginning 0)) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1658 (setq pos (match-end 0)))) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1659 (if beg |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1660 (setq str (substring string beg pos) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1661 args (if quotes (cons str args) |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
1662 (nconc (comint-delim-arg str) args)))) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
1663 (setq count (length args)) |
8616
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1664 (let ((n (or nth (1- count))) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1665 (m (if mth (1- (- count mth)) 0))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1666 (mapconcat |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1667 (function (lambda (a) a)) (nthcdr n (nreverse (nthcdr m args))) " ")))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1668 |
14169 | 1669 ;; |
1670 ;; Input processing stuff | |
1671 ;; | |
33138
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1672 (defun comint-add-to-input-history (cmd) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1673 "Add CMD to the input history. |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1674 Ignore duplicates if `comint-input-ignoredups' is non-nil." |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1675 (if (and (funcall comint-input-filter cmd) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1676 (or (null comint-input-ignoredups) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1677 (not (ring-p comint-input-ring)) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1678 (ring-empty-p comint-input-ring) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1679 (not (string-equal (ring-ref comint-input-ring 0) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1680 cmd)))) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1681 (ring-insert comint-input-ring cmd))) |
584 | 1682 |
61449
a8e7bc540c1c
(comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents:
61404
diff
changeset
|
1683 (defun comint-send-input (&optional no-newline artificial) |
1356 | 1684 "Send input to process. |
1685 After the process output mark, sends all text from the process mark to | |
40828
966dca4af18e
(comint-send-input): Fix description of `comint-process-echoes' in the
Miles Bader <miles@gnu.org>
parents:
40003
diff
changeset
|
1686 point as input to the process. Before the process output mark, calls |
966dca4af18e
(comint-send-input): Fix description of `comint-process-echoes' in the
Miles Bader <miles@gnu.org>
parents:
40003
diff
changeset
|
1687 value of variable `comint-get-old-input' to retrieve old input, copies |
61449
a8e7bc540c1c
(comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents:
61404
diff
changeset
|
1688 it to the process mark, and sends it. |
a8e7bc540c1c
(comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents:
61404
diff
changeset
|
1689 |
a8e7bc540c1c
(comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents:
61404
diff
changeset
|
1690 This command also sends and inserts a final newline, unless |
a8e7bc540c1c
(comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents:
61404
diff
changeset
|
1691 NO-NEWLINE is non-nil. |
114 | 1692 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1693 Any history reference may be expanded depending on the value of the variable |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1694 `comint-input-autoexpand'. The list of function names contained in the value |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1695 of `comint-input-filter-functions' is called on the input before sending it. |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1696 The input is entered into the input history ring, if the value of variable |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1697 `comint-input-filter' returns non-nil when called on the input. |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
1698 |
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
1699 If variable `comint-eol-on-send' is non-nil, then point is moved to the |
2539
577c77cfd199
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
2518
diff
changeset
|
1700 end of line before sending the input. |
114 | 1701 |
40828
966dca4af18e
(comint-send-input): Fix description of `comint-process-echoes' in the
Miles Bader <miles@gnu.org>
parents:
40003
diff
changeset
|
1702 After the input has been sent, if `comint-process-echoes' is non-nil, |
54879 | 1703 then `comint-send-input' waits to see if the process outputs a string |
40828
966dca4af18e
(comint-send-input): Fix description of `comint-process-echoes' in the
Miles Bader <miles@gnu.org>
parents:
40003
diff
changeset
|
1704 matching the input, and if so, deletes that part of the output. |
61449
a8e7bc540c1c
(comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents:
61404
diff
changeset
|
1705 If ARTIFICIAL is non-nil, it inhibits such deletion. |
a8e7bc540c1c
(comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents:
61404
diff
changeset
|
1706 Callers sending input not from the user should use ARTIFICIAL = t. |
40828
966dca4af18e
(comint-send-input): Fix description of `comint-process-echoes' in the
Miles Bader <miles@gnu.org>
parents:
40003
diff
changeset
|
1707 |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1708 The values of `comint-get-old-input', `comint-input-filter-functions', and |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1709 `comint-input-filter' are chosen according to the command interpreter running |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1710 in the buffer. E.g., |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1711 |
114 | 1712 If the interpreter is the csh, |
54879 | 1713 `comint-get-old-input' is the default: |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
1714 If `comint-use-prompt-regexp' is nil, then |
38971
478f11ee1d4c
(comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents:
38848
diff
changeset
|
1715 either return the current input field, if point is on an input |
478f11ee1d4c
(comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents:
38848
diff
changeset
|
1716 field, or the current line, if point is on an output field. |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
1717 If `comint-use-prompt-regexp' is non-nil, then |
38971
478f11ee1d4c
(comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents:
38848
diff
changeset
|
1718 return the current line with any initial string matching the |
478f11ee1d4c
(comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents:
38848
diff
changeset
|
1719 regexp `comint-prompt-regexp' removed. |
54879 | 1720 `comint-input-filter-functions' monitors input for \"cd\", \"pushd\", and |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1721 \"popd\" commands. When it sees one, it cd's the buffer. |
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1722 `comint-input-filter' is the default: returns t if the input isn't all white |
584 | 1723 space. |
114 | 1724 |
54879 | 1725 If the Comint is Lucid Common Lisp, |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1726 `comint-get-old-input' snarfs the sexp ending at point. |
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1727 `comint-input-filter-functions' does nothing. |
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1728 `comint-input-filter' returns nil if the input matches input-filter-regexp, |
32326 | 1729 which matches (1) all whitespace (2) :a, :c, etc. |
114 | 1730 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1731 Similarly for Soar, Scheme, etc." |
114 | 1732 (interactive) |
1733 ;; Note that the input string does not include its terminal newline. | |
584 | 1734 (let ((proc (get-buffer-process (current-buffer)))) |
1735 (if (not proc) (error "Current buffer has no process") | |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1736 (widen) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1737 (let* ((pmark (process-mark proc)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1738 (intxt (if (>= (point) (marker-position pmark)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1739 (progn (if comint-eol-on-send (end-of-line)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1740 (buffer-substring pmark (point))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1741 (let ((copy (funcall comint-get-old-input))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1742 (goto-char pmark) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1743 (insert copy) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1744 copy))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1745 (input (if (not (eq comint-input-autoexpand 'input)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1746 ;; Just whatever's already there |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1747 intxt |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1748 ;; Expand and leave it visible in buffer |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1749 (comint-replace-by-expanded-history t pmark) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1750 (buffer-substring pmark (point)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1751 (history (if (not (eq comint-input-autoexpand 'history)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1752 input |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1753 ;; This is messy 'cos ultimately the original |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1754 ;; functions used do insertion, rather than return |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1755 ;; strings. We have to expand, then insert back. |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1756 (comint-replace-by-expanded-history t pmark) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1757 (let ((copy (buffer-substring pmark (point))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1758 (start (point))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1759 (insert input) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1760 (delete-region pmark start) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1761 copy)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1762 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1763 (unless no-newline |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1764 (insert ?\n)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1765 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1766 (comint-add-to-input-history history) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1767 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1768 (run-hook-with-args 'comint-input-filter-functions |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1769 (if no-newline input |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1770 (concat input "\n"))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1771 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1772 (let ((beg (marker-position pmark)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1773 (end (if no-newline (point) (1- (point)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1774 (inhibit-modification-hooks t)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1775 (when (> end beg) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1776 (add-text-properties beg end |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1777 '(front-sticky t |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1778 font-lock-face comint-highlight-input)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1779 (unless comint-use-prompt-regexp |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1780 ;; Give old user input a field property of `input', to |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1781 ;; distinguish it from both process output and unsent |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1782 ;; input. The terminating newline is put into a special |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1783 ;; `boundary' field to make cursor movement between input |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1784 ;; and output fields smoother. |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1785 (add-text-properties |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1786 beg end |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1787 '(mouse-face highlight |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1788 help-echo "mouse-2: insert after prompt as new input" |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1789 field input)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1790 (unless (or no-newline comint-use-prompt-regexp) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1791 ;; Cover the terminating newline |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1792 (add-text-properties end (1+ end) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1793 '(rear-nonsticky t |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1794 field boundary |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1795 inhibit-line-move-field-capture t)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1796 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1797 (comint-snapshot-last-prompt) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1798 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1799 (setq comint-save-input-ring-index comint-input-ring-index) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1800 (setq comint-input-ring-index nil) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1801 ;; Update the markers before we send the input |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1802 ;; in case we get output amidst sending the input. |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1803 (set-marker comint-last-input-start pmark) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1804 (set-marker comint-last-input-end (point)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1805 (set-marker (process-mark proc) (point)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1806 ;; clear the "accumulation" marker |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1807 (set-marker comint-accum-marker nil) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1808 (let ((comint-input-sender-no-newline no-newline)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1809 (funcall comint-input-sender proc input)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1810 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1811 ;; Optionally delete echoed input (after checking it). |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1812 (when (and comint-process-echoes (not artificial)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1813 (let ((echo-len (- comint-last-input-end |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1814 comint-last-input-start))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1815 ;; Wait for all input to be echoed: |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1816 (while (and (accept-process-output proc) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1817 (> (+ comint-last-input-end echo-len) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1818 (point-max)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1819 (zerop |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1820 (compare-buffer-substrings |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1821 nil comint-last-input-start |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1822 (- (point-max) echo-len) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1823 ;; Above difference is equivalent to |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1824 ;; (+ comint-last-input-start |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1825 ;; (- (point-max) comint-last-input-end)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1826 nil comint-last-input-end (point-max))))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1827 (if (and |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1828 (<= (+ comint-last-input-end echo-len) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1829 (point-max)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1830 (zerop |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1831 (compare-buffer-substrings |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1832 nil comint-last-input-start comint-last-input-end |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1833 nil comint-last-input-end |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1834 (+ comint-last-input-end echo-len)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1835 ;; Certain parts of the text to be deleted may have |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1836 ;; been mistaken for prompts. We have to prevent |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1837 ;; problems when `comint-prompt-read-only' is non-nil. |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1838 (let ((inhibit-read-only t)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1839 (delete-region comint-last-input-end |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1840 (+ comint-last-input-end echo-len)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1841 (when comint-prompt-read-only |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1842 (save-excursion |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1843 (goto-char comint-last-input-end) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1844 (comint-update-fence))))))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1845 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1846 ;; This used to call comint-output-filter-functions, |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1847 ;; but that scrolled the buffer in undesirable ways. |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1848 (run-hook-with-args 'comint-output-filter-functions ""))))) |
114 | 1849 |
32326 | 1850 (defvar comint-preoutput-filter-functions nil |
26616
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1851 "List of functions to call before inserting Comint output into the buffer. |
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1852 Each function gets one argument, a string containing the text received |
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1853 from the subprocess. It should return the string to insert, perhaps |
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1854 the same string that was received, or perhaps a modified or transformed |
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1855 string. |
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1856 |
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1857 The functions on the list are called sequentially, and each one is |
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1858 given the string returned by the previous one. The string returned by |
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1859 the last function is the text that is actually inserted in the |
26627 | 1860 redirection buffer. |
26616
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1861 |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1862 You can use `add-hook' to add functions to this list |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1863 either globally or locally.") |
19515
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
1864 |
46941
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1865 (defvar comint-inhibit-carriage-motion nil |
54879 | 1866 "If nil, Comint will interpret `carriage control' characters in output. |
46941
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1867 See `comint-carriage-motion' for details.") |
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1868 |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1869 ;; When non-nil, this is an overlay over the last recognized prompt in |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1870 ;; the buffer; it is used when highlighting the prompt. |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1871 (defvar comint-last-prompt-overlay nil) |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1872 |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1873 (defun comint-snapshot-last-prompt () |
54879 | 1874 "`snapshot' any current `comint-last-prompt-overlay'. |
63175
b09a11c8c73e
(comint-check-proc, make-comint-in-buffer, comint-source-default): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
63172
diff
changeset
|
1875 Freeze its attributes in place, even when more input comes along |
54879 | 1876 and moves the prompt overlay." |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1877 (when comint-last-prompt-overlay |
55881
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
1878 (let ((inhibit-read-only t) |
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
1879 (inhibit-modification-hooks t)) |
45826
ffa13f09e36d
(comint-snapshot-last-prompt): Bind `inhibit-read-only' to t to support
Juanma Barranquero <lekktu@gmail.com>
parents:
45794
diff
changeset
|
1880 (add-text-properties (overlay-start comint-last-prompt-overlay) |
76897
56f63de10254
(comint-send-input): Widen the buffer first.
Chong Yidong <cyd@stupidchicken.com>
parents:
76767
diff
changeset
|
1881 (overlay-end comint-last-prompt-overlay) |
56f63de10254
(comint-send-input): Widen the buffer first.
Chong Yidong <cyd@stupidchicken.com>
parents:
76767
diff
changeset
|
1882 (overlay-properties comint-last-prompt-overlay))))) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1883 |
46941
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1884 (defun comint-carriage-motion (start end) |
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1885 "Interpret carriage control characters in the region from START to END. |
37928
689e6d3dbdc2
(comint-carriage-motion): Doc-string tweaks.
Miles Bader <miles@gnu.org>
parents:
37921
diff
changeset
|
1886 Translate carriage return/linefeed sequences to linefeeds. |
689e6d3dbdc2
(comint-carriage-motion): Doc-string tweaks.
Miles Bader <miles@gnu.org>
parents:
37921
diff
changeset
|
1887 Make single carriage returns delete to the beginning of the line. |
46941
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1888 Make backspaces delete the previous character." |
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1889 (save-excursion |
92482
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1890 ;; We used to check the existence of \b and \r at first to avoid |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1891 ;; calling save-match-data and save-restriction. But, such a |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1892 ;; check is not necessary now because we don't use regexp search |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1893 ;; nor save-restriction. Note that the buffer is already widen, |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1894 ;; and calling narrow-to-region and widen are not that heavy. |
47073
714225426f8e
(comint-carriage-motion): Start at START.
Miles Bader <miles@gnu.org>
parents:
46941
diff
changeset
|
1895 (goto-char start) |
92482
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1896 (let* ((inhibit-field-text-motion t) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1897 (inhibit-read-only t) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1898 (lbeg (line-beginning-position)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1899 delete-end ch) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1900 ;; If the preceding text is marked as "must-overwrite", record |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1901 ;; it in delete-end. |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1902 (when (and (> start (point-min)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1903 (get-text-property (1- start) 'comint-must-overwrite)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1904 (setq delete-end (point-marker)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1905 (remove-text-properties lbeg start '(comint-must-overwrite nil))) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1906 (narrow-to-region lbeg end) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1907 ;; Handle BS, LF, and CR specially. |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1908 (while (and (skip-chars-forward "^\b\n\r") (not (eobp))) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1909 (setq ch (following-char)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1910 (cond ((= ch ?\b) ; CH = BS |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1911 (delete-char 1) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1912 (if (> (point) lbeg) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1913 (delete-char -1))) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1914 ((= ch ?\n) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1915 (when delete-end ; CH = LF |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1916 (if (< delete-end (point)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1917 (delete-region lbeg delete-end)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1918 (set-marker delete-end nil) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1919 (setq delete-end nil)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1920 (forward-char 1) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1921 (setq lbeg (point))) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1922 (t ; CH = CR |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1923 (delete-char 1) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1924 (if delete-end |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1925 (when (< delete-end (point)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1926 (delete-region lbeg delete-end) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1927 (move-marker delete-end (point))) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1928 (setq delete-end (point-marker)))))) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1929 (when delete-end |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1930 (if (< delete-end (point)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1931 ;; As there's a text after the last CR, make the current |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1932 ;; line contain only that text. |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1933 (delete-region lbeg delete-end) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1934 ;; Remember that the process output ends by CR, and thus we |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1935 ;; must overwrite the contents of the current line next |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1936 ;; time. |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1937 (put-text-property lbeg delete-end 'comint-must-overwrite t)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1938 (set-marker delete-end nil)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1939 (widen)))) |
39182
ed28d0187d3c
(comint-send-input): Handle comint-process-echoes
Gerd Moellmann <gerd@gnu.org>
parents:
39124
diff
changeset
|
1940 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1941 ;; The purpose of using this filter for comint processes |
2683
21ab70613c42
(comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2680
diff
changeset
|
1942 ;; is to keep comint-last-input-end from moving forward |
21ab70613c42
(comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2680
diff
changeset
|
1943 ;; when output is inserted. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1944 (defun comint-output-filter (process string) |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
1945 (let ((oprocbuf (process-buffer process))) |
26174
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1946 ;; First check for killed buffer or no input. |
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1947 (when (and string oprocbuf (buffer-name oprocbuf)) |
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1948 (with-current-buffer oprocbuf |
30740
46364997df9c
(comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents:
30735
diff
changeset
|
1949 ;; Run preoutput filters |
26174
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1950 (let ((functions comint-preoutput-filter-functions)) |
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1951 (while (and functions string) |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1952 (if (eq (car functions) t) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
1953 (let ((functions |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
1954 (default-value 'comint-preoutput-filter-functions))) |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1955 (while (and functions string) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1956 (setq string (funcall (car functions) string)) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1957 (setq functions (cdr functions)))) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1958 (setq string (funcall (car functions) string))) |
26174
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1959 (setq functions (cdr functions)))) |
30735
7960e7b84348
(comint-send-input): Make the newline boundary overlay rear-nonsticky.
Miles Bader <miles@gnu.org>
parents:
30731
diff
changeset
|
1960 |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1961 ;; Insert STRING |
50966
379cf00d7016
(comint-carriage-motion, comint-output-filter):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49549
diff
changeset
|
1962 (let ((inhibit-read-only t) |
95899
d5d7186027e2
* progmodes/compile.el (compilation-start): Don't disable undo in
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95777
diff
changeset
|
1963 ;; The point should float after any insertion we do. |
d5d7186027e2
* progmodes/compile.el (compilation-start): Don't disable undo in
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95777
diff
changeset
|
1964 (saved-point (copy-marker (point) t))) |
31038 | 1965 |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1966 ;; We temporarly remove any buffer narrowing, in case the |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1967 ;; process mark is outside of the restriction |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1968 (save-restriction |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1969 (widen) |
30740
46364997df9c
(comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents:
30735
diff
changeset
|
1970 |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1971 (goto-char (process-mark process)) |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1972 (set-marker comint-last-output-start (point)) |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1973 |
31581 | 1974 ;; insert-before-markers is a bad thing. XXX |
95777
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
1975 ;; Luckily we don't have to use it any more, we use |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
1976 ;; window-point-insertion-type instead. |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
1977 (insert string) |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1978 |
31581 | 1979 ;; Advance process-mark |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1980 (set-marker (process-mark process) (point)) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1981 |
46941
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1982 (unless comint-inhibit-carriage-motion |
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1983 ;; Interpret any carriage motion characters (newline, backspace) |
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1984 (comint-carriage-motion comint-last-output-start (point))) |
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1985 |
61592
7c224837fcfe
(comint-output-filter): Run comint-output-filter-functions
Richard M. Stallman <rms@gnu.org>
parents:
61449
diff
changeset
|
1986 ;; Run these hooks with point where the user had it. |
7c224837fcfe
(comint-output-filter): Run comint-output-filter-functions
Richard M. Stallman <rms@gnu.org>
parents:
61449
diff
changeset
|
1987 (goto-char saved-point) |
45916
e8271a03c1eb
(comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents:
45898
diff
changeset
|
1988 (run-hook-with-args 'comint-output-filter-functions string) |
61592
7c224837fcfe
(comint-output-filter): Run comint-output-filter-functions
Richard M. Stallman <rms@gnu.org>
parents:
61449
diff
changeset
|
1989 (set-marker saved-point (point)) |
46941
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1990 |
45916
e8271a03c1eb
(comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents:
45898
diff
changeset
|
1991 (goto-char (process-mark process)) ; in case a filter moved it |
e8271a03c1eb
(comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents:
45898
diff
changeset
|
1992 |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
1993 (unless comint-use-prompt-regexp |
55881
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
1994 (let ((inhibit-read-only t) |
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
1995 (inhibit-modification-hooks t)) |
45826
ffa13f09e36d
(comint-snapshot-last-prompt): Bind `inhibit-read-only' to t to support
Juanma Barranquero <lekktu@gmail.com>
parents:
45794
diff
changeset
|
1996 (add-text-properties comint-last-output-start (point) |
98232
e3190eb9e11b
(comint-output-filter): Make output field properties front-sticky
Miles Bader <miles@gnu.org>
parents:
97764
diff
changeset
|
1997 '(front-sticky |
e3190eb9e11b
(comint-output-filter): Make output field properties front-sticky
Miles Bader <miles@gnu.org>
parents:
97764
diff
changeset
|
1998 (field inhibit-line-move-field-capture) |
e3190eb9e11b
(comint-output-filter): Make output field properties front-sticky
Miles Bader <miles@gnu.org>
parents:
97764
diff
changeset
|
1999 rear-nonsticky t |
55223
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2000 field output |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2001 inhibit-line-move-field-capture t)))) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2002 |
45727
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
2003 ;; Highlight the prompt, where we define `prompt' to mean |
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
2004 ;; the most recent output that doesn't end with a newline. |
55223
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2005 (let ((prompt-start (save-excursion (forward-line 0) (point))) |
55881
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
2006 (inhibit-read-only t) |
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
2007 (inhibit-modification-hooks t)) |
55223
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2008 (when comint-prompt-read-only |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2009 (or (= (point-min) prompt-start) |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2010 (get-text-property (1- prompt-start) 'read-only) |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2011 (put-text-property |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2012 (1- prompt-start) prompt-start 'read-only 'fence)) |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2013 (add-text-properties |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2014 prompt-start (point) |
57420
bcfb3a26a3bd
(comint-output-filter): Typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57419
diff
changeset
|
2015 '(read-only t rear-nonsticky t front-sticky (read-only)))) |
55223
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2016 (unless (and (bolp) (null comint-last-prompt-overlay)) |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2017 ;; Need to create or move the prompt overlay (in the case |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2018 ;; where there is no prompt ((bolp) == t), we still do |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2019 ;; this if there's already an existing overlay). |
45727
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
2020 (if comint-last-prompt-overlay |
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
2021 ;; Just move an existing overlay |
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
2022 (move-overlay comint-last-prompt-overlay |
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
2023 prompt-start (point)) |
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
2024 ;; Need to create the overlay |
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
2025 (setq comint-last-prompt-overlay |
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
2026 (make-overlay prompt-start (point))) |
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
2027 (overlay-put comint-last-prompt-overlay |
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
2028 'font-lock-face 'comint-highlight-prompt)))) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
2029 |
45916
e8271a03c1eb
(comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents:
45898
diff
changeset
|
2030 (goto-char saved-point))))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2031 |
4890
dab300dfe449
(comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
4880
diff
changeset
|
2032 (defun comint-preinput-scroll-to-bottom () |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2033 "Go to the end of buffer in all windows showing it. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2034 Movement occurs if point in the selected window is not after the process mark, |
63502
f0f76b7d0f74
(comint-replace-by-expanded-filename, comint-prompt-regexp,
Juanma Barranquero <lekktu@gmail.com>
parents:
63175
diff
changeset
|
2035 and `this-command' is an insertion command. Insertion commands recognized |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2036 are `self-insert-command', `comint-magic-space', `yank', and `hilit-yank'. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2037 Depends on the value of `comint-scroll-to-bottom-on-input'. |
2683
21ab70613c42
(comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2680
diff
changeset
|
2038 |
4890
dab300dfe449
(comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
4880
diff
changeset
|
2039 This function should be a pre-command hook." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2040 (if (and comint-scroll-to-bottom-on-input |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
2041 (memq this-command '(self-insert-command comint-magic-space yank |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2042 hilit-yank))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2043 (let* ((selected (selected-window)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2044 (current (current-buffer)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2045 (process (get-buffer-process current)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2046 (scroll comint-scroll-to-bottom-on-input)) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2047 (if (and process (< (point) (process-mark process))) |
5122
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
2048 (if (eq scroll 'this) |
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
2049 (goto-char (point-max)) |
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
2050 (walk-windows |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2051 (lambda (window) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2052 (if (and (eq (window-buffer window) current) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2053 (or (eq scroll t) (eq scroll 'all))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2054 (progn |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2055 (select-window window) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2056 (goto-char (point-max)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2057 (select-window selected)))) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2058 nil t)))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2059 |
4890
dab300dfe449
(comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
4880
diff
changeset
|
2060 (defun comint-postoutput-scroll-to-bottom (string) |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
2061 "Go to the end of buffer in some or all windows showing it. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2062 Does not scroll if the current line is the last line in the buffer. |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
2063 Depends on the value of `comint-move-point-for-output' and |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2064 `comint-scroll-show-maximum-output'. |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
2065 |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
2066 This function should be in the list `comint-output-filter-functions'." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2067 (let* ((selected (selected-window)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2068 (current (current-buffer)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2069 (process (get-buffer-process current)) |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
2070 (scroll comint-move-point-for-output)) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2071 (unwind-protect |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2072 (if process |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2073 (walk-windows |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2074 (lambda (window) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2075 (when (eq (window-buffer window) current) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2076 (select-window window) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2077 (if (and (< (point) (process-mark process)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2078 (or (eq scroll t) (eq scroll 'all) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2079 ;; Maybe user wants point to jump to end. |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2080 (and (eq scroll 'this) (eq selected window)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2081 (and (eq scroll 'others) (not (eq selected window))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2082 ;; If point was at the end, keep it at end. |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2083 (and (marker-position comint-last-output-start) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2084 (>= (point) comint-last-output-start)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2085 (goto-char (process-mark process))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2086 ;; Optionally scroll so that the text |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2087 ;; ends at the bottom of the window. |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2088 (if (and comint-scroll-show-maximum-output |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2089 (= (point) (point-max))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2090 (save-excursion |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2091 (goto-char (point-max)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2092 (recenter (- -1 scroll-margin)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2093 (select-window selected))) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2094 nil t)) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2095 (set-buffer current)))) |
2683
21ab70613c42
(comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2680
diff
changeset
|
2096 |
10833
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
2097 (defun comint-truncate-buffer (&optional string) |
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
2098 "Truncate the buffer to `comint-buffer-maximum-size'. |
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
2099 This function could be on `comint-output-filter-functions' or bound to a key." |
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
2100 (interactive) |
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
2101 (save-excursion |
15654
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
2102 (goto-char (process-mark (get-buffer-process (current-buffer)))) |
10833
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
2103 (forward-line (- comint-buffer-maximum-size)) |
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
2104 (beginning-of-line) |
50966
379cf00d7016
(comint-carriage-motion, comint-output-filter):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49549
diff
changeset
|
2105 (let ((inhibit-read-only t)) |
379cf00d7016
(comint-carriage-motion, comint-output-filter):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49549
diff
changeset
|
2106 (delete-region (point-min) (point))))) |
10833
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
2107 |
9245
b2440a22efc2
(comint-strip-ctrl-m): Renamed from shell-strip-crtl-m and moved here.
Richard M. Stallman <rms@gnu.org>
parents:
9067
diff
changeset
|
2108 (defun comint-strip-ctrl-m (&optional string) |
b2440a22efc2
(comint-strip-ctrl-m): Renamed from shell-strip-crtl-m and moved here.
Richard M. Stallman <rms@gnu.org>
parents:
9067
diff
changeset
|
2109 "Strip trailing `^M' characters from the current output group. |
10833
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
2110 This function could be on `comint-output-filter-functions' or bound to a key." |
9245
b2440a22efc2
(comint-strip-ctrl-m): Renamed from shell-strip-crtl-m and moved here.
Richard M. Stallman <rms@gnu.org>
parents:
9067
diff
changeset
|
2111 (interactive) |
b2440a22efc2
(comint-strip-ctrl-m): Renamed from shell-strip-crtl-m and moved here.
Richard M. Stallman <rms@gnu.org>
parents:
9067
diff
changeset
|
2112 (let ((pmark (process-mark (get-buffer-process (current-buffer))))) |
b2440a22efc2
(comint-strip-ctrl-m): Renamed from shell-strip-crtl-m and moved here.
Richard M. Stallman <rms@gnu.org>
parents:
9067
diff
changeset
|
2113 (save-excursion |
20458
ad0d2c5040a0
(comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents:
20020
diff
changeset
|
2114 (condition-case nil |
ad0d2c5040a0
(comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents:
20020
diff
changeset
|
2115 (goto-char |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
105195
diff
changeset
|
2116 (if (called-interactively-p 'interactive) |
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
105195
diff
changeset
|
2117 comint-last-input-end comint-last-output-start)) |
20458
ad0d2c5040a0
(comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents:
20020
diff
changeset
|
2118 (error nil)) |
9245
b2440a22efc2
(comint-strip-ctrl-m): Renamed from shell-strip-crtl-m and moved here.
Richard M. Stallman <rms@gnu.org>
parents:
9067
diff
changeset
|
2119 (while (re-search-forward "\r+$" pmark t) |
b2440a22efc2
(comint-strip-ctrl-m): Renamed from shell-strip-crtl-m and moved here.
Richard M. Stallman <rms@gnu.org>
parents:
9067
diff
changeset
|
2120 (replace-match "" t t))))) |
b2440a22efc2
(comint-strip-ctrl-m): Renamed from shell-strip-crtl-m and moved here.
Richard M. Stallman <rms@gnu.org>
parents:
9067
diff
changeset
|
2121 (defalias 'shell-strip-ctrl-m 'comint-strip-ctrl-m) |
b2440a22efc2
(comint-strip-ctrl-m): Renamed from shell-strip-crtl-m and moved here.
Richard M. Stallman <rms@gnu.org>
parents:
9067
diff
changeset
|
2122 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2123 (defun comint-show-maximum-output () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2124 "Put the end of the buffer at the bottom of the window." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2125 (interactive) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2126 (goto-char (point-max)) |
64169
20da0da3a956
(comint-postoutput-scroll-to-bottom)
Eli Zaretskii <eliz@gnu.org>
parents:
64091
diff
changeset
|
2127 (recenter (- -1 scroll-margin))) |
2683
21ab70613c42
(comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2680
diff
changeset
|
2128 |
114 | 2129 (defun comint-get-old-input-default () |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
2130 "Default for `comint-get-old-input'. |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2131 If `comint-use-prompt-regexp' is nil, then either |
38971
478f11ee1d4c
(comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents:
38848
diff
changeset
|
2132 return the current input field, if point is on an input field, or the |
478f11ee1d4c
(comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents:
38848
diff
changeset
|
2133 current line, if point is on an output field. |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2134 If `comint-use-prompt-regexp' is non-nil, then return |
38971
478f11ee1d4c
(comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents:
38848
diff
changeset
|
2135 the current line with any initial string matching the regexp |
478f11ee1d4c
(comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents:
38848
diff
changeset
|
2136 `comint-prompt-regexp' removed." |
478f11ee1d4c
(comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents:
38848
diff
changeset
|
2137 (let ((bof (field-beginning))) |
478f11ee1d4c
(comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents:
38848
diff
changeset
|
2138 (if (eq (get-char-property bof 'field) 'input) |
45916
e8271a03c1eb
(comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents:
45898
diff
changeset
|
2139 (field-string-no-properties bof) |
38971
478f11ee1d4c
(comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents:
38848
diff
changeset
|
2140 (comint-bol) |
45732
5555fce97d97
Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents:
45727
diff
changeset
|
2141 (buffer-substring-no-properties (point) (line-end-position))))) |
584 | 2142 |
70575
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2143 (defun comint-copy-old-input () |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2144 "Insert after prompt old input at point as new input to be edited. |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2145 Calls `comint-get-old-input' to get old input." |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2146 (interactive) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2147 (let ((input (funcall comint-get-old-input)) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2148 (process (get-buffer-process (current-buffer)))) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2149 (if (not process) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2150 (error "Current buffer has no process") |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2151 (goto-char (process-mark process)) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2152 (insert input)))) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2153 |
584 | 2154 (defun comint-skip-prompt () |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
2155 "Skip past the text matching regexp `comint-prompt-regexp'. |
584 | 2156 If this takes us past the end of the current line, don't skip at all." |
54879 | 2157 (if (and (looking-at comint-prompt-regexp) |
2158 (<= (match-end 0) (line-end-position))) | |
2159 (goto-char (match-end 0)))) | |
584 | 2160 |
2161 (defun comint-after-pmark-p () | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2162 "Return t if point is after the process output marker." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2163 (let ((pmark (process-mark (get-buffer-process (current-buffer))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2164 (<= (marker-position pmark) (point)))) |
584 | 2165 |
2166 (defun comint-simple-send (proc string) | |
2167 "Default function for sending to PROC input STRING. | |
54879 | 2168 This just sends STRING plus a newline. To override this, |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
2169 set the hook `comint-input-sender'." |
78193
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2170 (let ((send-string |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2171 (if comint-input-sender-no-newline |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2172 string |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2173 ;; Sending as two separate strings does not work |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2174 ;; on Windows, so concat the \n before sending. |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2175 (concat string "\n")))) |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2176 (comint-send-string proc send-string)) |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2177 (if (and comint-input-sender-no-newline |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2178 (not (string-equal string ""))) |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2179 (process-send-eof))) |
114 | 2180 |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2181 (defun comint-line-beginning-position () |
54879 | 2182 "Return the buffer position of the beginning of the line, after any prompt. |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2183 If `comint-use-prompt-regexp' is non-nil, then the prompt skip is done by |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2184 skipping text matching the regular expression `comint-prompt-regexp', |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2185 a buffer local variable." |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2186 (if comint-use-prompt-regexp |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2187 ;; Use comint-prompt-regexp |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2188 (save-excursion |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2189 (beginning-of-line) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2190 (comint-skip-prompt) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2191 (point)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2192 ;; Use input fields. Note that, unlike the behavior of |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2193 ;; `line-beginning-position' inside a field, this function will |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2194 ;; return the position of the end of a prompt, even if the point is |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2195 ;; already inside the prompt. In order to do this, it assumes that |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2196 ;; if there are two fields on a line, then the first one is the |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2197 ;; prompt, and the second one is an input field, and is front-sticky |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2198 ;; (as input fields should be). |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2199 (constrain-to-field (line-beginning-position) (line-end-position)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2200 |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2201 (defun comint-bol (&optional arg) |
54879 | 2202 "Go to the beginning of line, then skip past the prompt, if any. |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2203 If prefix argument is given (\\[universal-argument]) the prompt is not skipped. |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2204 If `comint-use-prompt-regexp' is non-nil, then the prompt skip is done |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2205 by skipping text matching the regular expression `comint-prompt-regexp', |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2206 a buffer local variable." |
114 | 2207 (interactive "P") |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2208 (if arg |
30782
bc1377250f7c
(comint-bol): Use `forward-line 0' instead of calling beginning-of-line
Miles Bader <miles@gnu.org>
parents:
30768
diff
changeset
|
2209 ;; Unlike `beginning-of-line', forward-line ignores field boundaries |
bc1377250f7c
(comint-bol): Use `forward-line 0' instead of calling beginning-of-line
Miles Bader <miles@gnu.org>
parents:
30768
diff
changeset
|
2210 (forward-line 0) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2211 (goto-char (comint-line-beginning-position)))) |
114 | 2212 |
58588
a44a4cdb021d
(comint-read-noecho): Add trivial compatibility definition.
Richard M. Stallman <rms@gnu.org>
parents:
58375
diff
changeset
|
2213 ;; For compatibility. |
a44a4cdb021d
(comint-read-noecho): Add trivial compatibility definition.
Richard M. Stallman <rms@gnu.org>
parents:
58375
diff
changeset
|
2214 (defun comint-read-noecho (prompt &optional ignore) |
a44a4cdb021d
(comint-read-noecho): Add trivial compatibility definition.
Richard M. Stallman <rms@gnu.org>
parents:
58375
diff
changeset
|
2215 (read-passwd prompt)) |
a44a4cdb021d
(comint-read-noecho): Add trivial compatibility definition.
Richard M. Stallman <rms@gnu.org>
parents:
58375
diff
changeset
|
2216 |
14169 | 2217 ;; These three functions are for entering text you don't want echoed or |
2218 ;; saved -- typically passwords to ftp, telnet, or somesuch. | |
57539
8c6fc4afae74
(comint-output-filter-functions): Add comint-watch-for-password-prompt.
Richard M. Stallman <rms@gnu.org>
parents:
57420
diff
changeset
|
2219 ;; Just enter m-x send-invisible and type in your line. |
705 | 2220 |
53391
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2221 (defun send-invisible (&optional prompt) |
1356 | 2222 "Read a string without echoing. |
13702
f7bf7f756503
Use comint-input-sender to send text (Peter Gabriel <gabriel@or.iabg.de>).
Simon Marshall <simon@gnu.org>
parents:
13271
diff
changeset
|
2223 Then send it to the process running in the current buffer. |
f7bf7f756503
Use comint-input-sender to send text (Peter Gabriel <gabriel@or.iabg.de>).
Simon Marshall <simon@gnu.org>
parents:
13271
diff
changeset
|
2224 The string is sent using `comint-input-sender'. |
584 | 2225 Security bug: your string can still be temporarily recovered with |
53391
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2226 \\[view-lossage]; `clear-this-command-keys' can fix that." |
17159
6f1e715cbd58
minor bug fixes/enhancements to comint-delchar-or-maybe-eof, send-invisible, comint-exec-1.
Simon Marshall <simon@gnu.org>
parents:
16944
diff
changeset
|
2227 (interactive "P") ; Defeat snooping via C-x ESC ESC |
64819
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2228 (let ((proc (get-buffer-process (current-buffer))) |
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2229 (prefix |
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2230 (if (eq (window-buffer (selected-window)) (current-buffer)) |
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2231 "" |
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2232 (format "(In buffer %s) " |
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2233 (current-buffer))))) |
53391
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2234 (if proc |
64819
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2235 (let ((str (read-passwd (concat prefix |
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2236 (or prompt "Non-echoed text: "))))) |
53391
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2237 (if (stringp str) |
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2238 (progn |
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2239 (comint-snapshot-last-prompt) |
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2240 (funcall comint-input-sender proc str)) |
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2241 (message "Warning: text will be echoed"))) |
64819
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2242 (error "Buffer %s has no process" (current-buffer))))) |
114 | 2243 |
32326 | 2244 (defun comint-watch-for-password-prompt (string) |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
2245 "Prompt in the minibuffer for password and send without echoing. |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
2246 This function uses `send-invisible' to read and send a password to the buffer's |
32326 | 2247 process if STRING contains a password prompt defined by |
8087
c22d7c5168f5
comint-password-prompt-regexp: New variable.
Noah Friedman <friedman@splode.com>
parents:
8060
diff
changeset
|
2248 `comint-password-prompt-regexp'. |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
2249 |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
2250 This function could be in the list `comint-output-filter-functions'." |
32196
219a95f2ef05
(comint-watch-for-password-prompt): Use STRING as a prompt.
Miles Bader <miles@gnu.org>
parents:
31970
diff
changeset
|
2251 (when (string-match comint-password-prompt-regexp string) |
44663
0dc61586b801
(comint-watch-for-password-prompt): Remove whitespace
Francesco Potortì <pot@gnu.org>
parents:
44646
diff
changeset
|
2252 (when (string-match "^[ \n\r\t\v\f\b\a]+" string) |
0dc61586b801
(comint-watch-for-password-prompt): Remove whitespace
Francesco Potortì <pot@gnu.org>
parents:
44646
diff
changeset
|
2253 (setq string (replace-match "" t t string))) |
53391
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2254 (send-invisible string))) |
114 | 2255 |
14169 | 2256 ;; Low-level process communication |
114 | 2257 |
30766
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
2258 (defun comint-send-string (process string) |
54879 | 2259 "Like `process-send-string', but also does extra bookkeeping for Comint mode." |
34606
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
2260 (if process |
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
2261 (with-current-buffer (if (processp process) |
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
2262 (process-buffer process) |
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
2263 (get-buffer process)) |
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
2264 (comint-snapshot-last-prompt)) |
30766
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
2265 (comint-snapshot-last-prompt)) |
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
2266 (process-send-string process string)) |
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
2267 |
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
2268 (defun comint-send-region (process start end) |
54879 | 2269 "Like `process-send-region', but also does extra bookkeeping for Comint mode." |
34606
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
2270 (if process |
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
2271 (with-current-buffer (if (processp process) |
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
2272 (process-buffer process) |
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
2273 (get-buffer process)) |
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
2274 (comint-snapshot-last-prompt)) |
30766
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
2275 (comint-snapshot-last-prompt)) |
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
2276 (process-send-region process start end)) |
39713
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2277 |
114 | 2278 |
14169 | 2279 ;; Random input hackage |
114 | 2280 |
32613
6aece997f0f9
(comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents:
32598
diff
changeset
|
2281 (defun comint-delete-output () |
32631
ba88cc6434f3
(comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents:
32623
diff
changeset
|
2282 "Delete all output from interpreter since last input. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2283 Does not delete the prompt." |
114 | 2284 (interactive) |
6998
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2285 (let ((proc (get-buffer-process (current-buffer))) |
55123
a27729919ff1
(comint-delete-output): Bind inhibit-read-only to t.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54879
diff
changeset
|
2286 (replacement nil) |
a27729919ff1
(comint-delete-output): Bind inhibit-read-only to t.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54879
diff
changeset
|
2287 (inhibit-read-only t)) |
6998
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2288 (save-excursion |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2289 (let ((pmark (progn (goto-char (process-mark proc)) |
32598 | 2290 (forward-line 0) |
6998
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2291 (point-marker)))) |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2292 (delete-region comint-last-input-end pmark) |
12519
dd3560e3254c
(comint-kill-output): Preserve entire partial line at
Karl Heuer <kwzh@gnu.org>
parents:
12208
diff
changeset
|
2293 (goto-char (process-mark proc)) |
6998
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2294 (setq replacement (concat "*** output flushed ***\n" |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2295 (buffer-substring pmark (point)))) |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2296 (delete-region pmark (point)))) |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2297 ;; Output message and put back prompt |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2298 (comint-output-filter proc replacement))) |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
2299 (define-obsolete-function-alias 'comint-kill-output |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2300 'comint-delete-output "21.1") |
114 | 2301 |
32635
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2302 (defun comint-write-output (filename &optional append mustbenew) |
32631
ba88cc6434f3
(comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents:
32623
diff
changeset
|
2303 "Write output from interpreter since last input to FILENAME. |
ba88cc6434f3
(comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents:
32623
diff
changeset
|
2304 Any prompt at the end of the output is not written. |
ba88cc6434f3
(comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents:
32623
diff
changeset
|
2305 |
32635
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2306 If the optional argument APPEND (the prefix argument when interactive) |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2307 is non-nil, the output is appended to the file instead. |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2308 |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2309 If the optional argument MUSTBENEW is non-nil, check for an existing |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2310 file with the same name. If MUSTBENEW is `excl', that means to get an |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2311 error if the file already exists; never overwrite. If MUSTBENEW is |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2312 neither nil nor `excl', that means ask for confirmation before |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2313 overwriting, but do go ahead and overwrite the file if the user |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2314 confirms. When interactive, MUSTBENEW is nil when appending, and t |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2315 otherwise." |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2316 (interactive |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2317 (list (read-file-name |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2318 (if current-prefix-arg |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2319 "Append output to file: " |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2320 "Write output to file: ")) |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2321 current-prefix-arg |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2322 (not current-prefix-arg))) |
32631
ba88cc6434f3
(comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents:
32623
diff
changeset
|
2323 (save-excursion |
ba88cc6434f3
(comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents:
32623
diff
changeset
|
2324 (goto-char (process-mark (get-buffer-process (current-buffer)))) |
ba88cc6434f3
(comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents:
32623
diff
changeset
|
2325 (forward-line 0) |
32635
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2326 (write-region comint-last-input-end (point) filename |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2327 append nil nil mustbenew))) |
32631
ba88cc6434f3
(comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents:
32623
diff
changeset
|
2328 |
32892
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
2329 ;; This function exists for the benefit of the menu; from the keyboard, |
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
2330 ;; users can just use `comint-write-output' with a prefix arg. |
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
2331 (defun comint-append-output-to-file (filename) |
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
2332 "Append output from interpreter since last input to FILENAME. |
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
2333 Any prompt at the end of the output is not written." |
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
2334 (interactive "fAppend output to file: ") |
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
2335 (comint-write-output filename t)) |
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
2336 |
114 | 2337 (defun comint-show-output () |
584 | 2338 "Display start of this batch of interpreter output at top of window. |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
2339 Sets mark to the value of point when this command is run." |
114 | 2340 (interactive) |
5593
58c0f2c7dfae
(comint-show-output): Leave point at start of output, but push the mark.
Richard M. Stallman <rms@gnu.org>
parents:
5539
diff
changeset
|
2341 (push-mark) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2342 (let ((pos (or (marker-position comint-last-input-end) (point-max)))) |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2343 (cond (comint-use-prompt-regexp |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2344 (goto-char pos) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2345 (beginning-of-line 0) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2346 (set-window-start (selected-window) (point)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2347 (comint-skip-prompt)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2348 (t |
98385
8f747339c80c
(comint-show-output): Adjust to stickiness changes of the output field.
Romain Francoise <romain@orebokech.com>
parents:
98356
diff
changeset
|
2349 (goto-char (field-beginning pos)) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2350 (set-window-start (selected-window) (point)))))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2351 |
114 | 2352 |
2353 (defun comint-interrupt-subjob () | |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2354 "Interrupt the current subjob. |
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2355 This command also kills the pending input |
54879 | 2356 between the process mark and point." |
114 | 2357 (interactive) |
45836
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2358 (comint-skip-input) |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
2359 (interrupt-process nil comint-ptyp) |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2360 ;; (process-send-string nil "\n") |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2361 ) |
114 | 2362 |
2363 (defun comint-kill-subjob () | |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2364 "Send kill signal to the current subjob. |
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2365 This command also kills the pending input |
54879 | 2366 between the process mark and point." |
114 | 2367 (interactive) |
45836
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2368 (comint-skip-input) |
584 | 2369 (kill-process nil comint-ptyp)) |
114 | 2370 |
2371 (defun comint-quit-subjob () | |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2372 "Send quit signal to the current subjob. |
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2373 This command also kills the pending input |
54879 | 2374 between the process mark and point." |
114 | 2375 (interactive) |
45836
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2376 (comint-skip-input) |
584 | 2377 (quit-process nil comint-ptyp)) |
114 | 2378 |
2379 (defun comint-stop-subjob () | |
584 | 2380 "Stop the current subjob. |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2381 This command also kills the pending input |
54879 | 2382 between the process mark and point. |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2383 |
114 | 2384 WARNING: if there is no current subjob, you can end up suspending |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
2385 the top-level process running in the buffer. If you accidentally do |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
2386 this, use \\[comint-continue-subjob] to resume the process. (This |
584 | 2387 is not a problem with most shells, since they ignore this signal.)" |
114 | 2388 (interactive) |
45836
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2389 (comint-skip-input) |
584 | 2390 (stop-process nil comint-ptyp)) |
114 | 2391 |
2392 (defun comint-continue-subjob () | |
584 | 2393 "Send CONT signal to process buffer's process group. |
114 | 2394 Useful if you accidentally suspend the top-level process." |
2395 (interactive) | |
584 | 2396 (continue-process nil comint-ptyp)) |
114 | 2397 |
45836
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2398 (defun comint-skip-input () |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2399 "Skip all pending input, from last stuff output by interpreter to point. |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2400 This means mark it as if it had been sent as input, without sending it." |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2401 (let ((comint-input-sender 'ignore) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2402 (comint-input-filter-functions nil)) |
61449
a8e7bc540c1c
(comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents:
61404
diff
changeset
|
2403 (comint-send-input t t)) |
45836
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2404 (end-of-line) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2405 (let ((pos (point)) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2406 (marker (process-mark (get-buffer-process (current-buffer))))) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2407 (insert " " (key-description (this-command-keys))) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2408 (if (= marker pos) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2409 (set-marker marker (point))))) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2410 |
114 | 2411 (defun comint-kill-input () |
584 | 2412 "Kill all text from last stuff output by interpreter to point." |
114 | 2413 (interactive) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2414 (let ((pmark (process-mark (get-buffer-process (current-buffer))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2415 (if (> (point) (marker-position pmark)) |
584 | 2416 (kill-region pmark (point))))) |
114 | 2417 |
2418 (defun comint-delchar-or-maybe-eof (arg) | |
17159
6f1e715cbd58
minor bug fixes/enhancements to comint-delchar-or-maybe-eof, send-invisible, comint-exec-1.
Simon Marshall <simon@gnu.org>
parents:
16944
diff
changeset
|
2419 "Delete ARG characters forward or send an EOF to subprocess. |
6f1e715cbd58
minor bug fixes/enhancements to comint-delchar-or-maybe-eof, send-invisible, comint-exec-1.
Simon Marshall <simon@gnu.org>
parents:
16944
diff
changeset
|
2420 Sends an EOF only if point is at the end of the buffer and there is no input." |
114 | 2421 (interactive "p") |
17269
b177ee3c4f0e
(comint-delchar-or-maybe-eof): Check for null proc.
Karl Heuer <kwzh@gnu.org>
parents:
17159
diff
changeset
|
2422 (let ((proc (get-buffer-process (current-buffer)))) |
b177ee3c4f0e
(comint-delchar-or-maybe-eof): Check for null proc.
Karl Heuer <kwzh@gnu.org>
parents:
17159
diff
changeset
|
2423 (if (and (eobp) proc (= (point) (marker-position (process-mark proc)))) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
2424 (comint-send-eof) |
17159
6f1e715cbd58
minor bug fixes/enhancements to comint-delchar-or-maybe-eof, send-invisible, comint-exec-1.
Simon Marshall <simon@gnu.org>
parents:
16944
diff
changeset
|
2425 (delete-char arg)))) |
584 | 2426 |
4112
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2427 (defun comint-send-eof () |
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2428 "Send an EOF to the current buffer's process." |
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2429 (interactive) |
61449
a8e7bc540c1c
(comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents:
61404
diff
changeset
|
2430 (comint-send-input t t) |
4112
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2431 (process-send-eof)) |
584 | 2432 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2433 |
54879 | 2434 (defun comint-backward-matching-input (regexp n) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2435 "Search backward through buffer for input fields that match REGEXP. |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2436 If `comint-use-prompt-regexp' is non-nil, then input fields are identified |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2437 by lines that match `comint-prompt-regexp'. |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2438 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2439 With prefix argument N, search for Nth previous match. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2440 If N is negative, find the next or Nth next match." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2441 (interactive (comint-regexp-arg "Backward input matching (regexp): ")) |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2442 (if comint-use-prompt-regexp |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2443 ;; Use comint-prompt-regexp |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2444 (let* ((re (concat comint-prompt-regexp ".*" regexp)) |
54879 | 2445 (pos (save-excursion (end-of-line (if (> n 0) 0 1)) |
2446 (if (re-search-backward re nil t n) | |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2447 (point))))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2448 (if (null pos) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2449 (progn (message "Not found") |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2450 (ding)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2451 (goto-char pos) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2452 (comint-bol nil))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2453 ;; Use input fields |
54879 | 2454 (let* ((dir (if (< n 0) -1 1)) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2455 (pos |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2456 (save-excursion |
54879 | 2457 (while (/= n 0) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2458 (unless (re-search-backward regexp nil t dir) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2459 (error "Not found")) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2460 (when (eq (get-char-property (point) 'field) 'input) |
54879 | 2461 (setq n (- n dir)))) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2462 (field-beginning)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2463 (goto-char pos)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2464 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2465 |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
2466 (defun comint-forward-matching-input (regexp n) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2467 "Search forward through buffer for input fields that match REGEXP. |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2468 If `comint-use-prompt-regexp' is non-nil, then input fields are identified |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2469 by lines that match `comint-prompt-regexp'. |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2470 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2471 With prefix argument N, search for Nth following match. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2472 If N is negative, find the previous or Nth previous match." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2473 (interactive (comint-regexp-arg "Forward input matching (regexp): ")) |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
2474 (comint-backward-matching-input regexp (- n))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2475 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2476 |
4112
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2477 (defun comint-next-prompt (n) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2478 "Move to end of Nth next prompt in the buffer. |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2479 If `comint-use-prompt-regexp' is nil, then this means the beginning of |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2480 the Nth next `input' field, otherwise, it means the Nth occurrence of |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2481 text matching `comint-prompt-regexp'." |
4112
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2482 (interactive "p") |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2483 (if comint-use-prompt-regexp |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2484 ;; Use comint-prompt-regexp |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2485 (let ((paragraph-start comint-prompt-regexp)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2486 (end-of-line (if (> n 0) 1 0)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2487 (forward-paragraph n) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2488 (comint-skip-prompt)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2489 ;; Use input fields |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2490 (let ((pos (point)) |
38977
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2491 (input-pos nil) |
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2492 prev-pos) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2493 (while (/= n 0) |
38977
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2494 (setq prev-pos pos) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2495 (setq pos |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2496 (if (> n 0) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2497 (next-single-char-property-change pos 'field) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2498 (previous-single-char-property-change pos 'field))) |
38977
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2499 (cond ((or (null pos) (= pos prev-pos)) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2500 ;; Ran off the end of the buffer. |
38977
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2501 (when (> n 0) |
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2502 ;; There's always an input field at the end of the |
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2503 ;; buffer, but it has a `field' property of nil. |
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2504 (setq input-pos (point-max))) |
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2505 ;; stop iterating |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2506 (setq n 0)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2507 ((eq (get-char-property pos 'field) 'input) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2508 (setq n (if (< n 0) (1+ n) (1- n))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2509 (setq input-pos pos)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2510 (when input-pos |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2511 (goto-char input-pos))))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2512 |
584 | 2513 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2514 (defun comint-previous-prompt (n) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2515 "Move to end of Nth previous prompt in the buffer. |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2516 If `comint-use-prompt-regexp' is nil, then this means the beginning of |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2517 the Nth previous `input' field, otherwise, it means the Nth occurrence of |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2518 text matching `comint-prompt-regexp'." |
4112
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2519 (interactive "p") |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2520 (comint-next-prompt (- n))) |
39713
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2521 |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2522 ;; State used by `comint-insert-previous-argument' when cycling. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2523 (defvar comint-insert-previous-argument-last-start-pos nil) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2524 (make-variable-buffer-local 'comint-insert-previous-argument-last-start-pos) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2525 (defvar comint-insert-previous-argument-last-index nil) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2526 (make-variable-buffer-local 'comint-insert-previous-argument-last-index) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2527 |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2528 ;; Needs fixing: |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2529 ;; make comint-arguments understand negative indices as bash does |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2530 (defun comint-insert-previous-argument (index) |
54879 | 2531 "Insert the INDEXth argument from the previous Comint command-line at point. |
39713
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2532 Spaces are added at beginning and/or end of the inserted string if |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2533 necessary to ensure that it's separated from adjacent arguments. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2534 Interactively, if no prefix argument is given, the last argument is inserted. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2535 Repeated interactive invocations will cycle through the same argument |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2536 from progressively earlier commands (using the value of INDEX specified |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2537 with the first command). |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2538 This command is like `M-.' in bash." |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2539 (interactive "P") |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2540 (unless (null index) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2541 (setq index (prefix-numeric-value index))) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2542 (cond ((eq last-command this-command) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2543 ;; Delete last input inserted by this command. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2544 (delete-region comint-insert-previous-argument-last-start-pos (point)) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2545 (setq index comint-insert-previous-argument-last-index)) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2546 (t |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2547 ;; This is a non-repeat invocation, so initialize state. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2548 (setq comint-input-ring-index nil) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2549 (setq comint-insert-previous-argument-last-index index) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2550 (when (null comint-insert-previous-argument-last-start-pos) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2551 ;; First usage; initialize to a marker |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2552 (setq comint-insert-previous-argument-last-start-pos |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2553 (make-marker))))) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2554 ;; Make sure we're not in the prompt, and add a beginning space if necess. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2555 (if (<= (point) (comint-line-beginning-position)) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2556 (comint-bol) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2557 (just-one-space)) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2558 ;; Remember the beginning of what we insert, so we can delete it if |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2559 ;; the command is repeated. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2560 (set-marker comint-insert-previous-argument-last-start-pos (point)) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2561 ;; Insert the argument. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2562 (let ((input-string (comint-previous-input-string 0))) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2563 (when (string-match "[ \t\n]*&" input-string) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2564 ;; strip terminating '&' |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2565 (setq input-string (substring input-string 0 (match-beginning 0)))) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2566 (insert (comint-arguments input-string index index))) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2567 ;; Make next invocation return arg from previous input |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2568 (setq comint-input-ring-index (1+ (or comint-input-ring-index 0))) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2569 ;; Add a terminating space if necessary. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2570 (unless (eolp) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2571 (just-one-space))) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2572 |
114 | 2573 |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2574 ;; Support editing with `comint-prompt-read-only' set to t. |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2575 |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2576 (defun comint-update-fence () |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2577 "Update read-only status of newline before point. |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2578 The `fence' read-only property is used to indicate that a newline |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2579 is read-only for no other reason than to \"fence off\" a |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2580 following front-sticky read-only region. This is used to |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2581 implement comint read-only prompts. If the text after a newline |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2582 changes, the read-only status of that newline may need updating. |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2583 That is what this function does. |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2584 |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2585 This function does nothing if point is not at the beginning of a |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2586 line, or is at the beginning of the accessible portion of the buffer. |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2587 Otherwise, if the character after point has a front-sticky |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2588 read-only property, then the preceding newline is given a |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2589 read-only property of `fence', unless it already is read-only. |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2590 If the character after point does not have a front-sticky |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2591 read-only property, any read-only property of `fence' on the |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2592 preceding newline is removed." |
55881
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
2593 (let* ((pt (point)) (lst (get-text-property pt 'front-sticky)) |
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
2594 (inhibit-modification-hooks t)) |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2595 (and (bolp) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2596 (not (bobp)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2597 (if (and (get-text-property pt 'read-only) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2598 (if (listp lst) (memq 'read-only lst) t)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2599 (unless (get-text-property (1- pt) 'read-only) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2600 (put-text-property (1- pt) pt 'read-only 'fence)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2601 (when (eq (get-text-property (1- pt) 'read-only) 'fence) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2602 (remove-list-of-text-properties (1- pt) pt '(read-only))))))) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2603 |
70963
098d9b195f6e
(comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70575
diff
changeset
|
2604 (defun comint-kill-whole-line (&optional count) |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2605 "Kill current line, ignoring read-only and field properties. |
70963
098d9b195f6e
(comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70575
diff
changeset
|
2606 With prefix arg COUNT, kill that many lines starting from the current line. |
098d9b195f6e
(comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70575
diff
changeset
|
2607 If COUNT is negative, kill backward. Also kill the preceding newline, |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
2608 instead of the trailing one. \(This is meant to make \\[repeat] work well |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2609 with negative arguments.) |
70963
098d9b195f6e
(comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70575
diff
changeset
|
2610 If COUNT is zero, kill current line but exclude the trailing newline. |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2611 The read-only status of newlines is updated with `comint-update-fence', |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2612 if necessary." |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2613 (interactive "p") |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2614 (let ((inhibit-read-only t) (inhibit-field-text-motion t)) |
70963
098d9b195f6e
(comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70575
diff
changeset
|
2615 (kill-whole-line count) |
098d9b195f6e
(comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70575
diff
changeset
|
2616 (when (>= count 0) (comint-update-fence)))) |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2617 |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2618 (defun comint-kill-region (beg end &optional yank-handler) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2619 "Like `kill-region', but ignores read-only properties, if safe. |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2620 This command assumes that the buffer contains read-only |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2621 \"prompts\" which are regions with front-sticky read-only |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2622 properties at the beginning of a line, with the preceding newline |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2623 being read-only to protect the prompt. This is true of the |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2624 comint prompts if `comint-prompt-read-only' is non-nil. This |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2625 command will not delete the region if this would create mutilated |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2626 or out of place prompts. That is, if any part of a prompt is |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2627 deleted, the entire prompt must be deleted and all remaining |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2628 prompts should stay at the beginning of a line. If this is not |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2629 the case, this command just calls `kill-region' with all |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2630 read-only properties intact. The read-only status of newlines is |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2631 updated using `comint-update-fence', if necessary." |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2632 (interactive "r") |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2633 (save-excursion |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2634 (let* ((true-beg (min beg end)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2635 (true-end (max beg end)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2636 (beg-bolp (progn (goto-char true-beg) (bolp))) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2637 (beg-lst (get-text-property true-beg 'front-sticky)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2638 (beg-bad (and (get-text-property true-beg 'read-only) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2639 (if (listp beg-lst) (memq 'read-only beg-lst) t))) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2640 (end-bolp (progn (goto-char true-end) (bolp))) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2641 (end-lst (get-text-property true-end 'front-sticky)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2642 (end-bad (and (get-text-property true-end 'read-only) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2643 (if (listp end-lst) (memq 'read-only end-lst) t)))) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2644 (if (or (and (not beg-bolp) (or beg-bad end-bad)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2645 (and (not end-bolp) end-bad)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2646 (kill-region beg end yank-handler) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2647 (let ((inhibit-read-only t)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2648 (kill-region beg end yank-handler) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2649 (comint-update-fence)))))) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2650 |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2651 |
14169 | 2652 ;; Support for source-file processing commands. |
2653 ;;============================================================================ | |
2654 ;; Many command-interpreters (e.g., Lisp, Scheme, Soar) have | |
2655 ;; commands that process files of source text (e.g. loading or compiling | |
42205 | 2656 ;; files). So the corresponding process-in-a-buffer modes have commands |
2657 ;; for doing this (e.g., lisp-load-file). The functions below are useful | |
14169 | 2658 ;; for defining these commands. |
2659 ;; | |
2660 ;; Alas, these guys don't do exactly the right thing for Lisp, Scheme | |
2661 ;; and Soar, in that they don't know anything about file extensions. | |
2662 ;; So the compile/load interface gets the wrong default occasionally. | |
2663 ;; The load-file/compile-file default mechanism could be smarter -- it | |
2664 ;; doesn't know about the relationship between filename extensions and | |
42205 | 2665 ;; whether the file is source or executable. If you compile foo.lisp |
14169 | 2666 ;; with compile-file, then the next load-file should use foo.bin for |
42205 | 2667 ;; the default, not foo.lisp. This is tricky to do right, particularly |
14169 | 2668 ;; because the extension for executable files varies so much (.o, .bin, |
2669 ;; .lbin, .mo, .vo, .ao, ...). | |
114 | 2670 |
2671 | |
14169 | 2672 ;; COMINT-SOURCE-DEFAULT -- determines defaults for source-file processing |
2673 ;; commands. | |
2674 ;; | |
2675 ;; COMINT-CHECK-SOURCE -- if FNAME is in a modified buffer, asks you if you | |
2676 ;; want to save the buffer before issuing any process requests to the command | |
2677 ;; interpreter. | |
2678 ;; | |
2679 ;; COMINT-GET-SOURCE -- used by the source-file processing commands to prompt | |
2680 ;; for the file to process. | |
114 | 2681 |
2682 (defun comint-source-default (previous-dir/file source-modes) | |
54879 | 2683 "Compute the defaults for `load-file' and `compile-file' commands. |
2684 | |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
2685 PREVIOUS-DIR/FILE is a pair (DIRECTORY . FILENAME) from the last |
63175
b09a11c8c73e
(comint-check-proc, make-comint-in-buffer, comint-source-default): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
63172
diff
changeset
|
2686 source-file processing command, or nil if there hasn't been one yet. |
54879 | 2687 SOURCE-MODES is a list used to determine what buffers contain source |
2688 files: if the major mode of the buffer is in SOURCE-MODES, it's source. | |
2689 Typically, (lisp-mode) or (scheme-mode). | |
2690 | |
2691 If the command is given while the cursor is inside a string, *and* | |
2692 the string is an existing filename, *and* the filename is not a directory, | |
2693 then the string is taken as default. This allows you to just position | |
2694 your cursor over a string that's a filename and have it taken as default. | |
2695 | |
2696 If the command is given in a file buffer whose major mode is in | |
2697 SOURCE-MODES, then the filename is the default file, and the | |
2698 file's directory is the default directory. | |
2699 | |
2700 If the buffer isn't a source file buffer (e.g., it's the process buffer), | |
2701 then the default directory & file are what was used in the last source-file | |
2702 processing command (i.e., PREVIOUS-DIR/FILE). If this is the first time | |
2703 the command has been run (PREVIOUS-DIR/FILE is nil), the default directory | |
2704 is the cwd, with no default file. (\"no default file\" = nil) | |
2705 | |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
2706 SOURCE-MODES is typically going to be something like (tea-mode) |
54879 | 2707 for T programs, (lisp-mode) for Lisp programs, (soar-mode lisp-mode) |
2708 for Soar programs, etc. | |
2709 | |
2710 The function returns a pair: (default-directory . default-file)." | |
114 | 2711 (cond ((and buffer-file-name (memq major-mode source-modes)) |
2712 (cons (file-name-directory buffer-file-name) | |
2713 (file-name-nondirectory buffer-file-name))) | |
2714 (previous-dir/file) | |
2715 (t | |
2716 (cons default-directory nil)))) | |
2717 | |
584 | 2718 |
114 | 2719 (defun comint-check-source (fname) |
54879 | 2720 "Check whether to save buffers visiting file FNAME. |
2721 Prior to loading or compiling (or otherwise processing) a file (in the CMU | |
2722 process-in-a-buffer modes), this function can be called on the filename. | |
2723 If the file is loaded into a buffer, and the buffer is modified, the user | |
2724 is queried to see if he wants to save the buffer before proceeding with | |
2725 the load or compile." | |
114 | 2726 (let ((buff (get-file-buffer fname))) |
2727 (if (and buff | |
2728 (buffer-modified-p buff) | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2729 (y-or-n-p (format "Save buffer %s first? " (buffer-name buff)))) |
114 | 2730 ;; save BUFF. |
2731 (let ((old-buffer (current-buffer))) | |
2732 (set-buffer buff) | |
2733 (save-buffer) | |
2734 (set-buffer old-buffer))))) | |
2735 | |
2736 (defun comint-extract-string () | |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
2737 "Return string around point, or nil." |
54879 | 2738 (let ((syntax (syntax-ppss))) |
2739 (when (nth 3 syntax) | |
2740 (condition-case () | |
2741 (buffer-substring-no-properties (1+ (nth 8 syntax)) | |
2742 (progn (goto-char (nth 8 syntax)) | |
2743 (forward-sexp) | |
2744 (1- (point)))) | |
2745 (error nil))))) | |
114 | 2746 |
2747 (defun comint-get-source (prompt prev-dir/file source-modes mustmatch-p) | |
54879 | 2748 "Prompt for filenames in commands that process source files, |
2749 e.g. loading or compiling a file. | |
2750 Provides a default, if there is one, and returns the result filename. | |
2751 | |
2752 See `comint-source-default' for more on determining defaults. | |
2753 | |
57603
bdfa227d18a8
(comint-insert-input): Use @ in `interactive'.
Richard M. Stallman <rms@gnu.org>
parents:
57539
diff
changeset
|
2754 PROMPT is the prompt string. PREV-DIR/FILE is the (DIRECTORY . FILE) pair |
54879 | 2755 from the last source processing command. SOURCE-MODES is a list of major |
2756 modes used to determine what file buffers contain source files. (These | |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
2757 two arguments are used for determining defaults.) If MUSTMATCH-P is true, |
54879 | 2758 then the filename reader will only accept a file that exists. |
2759 | |
2760 A typical use: | |
2761 (interactive (comint-get-source \"Compile file: \" prev-lisp-dir/file | |
2762 '(lisp-mode) t))" | |
114 | 2763 (let* ((def (comint-source-default prev-dir/file source-modes)) |
32326 | 2764 (stringfile (comint-extract-string)) |
114 | 2765 (sfile-p (and stringfile |
584 | 2766 (condition-case () |
2767 (file-exists-p stringfile) | |
2768 (error nil)) | |
114 | 2769 (not (file-directory-p stringfile)))) |
2770 (defdir (if sfile-p (file-name-directory stringfile) | |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2771 (car def))) |
114 | 2772 (deffile (if sfile-p (file-name-nondirectory stringfile) |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2773 (cdr def))) |
114 | 2774 (ans (read-file-name (if deffile (format "%s(default %s) " |
2775 prompt deffile) | |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2776 prompt) |
114 | 2777 defdir |
2778 (concat defdir deffile) | |
2779 mustmatch-p))) | |
2780 (list (expand-file-name (substitute-in-file-name ans))))) | |
2781 | |
14169 | 2782 ;; I am somewhat divided on this string-default feature. It seems |
2783 ;; to violate the principle-of-least-astonishment, in that it makes | |
2784 ;; the default harder to predict, so you actually have to look and see | |
2785 ;; what the default really is before choosing it. This can trip you up. | |
2786 ;; On the other hand, it can be useful, I guess. I would appreciate feedback | |
2787 ;; on this. | |
2788 ;; -Olin | |
584 | 2789 |
114 | 2790 |
14169 | 2791 ;; Simple process query facility. |
2792 ;; =========================================================================== | |
2793 ;; This function is for commands that want to send a query to the process | |
2794 ;; and show the response to the user. For example, a command to get the | |
2795 ;; arglist for a Common Lisp function might send a "(arglist 'foo)" query | |
2796 ;; to an inferior Common Lisp process. | |
32326 | 2797 ;; |
14169 | 2798 ;; This simple facility just sends strings to the inferior process and pops |
2799 ;; up a window for the process buffer so you can see what the process | |
2800 ;; responds with. We don't do anything fancy like try to intercept what the | |
2801 ;; process responds with and put it in a pop-up window or on the message | |
2802 ;; line. We just display the buffer. Low tech. Simple. Works good. | |
114 | 2803 |
2804 (defun comint-proc-query (proc str) | |
54879 | 2805 "Send to the inferior process PROC the string STR. |
2806 Pop-up but do not select a window for the inferior process so that | |
2807 its response can be seen." | |
114 | 2808 (let* ((proc-buf (process-buffer proc)) |
2809 (proc-mark (process-mark proc))) | |
2810 (display-buffer proc-buf) | |
2811 (set-buffer proc-buf) ; but it's not the selected *window* | |
76767
3f12f4633f63
(comint-proc-query, comint-dynamic-list-completions):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76491
diff
changeset
|
2812 (let ((proc-win (get-buffer-window proc-buf 0)) |
114 | 2813 (proc-pt (marker-position proc-mark))) |
2814 (comint-send-string proc str) ; send the query | |
2815 (accept-process-output proc) ; wait for some output | |
2816 ;; Try to position the proc window so you can see the answer. | |
2817 ;; This is bogus code. If you delete the (sit-for 0), it breaks. | |
2818 ;; I don't know why. Wizards invited to improve it. | |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2819 (unless (pos-visible-in-window-p proc-pt proc-win) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2820 (let ((opoint (window-point proc-win))) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2821 (set-window-point proc-win proc-mark) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2822 (sit-for 0) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2823 (if (not (pos-visible-in-window-p opoint proc-win)) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2824 (push-mark opoint) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2825 (set-window-point proc-win opoint))))))) |
114 | 2826 |
2827 | |
14169 | 2828 ;; Filename/command/history completion in a buffer |
2829 ;; =========================================================================== | |
2830 ;; Useful completion functions, courtesy of the Ergo group. | |
114 | 2831 |
14169 | 2832 ;; Six commands: |
2833 ;; comint-dynamic-complete Complete or expand command, filename, | |
2834 ;; history at point. | |
2835 ;; comint-dynamic-complete-filename Complete filename at point. | |
2836 ;; comint-dynamic-list-filename-completions List completions in help buffer. | |
2837 ;; comint-replace-by-expanded-filename Expand and complete filename at point; | |
2838 ;; replace with expanded/completed name. | |
2839 ;; comint-dynamic-simple-complete Complete stub given candidates. | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2840 |
14169 | 2841 ;; These are not installed in the comint-mode keymap. But they are |
2842 ;; available for people who want them. Shell-mode installs them: | |
2843 ;; (define-key shell-mode-map "\t" 'comint-dynamic-complete) | |
2844 ;; (define-key shell-mode-map "\M-?" | |
2845 ;; 'comint-dynamic-list-filename-completions))) | |
2846 ;; | |
2847 ;; Commands like this are fine things to put in load hooks if you | |
2848 ;; want them present in specific modes. | |
584 | 2849 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2850 (defcustom comint-completion-autolist nil |
100171 | 2851 "If non-nil, automatically list possibilities on partial completion. |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2852 This mirrors the optional behavior of tcsh." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2853 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2854 :group 'comint-completion) |
114 | 2855 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2856 (defcustom comint-completion-addsuffix t |
100171 | 2857 "If non-nil, add a `/' to completed directories, ` ' to file names. |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2858 If a cons pair, it should be of the form (DIRSUFFIX . FILESUFFIX) where |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2859 DIRSUFFIX and FILESUFFIX are strings added on unambiguous or exact completion. |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2860 This mirrors the optional behavior of tcsh." |
33166
61e62bc5bd7f
(comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents:
33138
diff
changeset
|
2861 :type '(choice (const :tag "None" nil) |
33167 | 2862 (const :tag "Add /" t) |
33166
61e62bc5bd7f
(comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents:
33138
diff
changeset
|
2863 (cons :tag "Suffix pair" |
61e62bc5bd7f
(comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents:
33138
diff
changeset
|
2864 (string :tag "Directory suffix") |
61e62bc5bd7f
(comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents:
33138
diff
changeset
|
2865 (string :tag "File suffix"))) |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2866 :group 'comint-completion) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2867 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2868 (defcustom comint-completion-recexact nil |
100171 | 2869 "If non-nil, use shortest completion if characters cannot be added. |
4923
63aed739d09d
(comint-postoutput-scroll-to-bottom):
Richard M. Stallman <rms@gnu.org>
parents:
4899
diff
changeset
|
2870 This mirrors the optional behavior of tcsh. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2871 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2872 A non-nil value is useful if `comint-completion-autolist' is non-nil too." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2873 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2874 :group 'comint-completion) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2875 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2876 (defcustom comint-completion-fignore nil |
100171 | 2877 "List of suffixes to be disregarded during file completion. |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
2878 This mirrors the optional behavior of bash and tcsh. |
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
2879 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2880 Note that this applies to `comint-dynamic-complete-filename' only." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2881 :type '(repeat (string :tag "Suffix")) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2882 :group 'comint-completion) |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
2883 |
65113
58d4ddcf0c9a
(comint-file-name-prefix): Add autoload.
Richard M. Stallman <rms@gnu.org>
parents:
64819
diff
changeset
|
2884 ;;;###autoload |
105957
25e1d7e37015
* widget.el (define-widget): Purecopy the docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105828
diff
changeset
|
2885 (defvar comint-file-name-prefix (purecopy "") |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2886 "Prefix prepended to absolute file names taken from process input. |
54879 | 2887 This is used by Comint's and shell's completion functions, and by shell's |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2888 directory tracking functions.") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2889 |
15817
9e94b5fdaab1
(comint-file-name-chars): Was comint-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
15727
diff
changeset
|
2890 (defvar comint-file-name-chars |
49549
99be3a1e2589
Cygwin support patch.
Juanma Barranquero <lekktu@gmail.com>
parents:
48987
diff
changeset
|
2891 (if (memq system-type '(ms-dos windows-nt cygwin)) |
21617
c944e3c8ebe2
(comint-filename-chars): Combine DOS and Windows strings.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21243
diff
changeset
|
2892 "~/A-Za-z0-9_^$!#%&{}@`'.,:()-" |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2893 "[]~/A-Za-z0-9+@:_.$#%,={}-") |
15817
9e94b5fdaab1
(comint-file-name-chars): Was comint-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
15727
diff
changeset
|
2894 "String of characters valid in a file name. |
19842
5797c2cbac2a
(comint-file-name-chars): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19678
diff
changeset
|
2895 Note that all non-ASCII characters are considered valid in a file name |
5797c2cbac2a
(comint-file-name-chars): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19678
diff
changeset
|
2896 regardless of what this variable says. |
15654
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
2897 |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
2898 This is a good thing to set in mode hooks.") |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
2899 |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2900 (defvar comint-file-name-quote-list nil |
23615
f182b7006b7a
(comint-file-name-quote-list): Doc fix.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
23347
diff
changeset
|
2901 "List of characters to quote with `\\' when in a file name. |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2902 |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2903 This is a good thing to set in mode hooks.") |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2904 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2905 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2906 (defun comint-directory (directory) |
54879 | 2907 "Return expanded DIRECTORY, with `comint-file-name-prefix' if absolute." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2908 (expand-file-name (if (file-name-absolute-p directory) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2909 (concat comint-file-name-prefix directory) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2910 directory))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2911 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2912 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2913 (defun comint-word (word-chars) |
54879 | 2914 "Return the word of WORD-CHARS at point, or nil if none is found. |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2915 Word constituents are considered to be those in WORD-CHARS, which is like the |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
2916 inside of a \"[...]\" (see `skip-chars-forward'), plus all non-ASCII characters." |
584 | 2917 (save-excursion |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2918 (let ((here (point)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2919 giveup) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2920 (while (not giveup) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2921 (let ((startpoint (point))) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2922 (skip-chars-backward (concat "\\\\" word-chars)) |
54879 | 2923 ;; Fixme: This isn't consistent with Bash, at least -- not |
2924 ;; all non-ASCII chars should be word constituents. | |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2925 (if (and (> (- (point) 2) (point-min)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2926 (= (char-after (- (point) 2)) ?\\)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2927 (forward-char -2)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2928 (if (and (> (- (point) 1) (point-min)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2929 (>= (char-after (- (point) 1)) 128)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2930 (forward-char -1)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2931 (if (= (point) startpoint) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2932 (setq giveup t)))) |
12058
24c19691068e
Don't go forward over a word-char if we're at bob, and set match-data.
Simon Marshall <simon@gnu.org>
parents:
11310
diff
changeset
|
2933 ;; Set match-data to match the entire string. |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2934 (when (< (point) here) |
21152
8197c659e85c
(comint-word): store-match-data => set-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
21018
diff
changeset
|
2935 (set-match-data (list (point) here)) |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2936 (match-string 0))))) |
584 | 2937 |
15369
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2938 (defun comint-substitute-in-file-name (filename) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2939 "Return FILENAME with environment variables substituted. |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2940 Supports additional environment variable syntax of the command |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2941 interpreter (e.g., the percent notation of cmd.exe on NT)." |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2942 (let ((name (substitute-in-file-name filename))) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2943 (if (memq system-type '(ms-dos windows-nt)) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2944 (let (env-var-name |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2945 env-var-val) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2946 (save-match-data |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2947 (while (string-match "%\\([^\\\\/]*\\)%" name) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
2948 (setq env-var-name (match-string 1 name)) |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
2949 (setq env-var-val (or (getenv env-var-name) "")) |
29883
53bc9bb1f0b8
(comint-substitute-in-file-name): Call replace-match
Gerd Moellmann <gerd@gnu.org>
parents:
29078
diff
changeset
|
2950 (setq name (replace-match env-var-val t t name)))))) |
15369
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2951 name)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2952 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2953 (defun comint-match-partial-filename () |
70186
a2173a369f78
(comint-match-partial-filename): Doc fix.
Romain Francoise <romain@orebokech.com>
parents:
70116
diff
changeset
|
2954 "Return the filename at point, or nil if none is found. |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2955 Environment variables are substituted. See `comint-word'." |
15817
9e94b5fdaab1
(comint-file-name-chars): Was comint-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
15727
diff
changeset
|
2956 (let ((filename (comint-word comint-file-name-chars))) |
32326 | 2957 (and filename (comint-substitute-in-file-name |
15369
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2958 (comint-unquote-filename filename))))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2959 |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2960 |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2961 (defun comint-quote-filename (filename) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2962 "Return FILENAME with magic characters quoted. |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2963 Magic characters are those in `comint-file-name-quote-list'." |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2964 (if (null comint-file-name-quote-list) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2965 filename |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2966 (let ((regexp |
53272
bb2708b976f1
(comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
2967 (format "[%s]" |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2968 (mapconcat 'char-to-string comint-file-name-quote-list "")))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2969 (save-match-data |
53272
bb2708b976f1
(comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
2970 (let ((i 0)) |
bb2708b976f1
(comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
2971 (while (string-match regexp filename i) |
bb2708b976f1
(comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
2972 (setq filename (replace-match "\\\\\\&" nil nil filename)) |
bb2708b976f1
(comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
2973 (setq i (1+ (match-end 0))))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2974 filename)))) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2975 |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2976 (defun comint-unquote-filename (filename) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2977 "Return FILENAME with quoted characters unquoted." |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2978 (if (null comint-file-name-quote-list) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2979 filename |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2980 (save-match-data |
15337
cf1e6f4dd2b0
(comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents:
14814
diff
changeset
|
2981 (let ((i 0)) |
cf1e6f4dd2b0
(comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents:
14814
diff
changeset
|
2982 (while (string-match "\\\\\\(.\\)" filename i) |
cf1e6f4dd2b0
(comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents:
14814
diff
changeset
|
2983 (setq filename (replace-match "\\1" nil nil filename)) |
cf1e6f4dd2b0
(comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents:
14814
diff
changeset
|
2984 (setq i (+ 1 (match-beginning 0))))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2985 filename))) |
114 | 2986 |
584 | 2987 |
114 | 2988 (defun comint-dynamic-complete () |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2989 "Dynamically perform completion at point. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2990 Calls the functions in `comint-dynamic-complete-functions' to perform |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2991 completion until a function returns non-nil, at which point completion is |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2992 assumed to have occurred." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2993 (interactive) |
12208
d10ef5c093ce
(comint-mode): Use make-local-hook.
Karl Heuer <kwzh@gnu.org>
parents:
12058
diff
changeset
|
2994 (run-hook-with-args-until-success 'comint-dynamic-complete-functions)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2995 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2996 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2997 (defun comint-dynamic-complete-filename () |
584 | 2998 "Dynamically complete the filename at point. |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2999 Completes if after a filename. See `comint-match-partial-filename' and |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3000 `comint-dynamic-complete-as-filename'. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3001 This function is similar to `comint-replace-by-expanded-filename', except that |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3002 it won't change parts of the filename already entered in the buffer; it just |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3003 adds completion characters to the end of the filename. A completions listing |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3004 may be shown in a help buffer if completion is ambiguous. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3005 |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
3006 Completion is dependent on the value of `comint-completion-addsuffix', |
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
3007 `comint-completion-recexact' and `comint-completion-fignore', and the timing of |
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
3008 completions listing is dependent on the value of `comint-completion-autolist'. |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3009 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3010 Returns t if successful." |
114 | 3011 (interactive) |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3012 (when (comint-match-partial-filename) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3013 (unless (window-minibuffer-p (selected-window)) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3014 (message "Completing file name...")) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3015 (comint-dynamic-complete-as-filename))) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3016 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3017 (defun comint-dynamic-complete-as-filename () |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3018 "Dynamically complete at point as a filename. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3019 See `comint-dynamic-complete-filename'. Returns t if successful." |
81822
64c8ecd78bf2
(comint-dynamic-complete-as-filename,comint-dynamic-list-filename-completions):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81801
diff
changeset
|
3020 (let* ((completion-ignore-case read-file-name-completion-ignore-case) |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
3021 (completion-ignored-extensions comint-completion-fignore) |
15654
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
3022 ;; If we bind this, it breaks remote directory tracking in rlogin.el. |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
3023 ;; I think it was originally bound to solve file completion problems, |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
3024 ;; but subsequent changes may have made this unnecessary. sm. |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
3025 ;;(file-name-handler-alist nil) |
10830
a774e92de39c
Let file-name-handler-alist to nil in comint-dynamic-complete-as-filename and
Simon Marshall <simon@gnu.org>
parents:
10702
diff
changeset
|
3026 (minibuffer-p (window-minibuffer-p (selected-window))) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3027 (success t) |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3028 (dirsuffix (cond ((not comint-completion-addsuffix) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3029 "") |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3030 ((not (consp comint-completion-addsuffix)) |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
3031 "/") |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3032 (t |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3033 (car comint-completion-addsuffix)))) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3034 (filesuffix (cond ((not comint-completion-addsuffix) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3035 "") |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3036 ((not (consp comint-completion-addsuffix)) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3037 " ") |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3038 (t |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3039 (cdr comint-completion-addsuffix)))) |
97744
b5ba9469961a
(comint-dynamic-complete-as-filename): If case is ignored while
Chong Yidong <cyd@stupidchicken.com>
parents:
95899
diff
changeset
|
3040 (filename (comint-match-partial-filename)) |
97762
870ef2dba090
(comint-dynamic-complete-as-filename): Generalize last change to allow
Chong Yidong <cyd@stupidchicken.com>
parents:
97744
diff
changeset
|
3041 (filename-beg (if filename (match-beginning 0) (point))) |
870ef2dba090
(comint-dynamic-complete-as-filename): Generalize last change to allow
Chong Yidong <cyd@stupidchicken.com>
parents:
97744
diff
changeset
|
3042 (filename-end (if filename (match-end 0) (point))) |
97744
b5ba9469961a
(comint-dynamic-complete-as-filename): If case is ignored while
Chong Yidong <cyd@stupidchicken.com>
parents:
95899
diff
changeset
|
3043 (filename (or filename "")) |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3044 (filedir (file-name-directory filename)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3045 (filenondir (file-name-nondirectory filename)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3046 (directory (if filedir (comint-directory filedir) default-directory)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3047 (completion (file-name-completion filenondir directory))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3048 (cond ((null completion) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3049 (if minibuffer-p |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3050 (minibuffer-message "No completions of %s" filename) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3051 (message "No completions of %s" filename)) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3052 (setq success nil)) |
32326 | 3053 ((eq completion t) ; Means already completed "file". |
3054 (insert filesuffix) | |
3055 (unless minibuffer-p | |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3056 (message "Sole completion"))) |
32326 | 3057 ((string-equal completion "") ; Means completion on "directory/". |
3058 (comint-dynamic-list-filename-completions)) | |
3059 (t ; Completion string returned. | |
3060 (let ((file (concat (file-name-as-directory directory) completion))) | |
97762
870ef2dba090
(comint-dynamic-complete-as-filename): Generalize last change to allow
Chong Yidong <cyd@stupidchicken.com>
parents:
97744
diff
changeset
|
3061 ;; Insert completion. Note that the completion string |
870ef2dba090
(comint-dynamic-complete-as-filename): Generalize last change to allow
Chong Yidong <cyd@stupidchicken.com>
parents:
97744
diff
changeset
|
3062 ;; may have a different case than what's in the prompt, |
870ef2dba090
(comint-dynamic-complete-as-filename): Generalize last change to allow
Chong Yidong <cyd@stupidchicken.com>
parents:
97744
diff
changeset
|
3063 ;; if read-file-name-completion-ignore-case is non-nil, |
97744
b5ba9469961a
(comint-dynamic-complete-as-filename): If case is ignored while
Chong Yidong <cyd@stupidchicken.com>
parents:
95899
diff
changeset
|
3064 (delete-region filename-beg filename-end) |
98356
26e60becb11f
(comint-dynamic-complete-as-filename): Quote directory name when
Chong Yidong <cyd@stupidchicken.com>
parents:
98232
diff
changeset
|
3065 (if filedir (insert (comint-quote-filename filedir))) |
97762
870ef2dba090
(comint-dynamic-complete-as-filename): Generalize last change to allow
Chong Yidong <cyd@stupidchicken.com>
parents:
97744
diff
changeset
|
3066 (insert (comint-quote-filename (directory-file-name completion))) |
32326 | 3067 (cond ((symbolp (file-name-completion completion directory)) |
3068 ;; We inserted a unique completion. | |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
3069 (insert (if (file-directory-p file) dirsuffix filesuffix)) |
32326 | 3070 (unless minibuffer-p |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3071 (message "Completed"))) |
32326 | 3072 ((and comint-completion-recexact comint-completion-addsuffix |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3073 (string-equal filenondir completion) |
32326 | 3074 (file-exists-p file)) |
3075 ;; It's not unique, but user wants shortest match. | |
3076 (insert (if (file-directory-p file) dirsuffix filesuffix)) | |
3077 (unless minibuffer-p | |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3078 (message "Completed shortest"))) |
32326 | 3079 ((or comint-completion-autolist |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3080 (string-equal filenondir completion)) |
32326 | 3081 ;; It's not unique, list possible completions. |
3082 (comint-dynamic-list-filename-completions)) | |
3083 (t | |
3084 (unless minibuffer-p | |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3085 (message "Partially completed"))))))) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3086 success)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3087 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3088 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3089 (defun comint-replace-by-expanded-filename () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3090 "Dynamically expand and complete the filename at point. |
63502
f0f76b7d0f74
(comint-replace-by-expanded-filename, comint-prompt-regexp,
Juanma Barranquero <lekktu@gmail.com>
parents:
63175
diff
changeset
|
3091 Replace the filename with an expanded, canonicalized and completed replacement. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3092 \"Expanded\" means environment variables (e.g., $HOME) and `~'s are replaced |
63502
f0f76b7d0f74
(comint-replace-by-expanded-filename, comint-prompt-regexp,
Juanma Barranquero <lekktu@gmail.com>
parents:
63175
diff
changeset
|
3093 with the corresponding directories. \"Canonicalized\" means `..' and `.' are |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3094 removed, and the filename is made absolute instead of relative. For expansion |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3095 see `expand-file-name' and `substitute-in-file-name'. For completion see |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3096 `comint-dynamic-complete-filename'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3097 (interactive) |
43530
aee3db99fcca
(comint-replace-by-expanded-filename): Do nothing if
Kim F. Storm <storm@cua.dk>
parents:
43492
diff
changeset
|
3098 (let ((filename (comint-match-partial-filename))) |
aee3db99fcca
(comint-replace-by-expanded-filename): Do nothing if
Kim F. Storm <storm@cua.dk>
parents:
43492
diff
changeset
|
3099 (when filename |
aee3db99fcca
(comint-replace-by-expanded-filename): Do nothing if
Kim F. Storm <storm@cua.dk>
parents:
43492
diff
changeset
|
3100 (replace-match (expand-file-name filename) t t) |
aee3db99fcca
(comint-replace-by-expanded-filename): Do nothing if
Kim F. Storm <storm@cua.dk>
parents:
43492
diff
changeset
|
3101 (comint-dynamic-complete-filename)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3102 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3103 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3104 (defun comint-dynamic-simple-complete (stub candidates) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3105 "Dynamically complete STUB from CANDIDATES list. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3106 This function inserts completion characters at point by completing STUB from |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3107 the strings in CANDIDATES. A completions listing may be shown in a help buffer |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3108 if completion is ambiguous. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3109 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3110 Returns nil if no completion was inserted. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3111 Returns `sole' if completed with the only completion match. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3112 Returns `shortest' if completed with the shortest of the completion matches. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3113 Returns `partial' if completed as far as possible with the completion matches. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3114 Returns `listed' if a completion listing was shown. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3115 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3116 See also `comint-dynamic-complete-filename'." |
49549
99be3a1e2589
Cygwin support patch.
Juanma Barranquero <lekktu@gmail.com>
parents:
48987
diff
changeset
|
3117 (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt cygwin))) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3118 (minibuffer-p (window-minibuffer-p (selected-window))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
3119 (suffix (cond ((not comint-completion-addsuffix) "") |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
3120 ((not (consp comint-completion-addsuffix)) " ") |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
3121 (t (cdr comint-completion-addsuffix)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3122 (completions (all-completions stub candidates))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3123 (cond ((null completions) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3124 (if minibuffer-p |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3125 (minibuffer-message "No completions of %s" stub) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3126 (message "No completions of %s" stub)) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3127 nil) |
32326 | 3128 ((= 1 (length completions)) ; Gotcha! |
3129 (let ((completion (car completions))) | |
3130 (if (string-equal completion stub) | |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3131 (unless minibuffer-p |
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3132 (message "Sole completion")) |
32326 | 3133 (insert (substring completion (length stub))) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3134 (unless minibuffer-p |
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3135 (message "Completed"))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
3136 (insert suffix) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3137 'sole)) |
32326 | 3138 (t ; There's no unique completion. |
3139 (let ((completion (try-completion stub candidates))) | |
3140 ;; Insert the longest substring. | |
3141 (insert (substring completion (length stub))) | |
3142 (cond ((and comint-completion-recexact comint-completion-addsuffix | |
3143 (string-equal stub completion) | |
3144 (member completion completions)) | |
3145 ;; It's not unique, but user wants shortest match. | |
3146 (insert suffix) | |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3147 (unless minibuffer-p |
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3148 (message "Completed shortest")) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3149 'shortest) |
32326 | 3150 ((or comint-completion-autolist |
3151 (string-equal stub completion)) | |
3152 ;; It's not unique, list possible completions. | |
93134
4e8466e2b7c4
* comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents:
93132
diff
changeset
|
3153 (comint-dynamic-list-completions completions stub) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3154 'listed) |
32326 | 3155 (t |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3156 (unless minibuffer-p |
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3157 (message "Partially completed")) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3158 'partial))))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3159 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3160 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3161 (defun comint-dynamic-list-filename-completions () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3162 "List in help buffer possible completions of the filename at point." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3163 (interactive) |
81822
64c8ecd78bf2
(comint-dynamic-complete-as-filename,comint-dynamic-list-filename-completions):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81801
diff
changeset
|
3164 (let* ((completion-ignore-case read-file-name-completion-ignore-case) |
15654
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
3165 ;; If we bind this, it breaks remote directory tracking in rlogin.el. |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
3166 ;; I think it was originally bound to solve file completion problems, |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
3167 ;; but subsequent changes may have made this unnecessary. sm. |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
3168 ;;(file-name-handler-alist nil) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3169 (filename (or (comint-match-partial-filename) "")) |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3170 (filedir (file-name-directory filename)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3171 (filenondir (file-name-nondirectory filename)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3172 (directory (if filedir (comint-directory filedir) default-directory)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3173 (completions (file-name-all-completions filenondir directory))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
3174 (if (not completions) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3175 (if (window-minibuffer-p (selected-window)) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3176 (minibuffer-message "No completions of %s" filename) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3177 (message "No completions of %s" filename)) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
3178 (comint-dynamic-list-completions |
93134
4e8466e2b7c4
* comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents:
93132
diff
changeset
|
3179 (mapcar 'comint-quote-filename completions) |
97764
0445036f6742
(comint-dynamic-list-filename-completions): Quote common substring.
Chong Yidong <cyd@stupidchicken.com>
parents:
97762
diff
changeset
|
3180 (comint-quote-filename filenondir))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3181 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3182 |
46171
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3183 ;; This is bound locally in a *Completions* buffer to the list of |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3184 ;; completions displayed, and is used to detect the case where the same |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3185 ;; command is repeatedly used without the set of completions changing. |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3186 (defvar comint-displayed-dynamic-completions nil) |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3187 |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3188 (defvar comint-dynamic-list-completions-config nil) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3189 |
93134
4e8466e2b7c4
* comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents:
93132
diff
changeset
|
3190 (defun comint-dynamic-list-completions (completions &optional common-substring) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3191 "List in help buffer sorted COMPLETIONS. |
93134
4e8466e2b7c4
* comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents:
93132
diff
changeset
|
3192 The meaning of COMMON-SUBSTRING is the same as in `display-completion-list'. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3193 Typing SPC flushes the help buffer." |
76767
3f12f4633f63
(comint-proc-query, comint-dynamic-list-completions):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76491
diff
changeset
|
3194 (let ((window (get-buffer-window "*Completions*" 0))) |
46250
2c383709a149
(comint-dynamic-list-completions): Sort COMPLETIONS before first use.
Miles Bader <miles@gnu.org>
parents:
46171
diff
changeset
|
3195 (setq completions (sort completions 'string-lessp)) |
42669
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3196 (if (and (eq last-command this-command) |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3197 window (window-live-p window) (window-buffer window) |
46171
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3198 (buffer-name (window-buffer window)) |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3199 ;; The above tests are not sufficient to detect the case where we |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3200 ;; should scroll, because the top-level interactive command may |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3201 ;; not have displayed a completions window the last time it was |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3202 ;; invoked, and there may be such a window left over from a |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3203 ;; previous completion command with a different set of |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3204 ;; completions. To detect that case, we also test that the set |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3205 ;; of displayed completions is in fact the same as the previously |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3206 ;; displayed set. |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3207 (equal completions |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3208 (buffer-local-value 'comint-displayed-dynamic-completions |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3209 (window-buffer window)))) |
42669
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3210 ;; If this command was repeated, and |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3211 ;; there's a fresh completion window with a live buffer, |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3212 ;; and this command is repeated, scroll that window. |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3213 (with-current-buffer (window-buffer window) |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3214 (if (pos-visible-in-window-p (point-max) window) |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3215 (set-window-start window (point-min)) |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3216 (save-selected-window |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3217 (select-window window) |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3218 (scroll-up)))) |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3219 |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3220 ;; Display a completion list for the first time. |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3221 (setq comint-dynamic-list-completions-config |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3222 (current-window-configuration)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3223 (with-output-to-temp-buffer "*Completions*" |
93134
4e8466e2b7c4
* comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents:
93132
diff
changeset
|
3224 (display-completion-list completions common-substring)) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3225 (if (window-minibuffer-p (selected-window)) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3226 (minibuffer-message "Type space to flush; repeat completion command to scroll") |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3227 (message "Type space to flush; repeat completion command to scroll"))) |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3228 |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3229 ;; Read the next key, to process SPC. |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3230 (let (key first) |
55881
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
3231 (if (with-current-buffer (get-buffer "*Completions*") |
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
3232 (set (make-local-variable 'comint-displayed-dynamic-completions) |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3233 completions) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3234 (setq key (read-key-sequence nil) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3235 first (aref key 0)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3236 (and (consp first) (consp (event-start first)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3237 (eq (window-buffer (posn-window (event-start first))) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3238 (get-buffer "*Completions*")) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3239 (eq (key-binding key) 'mouse-choose-completion))) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3240 ;; If the user does mouse-choose-completion with the mouse, |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3241 ;; execute the command, then delete the completion window. |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3242 (progn |
105740
f6fc3559bd1d
(comint-dynamic-list-completions): Use choose-completion rather than
Glenn Morris <rgm@gnu.org>
parents:
105703
diff
changeset
|
3243 (choose-completion first) |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3244 (set-window-configuration comint-dynamic-list-completions-config)) |
69687
4b35cb9e0b98
(comint-dynamic-list-completions): Allow user to select *Completions* buffer.
Nick Roberts <nickrob@snap.net.nz>
parents:
68651
diff
changeset
|
3245 (if (eq first ?\s) |
4b35cb9e0b98
(comint-dynamic-list-completions): Allow user to select *Completions* buffer.
Nick Roberts <nickrob@snap.net.nz>
parents:
68651
diff
changeset
|
3246 (set-window-configuration comint-dynamic-list-completions-config) |
4b35cb9e0b98
(comint-dynamic-list-completions): Allow user to select *Completions* buffer.
Nick Roberts <nickrob@snap.net.nz>
parents:
68651
diff
changeset
|
3247 (setq unread-command-events (listify-key-sequence key))))))) |
39713
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
3248 |
114 | 3249 |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3250 (defun comint-get-next-from-history () |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3251 "After fetching a line from input history, this fetches the following line. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3252 In other words, this recalls the input line after the line you recalled last. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3253 You can use this to repeat a sequence of input lines." |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3254 (interactive) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3255 (if comint-save-input-ring-index |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3256 (progn |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3257 (setq comint-input-ring-index (1+ comint-save-input-ring-index)) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3258 (comint-next-input 1)) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3259 (message "No previous history command"))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3260 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3261 (defun comint-accumulate () |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3262 "Accumulate a line to send as input along with more lines. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3263 This inserts a newline so that you can enter more text |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3264 to be sent along with this line. Use \\[comint-send-input] |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3265 to send all the accumulated input, at once. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3266 The entire accumulated text becomes one item in the input history |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3267 when you send it." |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3268 (interactive) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3269 (insert "\n") |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3270 (set-marker comint-accum-marker (point)) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3271 (if comint-input-ring-index |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3272 (setq comint-save-input-ring-index |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3273 (- comint-input-ring-index 1)))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3274 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3275 (defun comint-goto-process-mark () |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3276 "Move point to the process mark. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3277 The process mark separates output, and input already sent, |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3278 from input that has not yet been sent." |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3279 (interactive) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3280 (let ((proc (or (get-buffer-process (current-buffer)) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3281 (error "Current buffer has no process")))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3282 (goto-char (process-mark proc)) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
105195
diff
changeset
|
3283 (when (called-interactively-p 'interactive) |
35236
ebc45a028f0f
(comint-goto-process-mark): Don't print a message
Gerd Moellmann <gerd@gnu.org>
parents:
34977
diff
changeset
|
3284 (message "Point is now at the process mark")))) |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3285 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3286 (defun comint-bol-or-process-mark () |
24765
6c69a507d9bd
(comint-bol-or-process-mark): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
24719
diff
changeset
|
3287 "Move point to beginning of line (after prompt) or to the process mark. |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3288 The first time you use this command, it moves to the beginning of the line |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3289 \(but after the prompt, if any). If you repeat it again immediately, |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3290 it moves point to the process mark. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3291 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3292 The process mark separates the process output, along with input already sent, |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3293 from input that has not yet been sent. Ordinarily, the process mark |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3294 is at the beginning of the current input line; but if you have |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3295 used \\[comint-accumulate] to send multiple lines at once, |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3296 the process mark is at the beginning of the accumulated input." |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3297 (interactive) |
22900
00d2d08d657b
(comint-bol-or-process-mark): Refer to this command's name correctly.
Richard M. Stallman <rms@gnu.org>
parents:
22652
diff
changeset
|
3298 (if (not (eq last-command 'comint-bol-or-process-mark)) |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3299 (comint-bol nil) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3300 (comint-goto-process-mark))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3301 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3302 (defun comint-set-process-mark () |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3303 "Set the process mark at point." |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3304 (interactive) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3305 (let ((proc (or (get-buffer-process (current-buffer)) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3306 (error "Current buffer has no process")))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3307 (set-marker (process-mark proc) (point)) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3308 (message "Process mark set"))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3309 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3310 |
42887 | 3311 ;; Author: Peter Breton <pbreton@cs.umb.edu> |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3312 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3313 ;; This little add-on for comint is intended to make it easy to get |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3314 ;; output from currently active comint buffers into another buffer, |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3315 ;; or buffers, and then go back to using the comint shell. |
32326 | 3316 ;; |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3317 ;; My particular use is SQL interpreters; I want to be able to execute a |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3318 ;; query using the process associated with a comint-buffer, and save that |
54879 | 3319 ;; somewhere else. Because the process might have state (for example, it |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3320 ;; could be in an uncommitted transaction), just running starting a new |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3321 ;; process and having it execute the query and then finish, would not |
54879 | 3322 ;; work. I'm sure there are other uses as well, although in many cases |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3323 ;; starting a new process is the simpler, and thus preferable, approach. |
32326 | 3324 ;; |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3325 ;; The basic implementation is as follows: comint-redirect changes the |
54879 | 3326 ;; preoutput filter functions (`comint-preoutput-filter-functions') to use |
3327 ;; its own filter. The filter puts the output into the designated buffer, | |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3328 ;; or buffers, until it sees a regexp that tells it to stop (by default, |
54879 | 3329 ;; this is the prompt for the interpreter, `comint-prompt-regexp'). When it |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3330 ;; sees the stop regexp, it restores the old filter functions, and runs |
54879 | 3331 ;; `comint-redirect-hook'. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3332 ;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3333 ;; Each comint buffer may only use one redirection at a time, but any number |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3334 ;; of different comint buffers may be simultaneously redirected. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3335 ;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3336 ;; NOTE: It is EXTREMELY important that `comint-prompt-regexp' be set to the |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3337 ;; correct prompt for your interpreter, or that you supply a regexp that says |
54879 | 3338 ;; when the redirection is finished. Otherwise, redirection will continue |
3339 ;; indefinitely. The code now does a sanity check to ensure that it can find | |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3340 ;; a prompt in the comint buffer; however, it is still important to ensure that |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3341 ;; this prompt is set correctly. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3342 ;; |
54879 | 3343 ;; XXX: This doesn't work so well unless `comint-prompt-regexp' is set; |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
3344 ;; perhaps it should prompt for a terminating string (with an |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
3345 ;; appropriate magic default by examining what we think is the prompt)? |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
3346 ;; |
54879 | 3347 ;; Fixme: look for appropriate fields, rather than regexp, if |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
3348 ;; `comint-use-prompt-regexp' is true. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3349 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3350 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3351 ;; Variables |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3352 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3353 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3354 (defcustom comint-redirect-verbose nil |
100171 | 3355 "If non-nil, print messages each time the redirection filter is invoked. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3356 Also print a message when redirection is completed." |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3357 :group 'comint |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3358 :type 'boolean) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3359 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3360 ;; Directly analagous to comint-preoutput-filter-functions |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3361 (defvar comint-redirect-filter-functions nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3362 "List of functions to call before inserting redirected process output. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3363 Each function gets one argument, a string containing the text received |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3364 from the subprocess. It should return the string to insert, perhaps |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3365 the same string that was received, or perhaps a modified or transformed |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3366 string. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3367 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3368 The functions on the list are called sequentially, and each one is given |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3369 the string returned by the previous one. The string returned by the |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3370 last function is the text that is actually inserted in the redirection buffer. |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3371 |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3372 You can use `add-hook' to add functions to this list |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3373 either globally or locally.") |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3374 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3375 ;; Internal variables |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3376 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3377 (defvar comint-redirect-output-buffer nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3378 "The buffer or list of buffers to put output into.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3379 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3380 (defvar comint-redirect-finished-regexp nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3381 "Regular expression that determines when to stop redirection in Comint. |
32326 | 3382 When the redirection filter function is given output that matches this regexp, |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3383 the output is inserted as usual, and redirection is completed.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3384 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3385 (defvar comint-redirect-insert-matching-regexp nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3386 "If non-nil, the text that ends a redirection is included in it. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3387 More precisely, the text that matches `comint-redirect-finished-regexp' |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3388 and therefore terminates an output redirection is inserted in the |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3389 redirection target buffer, along with the preceding output.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3390 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3391 (defvar comint-redirect-echo-input nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3392 "Non-nil means echo input in the process buffer even during redirection.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3393 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3394 (defvar comint-redirect-completed nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3395 "Non-nil if redirection has completed in the current buffer.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3396 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3397 (defvar comint-redirect-original-mode-line-process nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3398 "Original mode line for redirected process.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3399 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3400 (defvar comint-redirect-perform-sanity-check t |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3401 "If non-nil, check that redirection is likely to complete successfully. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3402 More precisely, before starting a redirection, verify that the |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3403 regular expression `comint-redirect-finished-regexp' that controls |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3404 when to terminate it actually matches some text already in the process |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3405 buffer. The idea is that this regular expression should match a prompt |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3406 string, and that there ought to be at least one copy of your prompt string |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3407 in the process buffer already.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3408 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3409 (defvar comint-redirect-original-filter-function nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3410 "The process filter that was in place when redirection is started. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3411 When redirection is completed, the process filter is restored to |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3412 this value.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3413 |
54879 | 3414 (defvar comint-redirect-subvert-readonly nil |
65784
06a7b3628c63
(comint-redirect-subvert-readonly): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
65724
diff
changeset
|
3415 "Non-nil means `comint-redirect' can insert into read-only buffers. |
06a7b3628c63
(comint-redirect-subvert-readonly): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
65724
diff
changeset
|
3416 This works by binding `inhibit-read-only' around the insertion. |
54879 | 3417 This is useful, for instance, for insertion into Help mode buffers. |
3418 You probably want to set it locally to the output buffer.") | |
3419 | |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3420 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3421 ;; Functions |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3422 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3423 |
32326 | 3424 (defun comint-redirect-setup (output-buffer |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3425 comint-buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3426 finished-regexp |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3427 &optional echo-input) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3428 "Set up for output redirection. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3429 This function sets local variables that are used by `comint-redirect-filter' |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3430 to perform redirection. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3431 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3432 Output from COMINT-BUFFER is redirected to OUTPUT-BUFFER, until something |
32326 | 3433 in the output matches FINISHED-REGEXP. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3434 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3435 If optional argument ECHO-INPUT is non-nil, output is echoed to the |
54879 | 3436 original Comint buffer. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3437 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3438 This function is called by `comint-redirect-send-command-to-process', |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3439 and does not normally need to be invoked by the end user or programmer." |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3440 (with-current-buffer comint-buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3441 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3442 (make-local-variable 'comint-redirect-original-mode-line-process) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3443 (setq comint-redirect-original-mode-line-process mode-line-process) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3444 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3445 (make-local-variable 'comint-redirect-output-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3446 (setq comint-redirect-output-buffer output-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3447 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3448 (make-local-variable 'comint-redirect-finished-regexp) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3449 (setq comint-redirect-finished-regexp finished-regexp) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3450 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3451 (make-local-variable 'comint-redirect-echo-input) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3452 (setq comint-redirect-echo-input echo-input) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3453 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3454 (make-local-variable 'comint-redirect-completed) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3455 (setq comint-redirect-completed nil) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3456 |
32326 | 3457 (setq mode-line-process |
3458 (if mode-line-process | |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3459 (list (concat (elt mode-line-process 0) " Redirection")) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3460 (list ":%s Redirection"))))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3461 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3462 (defun comint-redirect-cleanup () |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3463 "End a Comint redirection. See `comint-redirect-send-command'." |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3464 (interactive) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3465 ;; Restore the process filter |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3466 (set-process-filter (get-buffer-process (current-buffer)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3467 comint-redirect-original-filter-function) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3468 ;; Restore the mode line |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3469 (setq mode-line-process comint-redirect-original-mode-line-process) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3470 ;; Set the completed flag |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3471 (setq comint-redirect-completed t)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3472 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3473 ;; Because the cleanup happens as a callback, it's not easy to guarantee |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3474 ;; that it really occurs. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3475 (defalias 'comint-redirect-remove-redirection 'comint-redirect-cleanup) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3476 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3477 (defun comint-redirect-filter (process input-string) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3478 "Filter function which redirects output from PROCESS to a buffer or buffers. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3479 The variable `comint-redirect-output-buffer' says which buffer(s) to |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3480 place output in. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3481 |
54879 | 3482 INPUT-STRING is the input from the Comint process. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3483 |
32326 | 3484 This function runs as a process filter, and does not need to be invoked by the |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3485 end user." |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3486 (and process |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3487 (with-current-buffer (process-buffer process) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3488 (comint-redirect-preoutput-filter input-string) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3489 ;; If we have to echo output, give it to the original filter function |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3490 (and comint-redirect-echo-input |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3491 comint-redirect-original-filter-function |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3492 (funcall comint-redirect-original-filter-function |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3493 process input-string))))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3494 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3495 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3496 (defun comint-redirect-preoutput-filter (input-string) |
54879 | 3497 "Comint filter function which redirects Comint output to a buffer or buffers. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3498 The variable `comint-redirect-output-buffer' says which buffer(s) to |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3499 place output in. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3500 |
54879 | 3501 INPUT-STRING is the input from the Comint process. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3502 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3503 This function does not need to be invoked by the end user." |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3504 (let ((output-buffer-list |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3505 (if (listp comint-redirect-output-buffer) |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3506 comint-redirect-output-buffer |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3507 (list comint-redirect-output-buffer))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3508 (filtered-input-string input-string)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3509 |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3510 ;; If there are any filter functions, give them a chance to modify |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3511 ;; the string. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3512 (let ((functions comint-redirect-filter-functions)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3513 (while (and functions filtered-input-string) |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3514 (if (eq (car functions) t) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3515 ;; If a local value says "use the default value too", |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3516 ;; do that. |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3517 (let ((functions |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3518 (default-value 'comint-redirect-filter-functions))) |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3519 (while (and functions filtered-input-string) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3520 (setq filtered-input-string |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3521 (funcall (car functions) filtered-input-string)) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3522 (setq functions (cdr functions)))) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3523 (setq filtered-input-string |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3524 (funcall (car functions) filtered-input-string))) |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3525 (setq functions (cdr functions)))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3526 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3527 ;; Clobber `comint-redirect-finished-regexp' |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3528 (or comint-redirect-insert-matching-regexp |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3529 (and (string-match comint-redirect-finished-regexp filtered-input-string) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3530 (setq filtered-input-string |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3531 (replace-match "" nil nil filtered-input-string)))) |
32326 | 3532 |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3533 ;; Send output to all registered buffers |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3534 (save-excursion |
54879 | 3535 (dolist (buf output-buffer-list) |
3536 ;; Set this buffer to the output buffer | |
3537 (set-buffer (get-buffer-create buf)) | |
3538 ;; Go to the end of the buffer | |
3539 (goto-char (point-max)) | |
3540 ;; Insert the output | |
3541 (let ((inhibit-read-only comint-redirect-subvert-readonly)) | |
3542 (insert filtered-input-string)))) | |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3543 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3544 ;; Message |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3545 (and comint-redirect-verbose |
32326 | 3546 (message "Redirected output to buffer(s) %s" |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3547 (mapconcat 'identity output-buffer-list " "))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3548 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3549 ;; If we see the prompt, tidy up |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3550 ;; We'll look for the prompt in the original string, so nobody can |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3551 ;; clobber it |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3552 (and (string-match comint-redirect-finished-regexp input-string) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3553 (progn |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3554 (and comint-redirect-verbose |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3555 (message "Redirection completed")) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3556 (comint-redirect-cleanup) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3557 (run-hooks 'comint-redirect-hook))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3558 ;; Echo input? |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3559 (if comint-redirect-echo-input |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3560 filtered-input-string |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3561 ""))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3562 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3563 ;;;###autoload |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3564 (defun comint-redirect-send-command (command output-buffer echo &optional no-display) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3565 "Send COMMAND to process in current buffer, with output to OUTPUT-BUFFER. |
54879 | 3566 With prefix arg ECHO, echo output in process buffer. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3567 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3568 If NO-DISPLAY is non-nil, do not show the output buffer." |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3569 (interactive "sCommand: \nBOutput Buffer: \nP") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3570 (let ((process (get-buffer-process (current-buffer)))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3571 (if process |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3572 (comint-redirect-send-command-to-process |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3573 command output-buffer (current-buffer) echo no-display) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3574 (error "No process for current buffer")))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3575 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3576 ;;;###autoload |
32326 | 3577 (defun comint-redirect-send-command-to-process |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3578 (command output-buffer process echo &optional no-display) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3579 "Send COMMAND to PROCESS, with output to OUTPUT-BUFFER. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3580 With prefix arg, echo output in process buffer. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3581 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3582 If NO-DISPLAY is non-nil, do not show the output buffer." |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3583 (interactive "sCommand: \nBOutput Buffer: \nbProcess Buffer: \nP") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3584 (let* (;; The process buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3585 (process-buffer (if (processp process) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3586 (process-buffer process) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3587 process)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3588 (proc (get-buffer-process process-buffer))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3589 ;; Change to the process buffer |
42831
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3590 (with-current-buffer process-buffer |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3591 |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3592 ;; Make sure there's a prompt in the current process buffer |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3593 (and comint-redirect-perform-sanity-check |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3594 (save-excursion |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3595 (goto-char (point-max)) |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3596 (or (re-search-backward comint-prompt-regexp nil t) |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3597 (error "No prompt found or `comint-prompt-regexp' not set properly")))) |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3598 |
42831
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3599 ;; Set up for redirection |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3600 (comint-redirect-setup |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3601 output-buffer |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3602 (current-buffer) ; Comint Buffer |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3603 comint-prompt-regexp ; Finished Regexp |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3604 echo) ; Echo input |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3605 |
42831
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3606 ;; Set the filter |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3607 (setq comint-redirect-original-filter-function ; Save the old filter |
42831
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3608 (process-filter proc)) |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3609 (set-process-filter proc 'comint-redirect-filter) |
32326 | 3610 |
42831
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3611 ;; Send the command |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3612 (process-send-string (current-buffer) (concat command "\n")) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3613 |
42831
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3614 ;; Show the output |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3615 (or no-display |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3616 (display-buffer |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3617 (get-buffer-create |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3618 (if (listp output-buffer) |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3619 (car output-buffer) |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3620 output-buffer))))))) |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3621 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3622 ;;;###autoload |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3623 (defun comint-redirect-results-list (command regexp regexp-group) |
32326 | 3624 "Send COMMAND to current process. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3625 Return a list of expressions in the output which match REGEXP. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3626 REGEXP-GROUP is the regular expression group in REGEXP to use." |
32326 | 3627 (comint-redirect-results-list-from-process |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3628 (get-buffer-process (current-buffer)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3629 command regexp regexp-group)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3630 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3631 ;;;###autoload |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3632 (defun comint-redirect-results-list-from-process (process command regexp regexp-group) |
32326 | 3633 "Send COMMAND to PROCESS. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3634 Return a list of expressions in the output which match REGEXP. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3635 REGEXP-GROUP is the regular expression group in REGEXP to use." |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3636 (let ((output-buffer " *Comint Redirect Work Buffer*") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3637 results) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3638 (with-current-buffer (get-buffer-create output-buffer) |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3639 (erase-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3640 (comint-redirect-send-command-to-process command |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3641 output-buffer process nil t) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3642 ;; Wait for the process to complete |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3643 (set-buffer (process-buffer process)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3644 (while (null comint-redirect-completed) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3645 (accept-process-output nil 1)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3646 ;; Collect the output |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3647 (set-buffer output-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3648 (goto-char (point-min)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3649 ;; Skip past the command, if it was echoed |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3650 (and (looking-at command) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3651 (forward-line)) |
32326 | 3652 (while (re-search-forward regexp nil t) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3653 (push (buffer-substring-no-properties |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3654 (match-beginning regexp-group) |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3655 (match-end regexp-group)) |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3656 results)) |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3657 results))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3658 |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3659 (dolist (x '("^Not at command line$" |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3660 "^Empty input ring$" |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3661 "^No history$" |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3662 "^Not found$" ; Too common? |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3663 "^Current buffer has no process$")) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3664 (add-to-list 'debug-ignored-errors x)) |
39713
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
3665 |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3666 |
14169 | 3667 ;; Converting process modes to use comint mode |
3668 ;; =========================================================================== | |
3669 ;; The code in the Emacs 19 distribution has all been modified to use comint | |
3670 ;; where needed. However, there are `third-party' packages out there that | |
3671 ;; still use the old shell mode. Here's a guide to conversion. | |
3672 ;; | |
3673 ;; Renaming variables | |
3674 ;; Most of the work is renaming variables and functions. These are the common | |
3675 ;; ones: | |
3676 ;; Local variables: | |
3677 ;; last-input-start comint-last-input-start | |
32326 | 3678 ;; last-input-end comint-last-input-end |
14169 | 3679 ;; shell-prompt-pattern comint-prompt-regexp |
3680 ;; shell-set-directory-error-hook <no equivalent> | |
3681 ;; Miscellaneous: | |
3682 ;; shell-set-directory <unnecessary> | |
32326 | 3683 ;; shell-mode-map comint-mode-map |
14169 | 3684 ;; Commands: |
3685 ;; shell-send-input comint-send-input | |
3686 ;; shell-send-eof comint-delchar-or-maybe-eof | |
32326 | 3687 ;; kill-shell-input comint-kill-input |
14169 | 3688 ;; interrupt-shell-subjob comint-interrupt-subjob |
3689 ;; stop-shell-subjob comint-stop-subjob | |
3690 ;; quit-shell-subjob comint-quit-subjob | |
3691 ;; kill-shell-subjob comint-kill-subjob | |
32613
6aece997f0f9
(comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents:
32598
diff
changeset
|
3692 ;; kill-output-from-shell comint-delete-output |
14169 | 3693 ;; show-output-from-shell comint-show-output |
3694 ;; copy-last-shell-input Use comint-previous-input/comint-next-input | |
3695 ;; | |
3696 ;; SHELL-SET-DIRECTORY is gone, its functionality taken over by | |
3697 ;; SHELL-DIRECTORY-TRACKER, the shell mode's comint-input-filter-functions. | |
3698 ;; Comint mode does not provide functionality equivalent to | |
3699 ;; shell-set-directory-error-hook; it is gone. | |
3700 ;; | |
3701 ;; comint-last-input-start is provided for modes which want to munge | |
3702 ;; the buffer after input is sent, perhaps because the inferior | |
3703 ;; insists on echoing the input. The LAST-INPUT-START variable in | |
3704 ;; the old shell package was used to implement a history mechanism, | |
3705 ;; but you should think twice before using comint-last-input-start | |
3706 ;; for this; the input history ring often does the job better. | |
32326 | 3707 ;; |
14169 | 3708 ;; If you are implementing some process-in-a-buffer mode, called foo-mode, do |
3709 ;; *not* create the comint-mode local variables in your foo-mode function. | |
3710 ;; This is not modular. Instead, call comint-mode, and let *it* create the | |
3711 ;; necessary comint-specific local variables. Then create the | |
3712 ;; foo-mode-specific local variables in foo-mode. Set the buffer's keymap to | |
3713 ;; be foo-mode-map, and its mode to be foo-mode. Set the comint-mode hooks | |
3714 ;; (comint-{prompt-regexp, input-filter, input-filter-functions, | |
3715 ;; get-old-input) that need to be different from the defaults. Call | |
3716 ;; foo-mode-hook, and you're done. Don't run the comint-mode hook yourself; | |
3717 ;; comint-mode will take care of it. The following example, from shell.el, | |
3718 ;; is typical: | |
32326 | 3719 ;; |
14169 | 3720 ;; (defvar shell-mode-map '()) |
3721 ;; (cond ((not shell-mode-map) | |
3722 ;; (setq shell-mode-map (copy-keymap comint-mode-map)) | |
3723 ;; (define-key shell-mode-map "\C-c\C-f" 'shell-forward-command) | |
3724 ;; (define-key shell-mode-map "\C-c\C-b" 'shell-backward-command) | |
3725 ;; (define-key shell-mode-map "\t" 'comint-dynamic-complete) | |
3726 ;; (define-key shell-mode-map "\M-?" | |
3727 ;; 'comint-dynamic-list-filename-completions))) | |
3728 ;; | |
3729 ;; (defun shell-mode () | |
3730 ;; (interactive) | |
3731 ;; (comint-mode) | |
3732 ;; (setq comint-prompt-regexp shell-prompt-pattern) | |
3733 ;; (setq major-mode 'shell-mode) | |
3734 ;; (setq mode-name "Shell") | |
3735 ;; (use-local-map shell-mode-map) | |
3736 ;; (make-local-variable 'shell-directory-stack) | |
3737 ;; (setq shell-directory-stack nil) | |
3738 ;; (add-hook 'comint-input-filter-functions 'shell-directory-tracker) | |
62740
073c3cc1d1d5
Use run-mode-hooks in example.
Lute Kamstra <lute@gnu.org>
parents:
61922
diff
changeset
|
3739 ;; (run-mode-hooks 'shell-mode-hook)) |
14169 | 3740 ;; |
3741 ;; | |
3742 ;; Completion for comint-mode users | |
32326 | 3743 ;; |
14169 | 3744 ;; For modes that use comint-mode, comint-dynamic-complete-functions is the |
3745 ;; hook to add completion functions to. Functions on this list should return | |
3746 ;; non-nil if completion occurs (i.e., further completion should not occur). | |
3747 ;; You could use comint-dynamic-simple-complete to do the bulk of the | |
3748 ;; completion job. | |
584 | 3749 |
39713
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
3750 |
584 | 3751 (provide 'comint) |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
638
diff
changeset
|
3752 |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
3753 ;; arch-tag: 1793314c-09db-40be-9549-9aeae3e75164 |
38409
153f1b1f2efd
Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents:
38073
diff
changeset
|
3754 ;;; comint.el ends here |