Mercurial > emacs
annotate lisp/comint.el @ 109064:b44ac3c3bafd
merge trunk
author | Kenichi Handa <handa@etlken> |
---|---|
date | Mon, 28 Jun 2010 12:32:18 +0900 |
parents | cdae067c62d3 |
children | 60516122d066 |
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 |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
3 ;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
106815 | 4 ;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
100577
0e2212f6d1b0
(comint-save-input-ring-index): Add missing initial value.
Glenn Morris <rgm@gnu.org>
parents:
100171
diff
changeset
|
5 ;; 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 |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
811
diff
changeset
|
11 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
12 ;; This file is part of GNU Emacs. |
114 | 13 |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93134
diff
changeset
|
14 ;; 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
|
15 ;; 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
|
16 ;; 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
|
17 ;; (at your option) any later version. |
114 | 18 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
19 ;; 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
|
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
22 ;; GNU General Public License for more details. |
114 | 23 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
24 ;; 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
|
25 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
114 | 26 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
793
diff
changeset
|
27 ;;; Commentary: |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
793
diff
changeset
|
28 |
14169 | 29 ;; This file defines a general command-interpreter-in-a-buffer package |
54879 | 30 ;; (comint mode). The idea is that you can build specific process-in-a-buffer |
31 ;; modes on top of comint mode -- e.g., Lisp, shell, scheme, T, soar, .... | |
32326 | 32 ;; This way, all these specific packages share a common base functionality, |
14169 | 33 ;; and a common set of bindings, which makes them easier to use (and |
34 ;; saves code, implementation time, etc., etc.). | |
114 | 35 |
14169 | 36 ;; Several packages are already defined using comint mode: |
37 ;; - shell.el defines a shell-in-a-buffer mode. | |
38 ;; - cmulisp.el defines a simple lisp-in-a-buffer mode. | |
39 ;; | |
40 ;; - The file cmuscheme.el defines a scheme-in-a-buffer mode. | |
41 ;; - The file tea.el tunes scheme and inferior-scheme modes for T. | |
54879 | 42 ;; - The file soar.el tunes Lisp and inferior-lisp modes for Soar. |
43 ;; - cmutex.el defines TeX and LaTeX modes that invoke TeX, LaTeX, BibTeX, | |
44 ;; previewers, and printers from within Emacs. | |
45 ;; - background.el allows csh-like job control inside Emacs. | |
14169 | 46 ;; It is pretty easy to make new derived modes for other processes. |
584 | 47 |
54879 | 48 ;; For documentation on the functionality provided by Comint mode, and |
14169 | 49 ;; the hooks available for customising it, see the comments below. |
32326 | 50 ;; For further information on the standard derived modes (shell, |
14169 | 51 ;; inferior-lisp, inferior-scheme, ...), see the relevant source files. |
114 | 52 |
14169 | 53 ;; For hints on converting existing process modes (e.g., tex-mode, |
54 ;; background, dbx, gdb, kermit, prolog, telnet) to use comint-mode | |
55 ;; instead of shell-mode, see the notes at the end of this file. | |
114 | 56 |
57 | |
14169 | 58 ;; Brief Command Documentation: |
59 ;;============================================================================ | |
60 ;; Comint Mode Commands: (common to all derived modes, like shell & cmulisp | |
61 ;; mode) | |
62 ;; | |
54879 | 63 ;; M-p comint-previous-input Cycle backwards in input history |
64 ;; 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
|
65 ;; M-r comint-history-isearch-backward-regexp Isearch input regexp backward |
54879 | 66 ;; M-C-l comint-show-output Show last batch of process output |
67 ;; RET comint-send-input | |
68 ;; C-d comint-delchar-or-maybe-eof Delete char unless at end of buff | |
69 ;; 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
|
70 ;; second time, move to process-mark. |
54879 | 71 ;; C-c C-u comint-kill-input ^u |
72 ;; C-c C-w backward-kill-word ^w | |
73 ;; C-c C-c comint-interrupt-subjob ^c | |
74 ;; C-c C-z comint-stop-subjob ^z | |
75 ;; C-c C-\ comint-quit-subjob ^\ | |
76 ;; C-c C-o comint-delete-output Delete last batch of process output | |
77 ;; C-c C-r comint-show-output Show last batch of process output | |
78 ;; C-c C-l comint-dynamic-list-input-ring List input history | |
14169 | 79 ;; |
80 ;; Not bound by default in comint-mode (some are in shell mode) | |
81 ;; comint-run Run a program under comint-mode | |
82 ;; send-invisible Read a line w/o echo, and send to proc | |
83 ;; comint-dynamic-complete-filename Complete filename at point. | |
84 ;; comint-dynamic-list-filename-completions List completions in help buffer. | |
85 ;; comint-replace-by-expanded-filename Expand and complete filename at point; | |
86 ;; replace with expanded/completed name. | |
87 ;; comint-replace-by-expanded-history Expand history at point; | |
88 ;; replace with expanded name. | |
89 ;; comint-magic-space Expand history and add (a) space(s). | |
90 ;; comint-kill-subjob No mercy. | |
91 ;; comint-show-maximum-output Show as much output as possible. | |
92 ;; comint-continue-subjob Send CONT signal to buffer's process | |
54879 | 93 ;; group. Useful if you accidentally |
14169 | 94 ;; 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
|
95 ;; 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
|
96 ;; 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
|
97 ;; as input. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
98 ;; 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
|
99 ;; comint-set-process-mark Set process-mark to point. |
114 | 100 |
54879 | 101 ;; comint-mode-hook is the Comint mode hook. Basically for your keybindings. |
584 | 102 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
793
diff
changeset
|
103 ;;; Code: |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
793
diff
changeset
|
104 |
1131 | 105 (require 'ring) |
114 | 106 |
14169 | 107 ;; Buffer Local Variables: |
108 ;;============================================================================ | |
109 ;; Comint mode buffer local variables: | |
32326 | 110 ;; 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
|
111 ;; 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
|
112 ;; 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
|
113 ;; 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
|
114 ;; 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
|
115 ;; 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
|
116 ;; comint-input-ring-index number ... |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
117 ;; 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
|
118 ;; 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
|
119 ;; 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
|
120 ;; 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
|
121 ;; 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
|
122 ;; 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
|
123 ;; comint-file-name-quote-list list ... |
32326 | 124 ;; 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
|
125 ;; 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
|
126 ;; 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
|
127 ;; 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
|
128 ;; 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
|
129 ;; 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
|
130 ;; 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
|
131 ;; 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
|
132 ;; comint-scroll-to-bottom-on-input symbol For scroll behavior |
74693 | 133 ;; comint-move-point-for-output symbol ... |
32326 | 134 ;; 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
|
135 ;; comint-accum-marker maker For comint-accumulate |
14169 | 136 ;; |
137 ;; 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
|
138 ;; 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
|
139 ;; 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
|
140 ;; comint-completion-recexact boolean ... |
114 | 141 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
142 (defgroup comint nil |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
143 "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
|
144 :group 'processes) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
145 |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
146 (defgroup comint-completion nil |
64000
e1ccb8b46dea
(comint-completion, comint-source): Finsh `degroup' descriptions with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63813
diff
changeset
|
147 "Completion facilities in comint." |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
148 :group 'comint) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
149 |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
150 (defgroup comint-source nil |
64000
e1ccb8b46dea
(comint-completion, comint-source): Finsh `degroup' descriptions with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63813
diff
changeset
|
151 "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
|
152 :prefix "comint-" |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
153 :group 'comint) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
154 |
584 | 155 (defvar comint-prompt-regexp "^" |
63502
f0f76b7d0f74
(comint-replace-by-expanded-filename, comint-prompt-regexp,
Juanma Barranquero <lekktu@gmail.com>
parents:
63175
diff
changeset
|
156 "Regexp to recognize prompts in the inferior process. |
584 | 157 Defaults to \"^\", the null string at BOL. |
114 | 158 |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
159 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
|
160 `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
|
161 |
114 | 162 Good choices: |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
163 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
|
164 Lucid Common Lisp: \"^\\\\(>\\\\|\\\\(->\\\\)+\\\\) *\" |
fc25d1816641
* comint.el (comint-prompt-regexp): Double the backslashes in the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
165 franz: \"^\\\\(->\\\\|<[0-9]*>:\\\\) *\" |
584 | 166 kcl: \"^>+ *\" |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
167 shell: \"^[^#$%>\\n]*[#$%>] *\" |
584 | 168 T: \"^>+ *\" |
114 | 169 |
584 | 170 This is a good thing to set in mode hooks.") |
114 | 171 |
55223
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
172 (defcustom comint-prompt-read-only nil |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
173 "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
|
174 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
|
175 This does not affect existing prompts. |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
176 Certain derived modes may override this option. |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
177 |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
178 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
|
179 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
|
180 `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
|
181 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
|
182 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
|
183 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
|
184 |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
185 \(add-hook 'comint-mode-hook |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
186 (lambda () |
61302
aedce81482bf
(comint-prompt-read-only): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
60898
diff
changeset
|
187 (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
|
188 (define-key comint-mode-map [C-S-backspace] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
189 'comint-kill-whole-line))) |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
190 |
61368
015e8d66f6a0
(comint-prompt-read-only): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61302
diff
changeset
|
191 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
|
192 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
|
193 :type 'boolean |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
194 :group 'comint |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59776
diff
changeset
|
195 :version "22.1") |
55223
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
196 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
197 (defvar comint-delimiter-argument-list () |
63502
f0f76b7d0f74
(comint-replace-by-expanded-filename, comint-prompt-regexp,
Juanma Barranquero <lekktu@gmail.com>
parents:
63175
diff
changeset
|
198 "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
|
199 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
|
200 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
|
201 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
|
202 Defaults to the empty list. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
203 |
6154
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
204 For shells, a good value is (?\\| ?& ?< ?> ?\\( ?\\) ?;). |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
205 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
206 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
|
207 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
208 (defcustom comint-input-autoexpand nil |
100171 | 209 "If non-nil, expand input command history references on completion. |
54879 | 210 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
|
211 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
212 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
|
213 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
|
214 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
|
215 `comint-dynamic-complete'. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
216 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
217 This variable is buffer-local." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
218 :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
|
219 (const input) |
22569
b5923f76f35b
(comint-input-autoexpand): Use `other' widget type.
Andreas Schwab <schwab@suse.de>
parents:
22272
diff
changeset
|
220 (const history) |
b5923f76f35b
(comint-input-autoexpand): Use `other' widget type.
Andreas Schwab <schwab@suse.de>
parents:
22272
diff
changeset
|
221 (other :tag "on" t)) |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
222 :group 'comint) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
223 |
42450
c32f238e8a16
(comint-highlight-input): Use :weight, not :bold.
Richard M. Stallman <rms@gnu.org>
parents:
42341
diff
changeset
|
224 (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
|
225 "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
|
226 :group 'comint) |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
227 |
32743
fd31939b0747
(comint-highlight-input, comint-highlight-prompt):
Miles Bader <miles@gnu.org>
parents:
32635
diff
changeset
|
228 (defface comint-highlight-prompt |
61404
f6ddc48bc826
(comint-highlight-prompt): Fix face spec.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61396
diff
changeset
|
229 '((((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
|
230 (((background dark)) (:foreground "cyan")) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
231 (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
|
232 "Face to use to highlight prompts." |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
233 :group 'comint) |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
234 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
235 (defcustom comint-input-ignoredups nil |
100171 | 236 "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
|
237 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
|
238 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
239 This variable is buffer-local." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
240 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
241 :group 'comint) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
242 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
243 (defcustom comint-input-ring-file-name nil |
100171 | 244 "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
|
245 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
|
246 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
247 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
|
248 :type '(choice (const :tag "nil" nil) |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
249 file) |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
250 :group 'comint) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
251 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
252 (defcustom comint-scroll-to-bottom-on-input nil |
100171 | 253 "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
|
254 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
|
255 If `this', scroll only the selected window. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
256 |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
257 The default is nil. |
4880
a658d0e341b1
(comint-scroll-to-bottom-on-input)
Richard M. Stallman <rms@gnu.org>
parents:
4872
diff
changeset
|
258 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
259 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
|
260 :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
|
261 (const t) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
262 (const all) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
263 (const this)) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
264 :group 'comint) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
265 |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
266 (defcustom comint-move-point-for-output nil |
100171 | 267 "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
|
268 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
|
269 (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
|
270 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
|
271 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
|
272 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
|
273 |
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
274 The default is nil. |
4880
a658d0e341b1
(comint-scroll-to-bottom-on-input)
Richard M. Stallman <rms@gnu.org>
parents:
4872
diff
changeset
|
275 |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
276 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
|
277 `comint-postoutput-scroll-to-bottom'. |
54879 | 278 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
|
279 :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
|
280 (const t) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
281 (const all) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
282 (const this) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
283 (const others)) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
284 :group 'comint) |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
285 |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
286 (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
|
287 |
43028
5a7c132708d2
(comint-scroll-show-maximum-output): Default is t.
Richard M. Stallman <rms@gnu.org>
parents:
42887
diff
changeset
|
288 (defcustom comint-scroll-show-maximum-output t |
100171 | 289 "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
|
290 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
|
291 \(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
|
292 `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
|
293 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
|
294 |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
295 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
|
296 and point is on the last line. A value of nil |
54879 | 297 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
|
298 |
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
299 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
|
300 `comint-postoutput-scroll-to-bottom'. |
54879 | 301 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
|
302 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
303 :group 'comint) |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
304 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
305 (defcustom comint-buffer-maximum-size 1024 |
100171 | 306 "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
|
307 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
|
308 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
|
309 :type 'integer |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
310 :group 'comint) |
10833
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
311 |
106690
4d6afab8b7cb
* comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents:
106485
diff
changeset
|
312 (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
|
313 "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
|
314 :type 'integer |
4d6afab8b7cb
* comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents:
106485
diff
changeset
|
315 :group 'comint |
4d6afab8b7cb
* comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents:
106485
diff
changeset
|
316 :version "23.2") |
114 | 317 |
25443
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
318 (defvar comint-input-ring-separator "\n" |
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
319 "Separator between commands in the history file.") |
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
320 |
34977
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
321 (defvar comint-input-history-ignore "^#" |
54879 | 322 "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
|
323 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
324 (defcustom comint-process-echoes nil |
100171 | 325 "If non-nil, assume that the subprocess echoes any input. |
2539
577c77cfd199
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
2518
diff
changeset
|
326 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
|
327 appears in the buffer. |
2539
577c77cfd199
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
2518
diff
changeset
|
328 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
329 This variable is buffer-local." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
330 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
331 :group 'comint) |
2539
577c77cfd199
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
2518
diff
changeset
|
332 |
24471
cddc33d259d4
(comint-password-prompt-regexp): Accept "login password:"
Karl Heuer <kwzh@gnu.org>
parents:
23615
diff
changeset
|
333 ;; 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
|
334 ;; 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
|
335 ;; 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
|
336 ;; 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
|
337 ;; 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
|
338 ;; 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
|
339 ;; 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
|
340 ;; 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
|
341 (defcustom comint-password-prompt-regexp |
107824
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
342 (concat |
108969
cdae067c62d3
Fix for comint-password-prompt-regexp (Bug#6367).
Chong Yidong <cyd@stupidchicken.com>
parents:
108716
diff
changeset
|
343 "\\(" |
107824
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
344 (regexp-opt |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
345 '("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
|
346 "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
|
347 " +\\)?" |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
348 (regexp-opt |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
349 '("password" "Password" "passphrase" "Passphrase" |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
350 "pass phrase" "Pass phrase")) |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
351 "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\ |
ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
352 \\(?: for [^:]+\\)?:\\s *\\'") |
100171 | 353 "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
|
354 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
|
355 :type 'regexp |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
356 :group 'comint) |
8087
c22d7c5168f5
comint-password-prompt-regexp: New variable.
Noah Friedman <friedman@splode.com>
parents:
8060
diff
changeset
|
357 |
14169 | 358 ;; Here are the per-interpreter hooks. |
584 | 359 (defvar comint-get-old-input (function comint-get-old-input-default) |
54879 | 360 "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
|
361 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
|
362 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
|
363 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
|
364 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
|
365 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
|
366 `comint-use-prompt-regexp'.") |
114 | 367 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
368 (defvar comint-dynamic-complete-functions |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
369 '(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
|
370 "List of functions called to perform completion. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
371 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
|
372 See also `comint-dynamic-complete'. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
373 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
374 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
|
375 |
584 | 376 (defvar comint-input-filter |
377 (function (lambda (str) (not (string-match "\\`\\s *\\'" str)))) | |
378 "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
|
379 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
|
380 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
|
381 |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
382 (defvar comint-input-filter-functions '() |
57603
bdfa227d18a8
(comint-insert-input): Use @ in `interactive'.
Richard M. Stallman <rms@gnu.org>
parents:
57539
diff
changeset
|
383 "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
|
384 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
|
385 |
61922
073c1d646ae1
(comint-output-filter-functions): Add autoload cookie.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61873
diff
changeset
|
386 ;;;###autoload |
57539
8c6fc4afae74
(comint-output-filter-functions): Add comint-watch-for-password-prompt.
Richard M. Stallman <rms@gnu.org>
parents:
57420
diff
changeset
|
387 (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
|
388 "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
|
389 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
|
390 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
|
391 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
|
392 `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
|
393 functions have already modified the buffer. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
394 |
19515
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
395 See also `comint-preoutput-filter-functions'. |
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
396 |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
397 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
|
398 either globally or locally.") |
584 | 399 |
42693
13a21b2786c0
(comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42669
diff
changeset
|
400 (defvar comint-input-sender-no-newline nil |
13a21b2786c0
(comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42669
diff
changeset
|
401 "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
|
402 |
584 | 403 (defvar comint-input-sender (function comint-simple-send) |
404 "Function to actually send to PROCESS the STRING submitted by user. | |
32326 | 405 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
|
406 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
|
407 `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
|
408 \(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
|
409 This is called from the user command `comint-send-input'.") |
584 | 410 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
411 (defcustom comint-eol-on-send t |
100171 | 412 "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
|
413 See `comint-send-input'." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
414 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
415 :group 'comint) |
114 | 416 |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
417 ;; 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
|
418 ;; 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
|
419 ;; places that need attention. |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
420 (defcustom comint-use-prompt-regexp nil |
100171 | 421 "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
|
422 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
|
423 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
|
424 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
|
425 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
|
426 :type 'boolean |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
427 :group 'comint) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
428 |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
429 ;; Autoload is necessary for Custom to recognize old alias. |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
430 ;;;###autoload |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
431 (define-obsolete-variable-alias 'comint-use-prompt-regexp-instead-of-fields |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
432 'comint-use-prompt-regexp "22.1") |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
433 |
63172
14e29b4d395f
(comint-mode-hook): Do not enable Font Lock by default.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63170
diff
changeset
|
434 (defcustom comint-mode-hook nil |
54879 | 435 "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
|
436 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
|
437 :type 'hook |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
438 :group 'comint) |
584 | 439 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
440 (defcustom comint-exec-hook '() |
54879 | 441 "Hook run each time a process is exec'd by `comint-exec'. |
584 | 442 This is called after the process is cranked up. It is useful for things that |
54879 | 443 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
|
444 `(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
|
445 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
|
446 :type 'hook |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
447 :group 'comint) |
584 | 448 |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
449 (defvar comint-mode-map |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
450 (let ((map (make-sparse-keymap))) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
451 ;; Keys: |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
452 (define-key map "\ep" 'comint-previous-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
453 (define-key map "\en" 'comint-next-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
454 (define-key map [C-up] 'comint-previous-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
455 (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
|
456 (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
|
457 (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
|
458 (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
|
459 (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
|
460 (define-key map "\C-m" 'comint-send-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
461 (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
|
462 ;; 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
|
463 ;; 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
|
464 (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
|
465 (define-key map [kp-delete] 'delete-char) |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
466 (define-key map "\C-c " 'comint-accumulate) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
467 (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
|
468 (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
|
469 (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
|
470 (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
|
471 (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
|
472 (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
|
473 (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
|
474 (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
|
475 (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
|
476 (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
|
477 (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
|
478 (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
|
479 (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
|
480 (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
|
481 (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
|
482 (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
|
483 (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
|
484 ;; Mouse Buttons: |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
485 (define-key map [mouse-2] 'comint-insert-input) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
486 ;; Menu bars: |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
487 ;; completion: |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
488 (define-key map [menu-bar completion] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
489 (cons "Complete" (make-sparse-keymap "Complete"))) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
490 (define-key map [menu-bar completion complete-expand] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
491 '("Expand File Name" . comint-replace-by-expanded-filename)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
492 (define-key map [menu-bar completion complete-listing] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
493 '("File Completion Listing" . comint-dynamic-list-filename-completions)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
494 (define-key map [menu-bar completion complete-file] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
495 '("Complete File Name" . comint-dynamic-complete-filename)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
496 (define-key map [menu-bar completion complete] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
497 '("Complete Before Point" . comint-dynamic-complete)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
498 ;; Input history: |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
499 (define-key map [menu-bar inout] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
500 (cons "In/Out" (make-sparse-keymap "In/Out"))) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
501 (define-key map [menu-bar inout delete-output] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
502 '("Delete Current Output Group" . comint-delete-output)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
503 (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
|
504 '("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
|
505 (define-key map [menu-bar inout write-output] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
506 '("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
|
507 (define-key map [menu-bar inout next-prompt] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
508 '("Forward Output Group" . comint-next-prompt)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
509 (define-key map [menu-bar inout previous-prompt] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
510 '("Backward Output Group" . comint-previous-prompt)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
511 (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
|
512 '("Show Maximum Output" . comint-show-maximum-output)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
513 (define-key map [menu-bar inout show-output] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
514 '("Show Current Output Group" . comint-show-output)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
515 (define-key map [menu-bar inout kill-input] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
516 '("Kill Current Input" . comint-kill-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
517 (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
|
518 '("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
|
519 (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
|
520 '("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
|
521 (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
|
522 '("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
|
523 (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
|
524 '("Forward Matching Input..." . comint-forward-matching-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
525 (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
|
526 '("Backward Matching Input..." . comint-backward-matching-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
527 (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
|
528 '("Next Matching Input..." . comint-next-matching-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
529 (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
|
530 '("Previous Matching Input..." . comint-previous-matching-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
531 (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
|
532 '("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
|
533 (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
|
534 '("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
|
535 (define-key map [menu-bar inout next-history] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
536 '("Next Input" . comint-next-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
537 (define-key map [menu-bar inout previous-history] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
538 '("Previous Input" . comint-previous-input)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
539 (define-key map [menu-bar inout list-history] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
540 '("List Input History" . comint-dynamic-list-input-ring)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
541 (define-key map [menu-bar inout expand-history] |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
542 '("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
|
543 ;; Signals |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
544 (let ((signals-map (make-sparse-keymap "Signals"))) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
545 (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
|
546 (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
|
547 (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
|
548 (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
|
549 (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
|
550 (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
|
551 (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
|
552 ;; Put them in the menu bar: |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
553 (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
|
554 menu-bar-final-items)) |
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
555 map)) |
114 | 556 |
54879 | 557 ;; Fixme: Is this still relevant? |
1131 | 558 (defvar comint-ptyp t |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
559 "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
|
560 This is to work around a bug in Emacs process signaling.") |
1131 | 561 |
932
a93f0b1ba909
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
925
diff
changeset
|
562 (defvar comint-input-ring nil) |
54879 | 563 (defvar comint-last-input-start nil) |
564 (defvar comint-last-input-end nil) | |
565 (defvar comint-last-output-start nil) | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
566 (defvar comint-input-ring-index nil |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
567 "Index of last matched history element.") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
568 (defvar comint-matching-input-from-input-string "" |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
569 "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
|
570 (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
|
571 "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
|
572 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
|
573 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
574 (defvar comint-accum-marker nil |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
575 "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
|
576 The command \\[comint-accumulate] sets this.") |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
577 |
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
|
578 (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
|
579 "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
|
580 |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
581 (put 'comint-replace-by-expanded-history 'menu-enable 'comint-input-autoexpand) |
1131 | 582 (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
|
583 (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
|
584 (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
|
585 (put 'comint-input-autoexpand 'permanent-local t) |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
586 (put 'comint-input-filter-functions 'permanent-local t) |
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
587 (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
|
588 (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
|
589 (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
|
590 (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
|
591 (put 'comint-scroll-show-maximum-output 'permanent-local t) |
1131 | 592 (put 'comint-ptyp 'permanent-local t) |
861
345296f94a1e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
593 |
17652
0d08e67b280f
(comint-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17583
diff
changeset
|
594 (put 'comint-mode 'mode-class 'special) |
0d08e67b280f
(comint-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17583
diff
changeset
|
595 |
31970
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
596 (define-derived-mode comint-mode fundamental-mode "Comint" |
114 | 597 "Major mode for interacting with an inferior interpreter. |
598 Interpreter name is same as buffer name, sans the asterisks. | |
599 Return at end of buffer sends line as input. | |
600 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
|
601 Setting variable `comint-eol-on-send' means jump to the end of the line |
584 | 602 before submitting new input. |
114 | 603 |
63175
b09a11c8c73e
(comint-check-proc, make-comint-in-buffer, comint-source-default): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
63172
diff
changeset
|
604 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
|
605 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
|
606 `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
|
607 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
|
608 `comint-prompt-regexp' to the appropriate regular expression. |
114 | 609 |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
610 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
|
611 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
|
612 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
|
613 \\[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
|
614 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
|
615 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
|
616 |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
617 Commands with no default key bindings include `send-invisible', |
32326 | 618 `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
|
619 `comint-magic-space'. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
620 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
621 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
|
622 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
|
623 `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
|
624 and `comint-move-point-for-output'. |
114 | 625 |
626 If you accidentally suspend your process, use \\[comint-continue-subjob] | |
627 to continue it. | |
628 | |
629 \\{comint-mode-map} | |
630 | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
631 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
|
632 (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
|
633 (set (make-local-variable 'window-point-insertion-type) t) |
41143
f1315eeb4c0b
(comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40828
diff
changeset
|
634 (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
|
635 (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
|
636 (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
|
637 (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
|
638 (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
|
639 (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
|
640 (make-local-variable 'comint-input-ring) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
641 (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
|
642 (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
|
643 (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
|
644 (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
|
645 (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
|
646 (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
|
647 (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
|
648 (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
|
649 (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
|
650 (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
|
651 (make-local-variable 'comint-input-autoexpand) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
652 (make-local-variable 'comint-input-ignoredups) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
653 (make-local-variable 'comint-delimiter-argument-list) |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
654 (make-local-variable 'comint-completion-fignore) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
655 (make-local-variable 'comint-get-old-input) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
656 (make-local-variable 'comint-input-filter) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
657 (make-local-variable 'comint-input-sender) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
658 (make-local-variable 'comint-eol-on-send) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
659 (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
|
660 (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
|
661 (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
|
662 (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
|
663 ;; 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
|
664 ;; 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
|
665 ;; 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
|
666 ;; 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
|
667 ;; 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
|
668 ;; |
48987
0bf251ecfd1a
(comint-mode): Localy set scroll-conservatively.
Richard M. Stallman <rms@gnu.org>
parents:
47377
diff
changeset
|
669 ;; 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
|
670 ;; (make-local-variable 'scroll-conservatively) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
671 ;; (setq scroll-conservatively 10000) |
23347
49e47671810d
make pre-command-hook & comint-exec-hook local hooks.
Simon Marshall <simon@gnu.org>
parents:
23209
diff
changeset
|
672 (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
|
673 (make-local-variable 'comint-ptyp) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
674 (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
|
675 (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
|
676 (make-local-variable 'comint-file-name-quote-list) |
73154
7efd5d5388ea
(comint-mode): Bind font-lock-defaults non-nil.
Richard M. Stallman <rms@gnu.org>
parents:
72833
diff
changeset
|
677 (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
|
678 (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
|
679 (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
|
680 (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
|
681 (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
|
682 (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
|
683 ;; 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
|
684 (set (make-local-variable 'next-line-add-newlines) nil)) |
114 | 685 |
584 | 686 (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
|
687 "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
|
688 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
|
689 BUFFER can be either a buffer or the name of one." |
584 | 690 (let ((proc (get-buffer-process buffer))) |
9388
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
691 (and proc (memq (process-status proc) '(open run stop))))) |
114 | 692 |
14644
325bc6726a7b
(make-comint, comint-run): Fix autoload cookie.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
693 ;;;###autoload |
32942
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
694 (defun make-comint-in-buffer (name buffer program &optional startfile &rest switches) |
54879 | 695 "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
|
696 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
|
697 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
|
698 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
|
699 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
|
700 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
|
701 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
|
702 process as its initial input. |
32942
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
703 |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
704 If PROGRAM is a string, any more args are arguments to PROGRAM." |
81801
2e8d5916d236
* comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents:
76897
diff
changeset
|
705 (or (fboundp 'start-file-process) |
32942
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
706 (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
|
707 (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
|
708 ;; 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
|
709 ;; 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
|
710 (unless (comint-check-proc buffer) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
711 (with-current-buffer buffer |
41143
f1315eeb4c0b
(comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40828
diff
changeset
|
712 (unless (derived-mode-p 'comint-mode) |
f1315eeb4c0b
(comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40828
diff
changeset
|
713 (comint-mode))) ; Install local vars, mode, keymap, ... |
32942
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
714 (comint-exec buffer name program startfile switches)) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
715 buffer) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
716 |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
717 ;;;###autoload |
114 | 718 (defun make-comint (name program &optional startfile &rest switches) |
54879 | 719 "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
|
720 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
|
721 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
|
722 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
|
723 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
|
724 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
|
725 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
|
726 process as its initial input. |
9388
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
727 |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
728 If PROGRAM is a string, any more args are arguments to PROGRAM." |
32942
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
729 (apply #'make-comint-in-buffer name nil program startfile switches)) |
114 | 730 |
14644
325bc6726a7b
(make-comint, comint-run): Fix autoload cookie.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
731 ;;;###autoload |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
732 (defun comint-run (program) |
54879 | 733 "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
|
734 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
|
735 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
|
736 hooks on this symbol are run in the buffer. |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
737 See `make-comint' and `comint-exec'." |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
738 (interactive "sRun program: ") |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
739 (let ((name (file-name-nondirectory program))) |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
740 (switch-to-buffer (make-comint name program)) |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
741 (run-hooks (intern-soft (concat "comint-" name "-hook"))))) |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
742 |
114 | 743 (defun comint-exec (buffer name command startfile switches) |
54879 | 744 "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
|
745 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
|
746 Blasts any old process running in the buffer. Doesn't set the buffer mode. |
54879 | 747 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
|
748 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
|
749 (with-current-buffer buffer |
114 | 750 (let ((proc (get-buffer-process buffer))) ; Blast any old process. |
751 (if proc (delete-process proc))) | |
752 ;; Crank up a new process | |
9388
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
753 (let ((proc |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
754 (if (consp command) |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
755 (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
|
756 (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
|
757 (set-process-filter proc 'comint-output-filter) |
584 | 758 (make-local-variable 'comint-ptyp) |
42205 | 759 (setq comint-ptyp process-connection-type) ; t if pty, nil if pipe. |
114 | 760 ;; Jump to the end, and set the process mark. |
584 | 761 (goto-char (point-max)) |
705 | 762 (set-marker (process-mark proc) (point)) |
114 | 763 ;; Feed it the startfile. |
764 (cond (startfile | |
765 ;;This is guaranteed to wait long enough | |
766 ;;but has bad results if the comint does not prompt at all | |
767 ;; (while (= size (buffer-size)) | |
768 ;; (sleep-for 1)) | |
769 ;;I hope 1 second is enough! | |
770 (sleep-for 1) | |
771 (goto-char (point-max)) | |
772 (insert-file-contents startfile) | |
773 (setq startfile (buffer-substring (point) (point-max))) | |
774 (delete-region (point) (point-max)) | |
584 | 775 (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
|
776 (run-hooks 'comint-exec-hook) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
777 buffer))) |
114 | 778 |
14169 | 779 ;; This auxiliary function cranks up the process for comint-exec in |
780 ;; the appropriate environment. | |
114 | 781 |
782 (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
|
783 (let ((process-environment |
6750
a864110c6fc7
(comint-exec-1): Handle both termcap and terminfo.
Karl Heuer <kwzh@gnu.org>
parents:
6507
diff
changeset
|
784 (nconc |
7327 | 785 ;; If using termcap, we specify `emacs' as the terminal type |
786 ;; 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
|
787 ;; If using terminfo, we specify `dumb' because that is |
7327 | 788 ;; a defined terminal type. `emacs' is not a defined terminal type |
789 ;; and there is no way for us to define it here. | |
790 ;; Some programs that use terminfo get very confused | |
791 ;; if TERM is not a valid terminal type. | |
42341 | 792 ;; ;; 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
|
793 (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
|
794 (list "TERM=dumb" "TERMCAP=" |
36896
76fed386fc02
(comint-exec-1): Set columns of the terminal to
Gerd Moellmann <gerd@gnu.org>
parents:
36695
diff
changeset
|
795 (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
|
796 (list "TERM=emacs" |
36896
76fed386fc02
(comint-exec-1): Set columns of the terminal to
Gerd Moellmann <gerd@gnu.org>
parents:
36695
diff
changeset
|
797 (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
|
798 (unless (getenv "EMACS") |
74058
05d799bc0cda
(comint-exec-1): Set EMACS and INSIDE_EMACS to t.
Chong Yidong <cyd@stupidchicken.com>
parents:
73154
diff
changeset
|
799 (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
|
800 (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
|
801 process-environment)) |
03f3cfdb6a11
(comint-exec-1): Make sure default-directory is a real dir.
Richard M. Stallman <rms@gnu.org>
parents:
9764
diff
changeset
|
802 (default-directory |
16944
54108c7f46e6
(comint-exec-1): Use file-accessible-directory-p.
Richard M. Stallman <rms@gnu.org>
parents:
16849
diff
changeset
|
803 (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
|
804 default-directory |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
805 "/")) |
22652
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
806 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
|
807 (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
|
808 ;; 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
|
809 ;; 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
|
810 (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
|
811 (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
|
812 ;; 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
|
813 (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
|
814 (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
|
815 (setq decoding (car coding-systems) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
816 encoding (cdr coding-systems))) |
81801
2e8d5916d236
* comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents:
76897
diff
changeset
|
817 ;; 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
|
818 ;; 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
|
819 ;; 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
|
820 ;; conversion. |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
821 (if (and decoding (not encoding)) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
822 (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
|
823 changed t)) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
824 (if changed |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
825 (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
|
826 proc)) |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
827 |
70575
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
828 (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
|
829 "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
|
830 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
|
831 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
|
832 (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
|
833 ;; 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
|
834 ;; 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
|
835 ;; (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
|
836 (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
|
837 field input) |
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
838 (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
|
839 ;; 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
|
840 ;; 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
|
841 (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
|
842 (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
|
843 (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
|
844 (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
|
845 (not (eq field 'input))) |
1fa2c9c50f03
(comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
846 ;; 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
|
847 ;; 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
|
848 ;; 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
|
849 ;; 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
|
850 (let* ((keys (this-command-keys)) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
851 (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
|
852 (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
|
853 (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
|
854 (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
|
855 (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
|
856 ;; 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
|
857 (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
|
858 ;; 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
|
859 (delete-region |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
860 (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
|
861 (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
|
862 (point)) |
f1f277c6c9fe
(comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103560
diff
changeset
|
863 ;; 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
|
864 (insert input))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
865 |
14169 | 866 ;; Input history processing in a buffer |
867 ;; =========================================================================== | |
868 ;; 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
|
869 |
14169 | 870 ;; Eleven commands: |
871 ;; comint-dynamic-list-input-ring List history in help buffer. | |
872 ;; comint-previous-input Previous input... | |
873 ;; comint-previous-matching-input ...matching a string. | |
874 ;; comint-previous-matching-input-from-input ... matching the current input. | |
875 ;; comint-next-input Next input... | |
876 ;; comint-next-matching-input ...matching a string. | |
877 ;; comint-next-matching-input-from-input ... matching the current input. | |
878 ;; comint-backward-matching-input Backwards input... | |
879 ;; comint-forward-matching-input ...matching a string. | |
880 ;; comint-replace-by-expanded-history Expand history at point; | |
881 ;; replace with expanded history. | |
882 ;; comint-magic-space Expand history and insert space. | |
883 ;; | |
884 ;; Three functions: | |
885 ;; comint-read-input-ring Read into comint-input-ring... | |
886 ;; comint-write-input-ring Write to comint-input-ring-file-name. | |
887 ;; 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
|
888 |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
889 (defun comint-read-input-ring (&optional silent) |
54879 | 890 "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
|
891 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
|
892 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
|
893 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
|
894 |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
895 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
|
896 failure to read the history file. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
897 |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
898 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
|
899 |
25443
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
900 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
|
901 `comint-input-ring-separator', and entries that match |
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
902 `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
|
903 comes last. |
25443
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
904 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
905 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
|
906 (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
|
907 (equal comint-input-ring-file-name "")) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
908 nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
909 ((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
|
910 (or silent |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
911 (message "Cannot read history file %s" |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
912 comint-input-ring-file-name))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
913 (t |
28880
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
914 (let* ((history-buf (get-buffer-create " *temp*")) |
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
915 (file comint-input-ring-file-name) |
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
916 (count 0) |
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
917 (size comint-input-ring-size) |
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
918 (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
|
919 (unwind-protect |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
920 (with-current-buffer history-buf |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
921 (widen) |
8032
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
922 (erase-buffer) |
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
923 (insert-file-contents file) |
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
924 ;; 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
|
925 ;; 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
|
926 (goto-char (point-max)) |
32623
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
927 (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
|
928 (while (and (< count size) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
929 (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
|
930 nil t) |
32623
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
931 (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
|
932 (setq start |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
933 (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
|
934 nil t) |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
935 (match-end 0) |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
936 (point-min))) |
32623
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
937 (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
|
938 (goto-char start) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
939 (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
|
940 history)) |
34977
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
941 (or (null comint-input-ignoredups) |
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
942 (ring-empty-p ring) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
943 (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
|
944 history)))) |
32623
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
945 (progn |
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
946 (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
|
947 (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
|
948 (kill-buffer history-buf)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
949 (setq comint-input-ring ring |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
950 comint-input-ring-index nil))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
951 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
952 (defun comint-write-input-ring () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
953 "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
|
954 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
|
955 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
|
956 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
|
957 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
958 Useful within process sentinels. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
959 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
960 See also `comint-read-input-ring'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
961 (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
|
962 (equal comint-input-ring-file-name "") |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
963 (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
|
964 nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
965 ((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
|
966 (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
|
967 (t |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
968 (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
|
969 (ring comint-input-ring) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
970 (file comint-input-ring-file-name) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
971 (index (ring-length ring))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
972 ;; 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
|
973 ;; 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
|
974 (with-current-buffer history-buf |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
975 (erase-buffer) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
976 (while (> index 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
977 (setq index (1- index)) |
32326 | 978 (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
|
979 (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
|
980 (kill-buffer nil)))))) |
584 | 981 |
114 | 982 |
42119
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
983 (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
|
984 |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
985 (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
|
986 "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
|
987 (interactive) |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
988 (let ((buffer completion-reference-buffer) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
989 beg end completion) |
42119
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
990 (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
|
991 (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
|
992 (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
|
993 (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
|
994 (if (null beg) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
995 (error "No history entry here")) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
996 (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
|
997 (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
|
998 (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
|
999 (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
|
1000 (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
|
1001 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1002 (defun comint-dynamic-list-input-ring () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1003 "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
|
1004 (interactive) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1005 (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
|
1006 (ring-empty-p comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1007 (message "No history") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1008 (let ((history nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1009 (history-buffer " *Input History*") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1010 (index (1- (ring-length comint-input-ring))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1011 (conf (current-window-configuration))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1012 ;; 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
|
1013 (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
|
1014 (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
|
1015 ;; 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
|
1016 (setq history (nreverse history)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1017 ;; Change "completion" to "history reference" |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1018 ;; to make the display accurate. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1019 (with-output-to-temp-buffer history-buffer |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1020 (display-completion-list history) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1021 (set-buffer history-buffer) |
42119
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1022 (let ((keymap (make-sparse-keymap))) |
cfeff2859949
(comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41932
diff
changeset
|
1023 (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
|
1024 (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
|
1025 (use-local-map keymap)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1026 (forward-line 3) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1027 (while (search-backward "completion" nil 'move) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1028 (replace-match "history reference"))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1029 (sit-for 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1030 (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
|
1031 (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
|
1032 (let ((ch (read-event))) |
64000
e1ccb8b46dea
(comint-completion, comint-source): Finsh `degroup' descriptions with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63813
diff
changeset
|
1033 (if (eq ch ?\s) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1034 (set-window-configuration conf) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1035 (setq unread-command-events (list ch))))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1036 |
584 | 1037 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1038 (defun comint-regexp-arg (prompt) |
54879 | 1039 "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
|
1040 (let* (;; Don't clobber this. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1041 (last-command last-command) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1042 (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
|
1043 'minibuffer-history-search-history))) |
79852
32dc15103b58
(comint-regexp-arg): Fix no-input case.
Glenn Morris <rgm@gnu.org>
parents:
79814
diff
changeset
|
1044 ;; 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
|
1045 ;; 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
|
1046 (list (if (string-equal regexp "") |
79852
32dc15103b58
(comint-regexp-arg): Fix no-input case.
Glenn Morris <rgm@gnu.org>
parents:
79814
diff
changeset
|
1047 (or (car minibuffer-history-search-history) |
32dc15103b58
(comint-regexp-arg): Fix no-input case.
Glenn Morris <rgm@gnu.org>
parents:
79814
diff
changeset
|
1048 regexp) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1049 regexp) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1050 (prefix-numeric-value current-prefix-arg)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1051 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1052 (defun comint-search-arg (arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1053 ;; 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
|
1054 (cond ((not (comint-after-pmark-p)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1055 (error "Not at command line")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1056 ((or (null comint-input-ring) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1057 (ring-empty-p comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1058 (error "Empty input ring")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1059 ((zerop arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1060 ;; 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
|
1061 (setq comint-input-ring-index nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1062 1) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1063 (t |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1064 arg))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1065 |
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
|
1066 (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
|
1067 "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
|
1068 (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
|
1069 (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
|
1070 (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
|
1071 (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
|
1072 (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
|
1073 (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
|
1074 (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
|
1075 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1076 (defun comint-search-start (arg) |
54879 | 1077 "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
|
1078 (if comint-input-ring-index |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1079 ;; 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
|
1080 (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
|
1081 (ring-length comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1082 ;; 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
|
1083 (if (>= arg 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1084 0 ; First elt for forward search |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1085 (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
|
1086 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1087 (defun comint-previous-input-string (arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1088 "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
|
1089 Moves relative to `comint-input-ring-index'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1090 (ring-ref comint-input-ring (if comint-input-ring-index |
32326 | 1091 (mod (+ arg comint-input-ring-index) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1092 (ring-length comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1093 arg))) |
114 | 1094 |
1095 (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
|
1096 "Cycle backwards through input history, saving input." |
114 | 1097 (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
|
1098 (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
|
1099 (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
|
1100 (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
|
1101 (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
|
1102 (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
|
1103 (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
|
1104 (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
|
1105 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
|
1106 (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
|
1107 (comint-previous-matching-input "." arg))) |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1108 |
114 | 1109 (defun comint-next-input (arg) |
1110 "Cycle forwards through input history." | |
1111 (interactive "*p") | |
1112 (comint-previous-input (- arg))) | |
1113 | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1114 (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
|
1115 "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
|
1116 Moves relative to `comint-input-ring-index'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1117 (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
|
1118 (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
|
1119 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1120 (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
|
1121 "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
|
1122 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
|
1123 (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
|
1124 (ring-empty-p comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1125 (error "No history")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1126 (let* ((len (ring-length comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1127 (motion (if (> arg 0) 1 -1)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1128 (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
|
1129 (tried-each-ring-item nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1130 (prev nil)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1131 ;; 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
|
1132 (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
|
1133 ;; Step once. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1134 (setq prev n |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1135 n (mod (+ n motion) len)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1136 ;; 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
|
1137 (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
|
1138 (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
|
1139 (setq n (mod (+ n motion) len) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1140 ;; 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
|
1141 tried-each-ring-item (= n prev))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1142 (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
|
1143 ;; 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
|
1144 (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
|
1145 n))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1146 |
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
|
1147 (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
|
1148 "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
|
1149 (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
|
1150 ;; 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
|
1151 (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
|
1152 (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
|
1153 (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
|
1154 |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1155 (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
|
1156 "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
|
1157 \(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
|
1158 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
|
1159 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
|
1160 (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
|
1161 (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
|
1162 (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
|
1163 ;; Has a match been found? |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1164 (if (null pos) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1165 (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
|
1166 ;; 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
|
1167 (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
|
1168 (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
|
1169 (funcall comint-get-old-input))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1170 (setq comint-input-ring-index pos) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1171 (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
|
1172 (comint-delete-input) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1173 (insert (ring-ref comint-input-ring pos))))) |
584 | 1174 |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1175 (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
|
1176 "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
|
1177 \(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
|
1178 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
|
1179 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
|
1180 (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
|
1181 (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
|
1182 |
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1183 (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
|
1184 "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
|
1185 \(Previous history elements are earlier commands.) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1186 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
|
1187 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
|
1188 (interactive "p") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1189 (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
|
1190 comint-next-matching-input-from-input))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1191 ;; Starting a new search |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1192 (setq comint-matching-input-from-input-string |
32326 | 1193 (buffer-substring |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
1194 (or (marker-position comint-accum-marker) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
1195 (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
|
1196 (point)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1197 comint-input-ring-index nil)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1198 (comint-previous-matching-input |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1199 (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
|
1200 n)) |
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1201 |
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1202 (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
|
1203 "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
|
1204 \(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
|
1205 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
|
1206 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
|
1207 (interactive "p") |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
1208 (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
|
1209 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1210 |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1211 (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
|
1212 "Expand input command history references before point. |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1213 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
|
1214 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1215 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
|
1216 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
|
1217 |
54879 | 1218 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
|
1219 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
|
1220 it cannot expand absolute input line number references. |
584 | 1221 |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1222 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
|
1223 even if history reference seems erroneous. |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1224 |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1225 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
|
1226 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
|
1227 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
|
1228 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1229 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
|
1230 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1231 Returns t if successful." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1232 (interactive) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1233 (if (and comint-input-autoexpand |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
1234 (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
|
1235 ;; Use comint-prompt-regexp |
33053
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1236 (save-excursion |
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1237 (beginning-of-line) |
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1238 (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
|
1239 ;; 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
|
1240 ;; 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
|
1241 (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
|
1242 (string-match "!\\|^\\^" (field-string))))) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1243 ;; 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
|
1244 (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
|
1245 (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
|
1246 (/= previous-modified-tick (buffer-modified-tick))))) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1247 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1248 |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1249 (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
|
1250 "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
|
1251 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
|
1252 |
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1253 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
|
1254 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
|
1255 than the logical beginning of line." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1256 (save-excursion |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1257 (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
|
1258 (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
|
1259 (goto-char start) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1260 (while (progn |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1261 (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
|
1262 (< (point) (- (line-end-position) toend))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1263 ;; 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
|
1264 ;; !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
|
1265 ;; 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
|
1266 ;; range specifiers. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1267 ;; 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
|
1268 ;; 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
|
1269 (setq comint-input-ring-index nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1270 (cond ((or (= (preceding-char) ?\\) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1271 (comint-within-quotes start (point))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1272 ;; 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
|
1273 (goto-char (1+ (point)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1274 ((looking-at "![0-9]+\\($\\|[^-]\\)") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1275 ;; 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
|
1276 (goto-char (match-end 0)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1277 (message "Absolute reference cannot be expanded")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1278 ((looking-at "!-\\([0-9]+\\)\\(:?[0-9^$*-]+\\)?") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1279 ;; 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
|
1280 (let ((number (1- (string-to-number |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1281 (buffer-substring (match-beginning 1) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1282 (match-end 1)))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1283 (if (<= number (ring-length comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1284 (progn |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1285 (replace-match |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1286 (comint-args (comint-previous-input-string number) |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1287 (match-beginning 2) (match-end 2)) |
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1288 t t) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1289 (setq comint-input-ring-index number) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1290 (message "History item: %d" (1+ number))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1291 (goto-char (match-end 0)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1292 (message "Relative reference exceeds input history size")))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1293 ((or (looking-at "!!?:?\\([0-9^$*-]+\\)") (looking-at "!!")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1294 ;; 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
|
1295 (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
|
1296 (message "History item: previous")) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1297 ((looking-at |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1298 "!\\??\\({\\(.+\\)}\\|\\(\\sw+\\)\\)\\(:?[0-9^$*-]+\\)?") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1299 ;; 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
|
1300 ;; 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
|
1301 (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
|
1302 (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
|
1303 (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
|
1304 (pref (if (save-match-data (looking-at "!\\?")) "" "^")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1305 (pos (save-match-data |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1306 (comint-previous-matching-input-string-position |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1307 (concat pref (regexp-quote exp)) 1)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1308 (if (null pos) |
6886
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1309 (progn |
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1310 (goto-char (match-end 0)) |
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1311 (or silent |
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1312 (progn (message "Not found") |
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1313 (ding)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1314 (setq comint-input-ring-index pos) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1315 (replace-match |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1316 (comint-args (ring-ref comint-input-ring pos) |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1317 (match-beginning 4) (match-end 4)) |
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1318 t t) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1319 (message "History item: %d" (1+ pos))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1320 ((looking-at "\\^\\([^^]+\\)\\^?\\([^^]*\\)\\^?") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1321 ;; Quick substitution on the previous input line. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1322 (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
|
1323 (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
|
1324 (pos nil)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1325 (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
|
1326 (setq pos (point)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1327 (goto-char (match-beginning 0)) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1328 (if (not (search-forward old pos t)) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1329 (or silent |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1330 (error "Not found")) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1331 (replace-match new t t) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1332 (message "History item: substituted")))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1333 (t |
21951
ab7fa71c0957
(comint-replace-by-expanded-history-before-point):
Richard M. Stallman <rms@gnu.org>
parents:
21714
diff
changeset
|
1334 (forward-char 1))))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1335 |
114 | 1336 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1337 (defun comint-magic-space (arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1338 "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
|
1339 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
|
1340 (interactive "p") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1341 (comint-replace-by-expanded-history) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1342 (self-insert-command arg)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1343 |
106206
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1344 ;; Isearch in comint input history |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1345 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1346 (defcustom comint-history-isearch nil |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1347 "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
|
1348 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
|
1349 in the input history. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1350 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
|
1351 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
|
1352 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
|
1353 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
|
1354 :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
|
1355 (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
|
1356 (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
|
1357 :group 'comint |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1358 :version "23.2") |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1359 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1360 (defun comint-history-isearch-backward () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1361 "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
|
1362 (interactive) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1363 (let ((comint-history-isearch t)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1364 (isearch-backward))) |
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-regexp () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1367 "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
|
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-regexp))) |
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 (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
|
1373 (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
|
1374 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1375 (defun comint-history-isearch-setup () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1376 "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
|
1377 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
|
1378 (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
|
1379 (and (eq comint-history-isearch 'dwim) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1380 ;; Point is at command line. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1381 (comint-after-pmark-p))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1382 (setq isearch-message-prefix-add "history ") |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1383 (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
|
1384 'comint-history-isearch-search) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1385 (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
|
1386 'comint-history-isearch-message) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1387 (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
|
1388 'comint-history-isearch-wrap) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1389 (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
|
1390 'comint-history-isearch-push-state) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1391 (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
|
1392 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1393 (defun comint-history-isearch-end () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1394 "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
|
1395 (if comint-history-isearch-message-overlay |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1396 (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
|
1397 (setq isearch-message-prefix-add nil) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1398 (setq isearch-search-fun-function nil) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1399 (setq isearch-message-function nil) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1400 (setq isearch-wrap-function nil) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1401 (setq isearch-push-state-function nil) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1402 (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
|
1403 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1404 (defun comint-goto-input (pos) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1405 "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
|
1406 ;; 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
|
1407 (if (null comint-input-ring-index) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1408 (setq comint-stored-incomplete-input |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1409 (funcall comint-get-old-input))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1410 (setq comint-input-ring-index pos) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1411 (comint-delete-input) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1412 (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
|
1413 (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
|
1414 ;; Restore partial unfinished input. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1415 (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
|
1416 (insert comint-stored-incomplete-input)))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1417 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1418 (defun comint-history-isearch-search () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1419 "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
|
1420 (cond |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1421 (isearch-word |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1422 (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
|
1423 (t |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1424 (lambda (string bound noerror) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1425 (let ((search-fun |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1426 ;; 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
|
1427 (cond |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1428 (isearch-regexp |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1429 (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
|
1430 (t |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1431 (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
|
1432 found) |
106485
85eebb6799d7
Don't lazy-highlight the comint output in history Isearch mode.
Juri Linkov <juri@jurta.org>
parents:
106362
diff
changeset
|
1433 ;; 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
|
1434 ;; 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
|
1435 ;; 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
|
1436 (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
|
1437 (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
|
1438 (or |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1439 ;; 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
|
1440 (funcall search-fun string |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1441 (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
|
1442 noerror) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1443 ;; 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
|
1444 ;; 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
|
1445 ;; 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
|
1446 ;; 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
|
1447 (unless bound |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1448 (condition-case nil |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1449 (progn |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1450 (while (not found) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1451 (cond (isearch-forward |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1452 ;; Signal an error here explicitly, because |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1453 ;; `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
|
1454 (when (null comint-input-ring-index) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1455 (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
|
1456 (comint-next-input 1) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1457 (goto-char (comint-line-beginning-position))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1458 (t |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1459 ;; Signal an error here explicitly, because |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1460 ;; `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
|
1461 (when (eq comint-input-ring-index |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1462 (1- (ring-length comint-input-ring))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1463 (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
|
1464 (comint-previous-input 1) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1465 (goto-char (point-max)))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1466 (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
|
1467 ;; 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
|
1468 ;; 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
|
1469 ;; 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
|
1470 ;; beginning/end of history. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1471 (setq found (funcall search-fun string |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1472 (unless isearch-forward |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1473 ;; For backward search, don't search |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1474 ;; in the comint prompt |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1475 (comint-line-beginning-position)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1476 noerror))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1477 ;; 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
|
1478 (point)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1479 ;; 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
|
1480 (error nil))))))))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1481 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1482 (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
|
1483 "Display the input history search prompt. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1484 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
|
1485 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
|
1486 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
|
1487 `isearch-message'." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1488 (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
|
1489 ;; 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
|
1490 ;; 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
|
1491 ;; 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
|
1492 ;; 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
|
1493 (isearch-message c-q-hack ellipsis) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1494 ;; 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
|
1495 ;; the initial comint prompt. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1496 (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
|
1497 (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
|
1498 (save-excursion (forward-line 0) (point)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1499 (comint-line-beginning-position)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1500 (setq comint-history-isearch-message-overlay |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1501 (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
|
1502 (comint-line-beginning-position))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1503 (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
|
1504 (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
|
1505 '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
|
1506 ;; And clear any previous isearch message. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1507 (message ""))) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1508 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1509 (defun comint-history-isearch-wrap () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1510 "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
|
1511 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
|
1512 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
|
1513 (unless isearch-word |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1514 ;; 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
|
1515 ;; 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
|
1516 ;; input history element. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1517 (if isearch-forward |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1518 (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
|
1519 (comint-goto-input nil)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1520 (setq isearch-success t)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1521 (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
|
1522 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1523 (defun comint-history-isearch-push-state () |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1524 "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
|
1525 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
|
1526 in the search status stack." |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1527 `(lambda (cmd) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1528 (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
|
1529 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1530 (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
|
1531 "Restore the input history search state. |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1532 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
|
1533 (comint-goto-input hist-pos)) |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1534 |
db4fe1337534
Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents:
105957
diff
changeset
|
1535 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1536 (defun comint-within-quotes (beg end) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1537 "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
|
1538 Quotes are single and double." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1539 (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
|
1540 (countdq (comint-how-many-region "\\(^\\|[^\\\\]\\)\"" beg end))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1541 (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
|
1542 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1543 (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
|
1544 "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
|
1545 (let ((count 0)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1546 (save-excursion |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1547 (save-match-data |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1548 (goto-char beg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1549 (while (re-search-forward regexp end t) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1550 (setq count (1+ count))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1551 count)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1552 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1553 (defun comint-args (string begin end) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1554 ;; 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
|
1555 ;; 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
|
1556 ;; 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
|
1557 (save-match-data |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1558 (if (null begin) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1559 (comint-arguments string 0 nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1560 (let* ((range (buffer-substring |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1561 (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
|
1562 (nth (cond ((string-match "^[*^]" range) 1) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1563 ((string-match "^-" range) 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1564 ((string-equal range "$") nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1565 (t (string-to-number range)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1566 (mth (cond ((string-match "[-*$]$" range) nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1567 ((string-match "-" range) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1568 (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
|
1569 (t nth)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1570 (comint-arguments string nth mth))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1571 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1572 (defun comint-delim-arg (arg) |
54879 | 1573 "Return a list of arguments from ARG. |
1574 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
|
1575 Returned list is backwards. |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1576 |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1577 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
|
1578 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
|
1579 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
|
1580 (if (null comint-delimiter-argument-list) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1581 (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
|
1582 (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
|
1583 (pos 0) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1584 (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
|
1585 (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
|
1586 (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
|
1587 (start pos)) |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1588 (if (and (memq char comint-delimiter-argument-list) |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1589 ;; Ignore backslash-escaped characters. |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1590 (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
|
1591 (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
|
1592 (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
|
1593 (while (and (< pos len) |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1594 (not (and (memq (aref arg pos) |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1595 comint-delimiter-argument-list) |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1596 (not (get-text-property |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1597 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
|
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 (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
|
1600 args))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1601 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1602 (defun comint-arguments (string nth mth) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1603 "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
|
1604 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
|
1605 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
|
1606 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
|
1607 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
|
1608 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
|
1609 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
|
1610 Argument 0 is the command name." |
23209
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1611 ;; 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
|
1612 ;; (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
|
1613 ;; 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
|
1614 ;; 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
|
1615 ;; 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
|
1616 ;; 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
|
1617 (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
|
1618 (w32-shell-dos-semantics)))) |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1619 (first (if backslash-escape |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1620 "[^ \n\t\"'`\\]\\|\\(\\\\.\\)\\|" |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1621 "[^ \n\t\"'`]+\\|")) |
23209
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1622 (argpart (concat first |
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1623 "\\(\"\\([^\"\\]\\|\\\\.\\)*\"\\|\ |
21018
edbd4156cf68
(comint-arguments): Treat \" and such as part of one arg.
Richard M. Stallman <rms@gnu.org>
parents:
20986
diff
changeset
|
1624 '[^']*'\\|\ |
23209
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1625 `[^`]*`\\)")) |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1626 (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
|
1627 (args ()) (pos 0) |
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1628 (count 0) |
54879 | 1629 beg str quotes) |
8616
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1630 ;; 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
|
1631 (while (and (or (null mth) (<= count mth)) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1632 (string-match argpart string pos)) |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1633 ;; Apply the `literal' text property to backslash-escaped |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1634 ;; 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
|
1635 (and backslash-escape |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1636 (match-beginning 1) |
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1637 (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
|
1638 'literal t string)) |
8616
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1639 (if (and beg (= pos (match-beginning 0))) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1640 ;; It's contiguous, part of the same arg. |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1641 (setq pos (match-end 0) |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1642 quotes (or quotes (match-beginning quote-subexpr))) |
8616
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1643 ;; It's a new separate arg. |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1644 (if beg |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1645 ;; 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
|
1646 (setq str (substring string beg pos) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1647 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
|
1648 (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
|
1649 (setq count (length args)) |
76491
2c6f34a88eaf
(comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents:
76102
diff
changeset
|
1650 (setq quotes (match-beginning quote-subexpr)) |
8616
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1651 (setq beg (match-beginning 0)) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1652 (setq pos (match-end 0)))) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1653 (if beg |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1654 (setq str (substring string beg pos) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1655 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
|
1656 (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
|
1657 (setq count (length args)) |
8616
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1658 (let ((n (or nth (1- count))) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1659 (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
|
1660 (mapconcat |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1661 (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
|
1662 |
14169 | 1663 ;; |
1664 ;; Input processing stuff | |
1665 ;; | |
33138
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1666 (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
|
1667 "Add CMD to the input history. |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1668 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
|
1669 (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
|
1670 (or (null comint-input-ignoredups) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1671 (not (ring-p comint-input-ring)) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1672 (ring-empty-p comint-input-ring) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1673 (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
|
1674 cmd)))) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1675 (ring-insert comint-input-ring cmd))) |
584 | 1676 |
61449
a8e7bc540c1c
(comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents:
61404
diff
changeset
|
1677 (defun comint-send-input (&optional no-newline artificial) |
1356 | 1678 "Send input to process. |
1679 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
|
1680 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
|
1681 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
|
1682 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
|
1683 |
a8e7bc540c1c
(comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents:
61404
diff
changeset
|
1684 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
|
1685 NO-NEWLINE is non-nil. |
114 | 1686 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1687 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
|
1688 `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
|
1689 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
|
1690 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
|
1691 `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
|
1692 |
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
1693 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
|
1694 end of line before sending the input. |
114 | 1695 |
40828
966dca4af18e
(comint-send-input): Fix description of `comint-process-echoes' in the
Miles Bader <miles@gnu.org>
parents:
40003
diff
changeset
|
1696 After the input has been sent, if `comint-process-echoes' is non-nil, |
54879 | 1697 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
|
1698 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
|
1699 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
|
1700 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
|
1701 |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1702 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
|
1703 `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
|
1704 in the buffer. E.g., |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1705 |
114 | 1706 If the interpreter is the csh, |
54879 | 1707 `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
|
1708 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
|
1709 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
|
1710 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
|
1711 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
|
1712 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
|
1713 regexp `comint-prompt-regexp' removed. |
54879 | 1714 `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
|
1715 \"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
|
1716 `comint-input-filter' is the default: returns t if the input isn't all white |
584 | 1717 space. |
114 | 1718 |
54879 | 1719 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
|
1720 `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
|
1721 `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
|
1722 `comint-input-filter' returns nil if the input matches input-filter-regexp, |
32326 | 1723 which matches (1) all whitespace (2) :a, :c, etc. |
114 | 1724 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1725 Similarly for Soar, Scheme, etc." |
114 | 1726 (interactive) |
1727 ;; Note that the input string does not include its terminal newline. | |
584 | 1728 (let ((proc (get-buffer-process (current-buffer)))) |
1729 (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
|
1730 (widen) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1731 (let* ((pmark (process-mark proc)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1732 (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
|
1733 (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
|
1734 (buffer-substring pmark (point))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1735 (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
|
1736 (goto-char pmark) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1737 (insert copy) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1738 copy))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1739 (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
|
1740 ;; Just whatever's already there |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1741 intxt |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1742 ;; 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
|
1743 (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
|
1744 (buffer-substring pmark (point)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1745 (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
|
1746 input |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1747 ;; 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
|
1748 ;; 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
|
1749 ;; 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
|
1750 (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
|
1751 (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
|
1752 (start (point))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1753 (insert input) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1754 (delete-region pmark start) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1755 copy)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1756 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1757 (unless no-newline |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1758 (insert ?\n)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1759 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1760 (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
|
1761 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1762 (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
|
1763 (if no-newline input |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1764 (concat input "\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 (let ((beg (marker-position pmark)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1767 (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
|
1768 (inhibit-modification-hooks t)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1769 (when (> end beg) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1770 (add-text-properties beg end |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1771 '(front-sticky t |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1772 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
|
1773 (unless comint-use-prompt-regexp |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1774 ;; 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
|
1775 ;; 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
|
1776 ;; 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
|
1777 ;; `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
|
1778 ;; and output fields smoother. |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1779 (add-text-properties |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1780 beg end |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1781 '(mouse-face highlight |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1782 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
|
1783 field input)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1784 (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
|
1785 ;; Cover the terminating newline |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1786 (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
|
1787 '(rear-nonsticky t |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1788 field boundary |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1789 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
|
1790 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1791 (comint-snapshot-last-prompt) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1792 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1793 (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
|
1794 (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
|
1795 ;; 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
|
1796 ;; 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
|
1797 (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
|
1798 (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
|
1799 (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
|
1800 ;; clear the "accumulation" marker |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1801 (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
|
1802 (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
|
1803 (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
|
1804 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1805 ;; 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
|
1806 (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
|
1807 (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
|
1808 comint-last-input-start))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1809 ;; 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
|
1810 (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
|
1811 (> (+ 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
|
1812 (point-max)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1813 (zerop |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1814 (compare-buffer-substrings |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1815 nil comint-last-input-start |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1816 (- (point-max) echo-len) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1817 ;; Above difference is equivalent to |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1818 ;; (+ comint-last-input-start |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1819 ;; (- (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
|
1820 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
|
1821 (if (and |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1822 (<= (+ 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
|
1823 (point-max)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1824 (zerop |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1825 (compare-buffer-substrings |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1826 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
|
1827 nil comint-last-input-end |
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 ;; 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
|
1830 ;; 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
|
1831 ;; 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
|
1832 (let ((inhibit-read-only t)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1833 (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
|
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 (when comint-prompt-read-only |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1836 (save-excursion |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1837 (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
|
1838 (comint-update-fence))))))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1839 |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
1840 ;; 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
|
1841 ;; 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
|
1842 (run-hook-with-args 'comint-output-filter-functions ""))))) |
114 | 1843 |
32326 | 1844 (defvar comint-preoutput-filter-functions nil |
26616
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1845 "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
|
1846 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
|
1847 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
|
1848 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
|
1849 string. |
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1850 |
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1851 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
|
1852 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
|
1853 the last function is the text that is actually inserted in the |
26627 | 1854 redirection buffer. |
26616
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1855 |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1856 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
|
1857 either globally or locally.") |
19515
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
1858 |
46941
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1859 (defvar comint-inhibit-carriage-motion nil |
54879 | 1860 "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
|
1861 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
|
1862 |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1863 ;; 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
|
1864 ;; 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
|
1865 (defvar comint-last-prompt-overlay nil) |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1866 |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1867 (defun comint-snapshot-last-prompt () |
54879 | 1868 "`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
|
1869 Freeze its attributes in place, even when more input comes along |
54879 | 1870 and moves the prompt overlay." |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1871 (when comint-last-prompt-overlay |
55881
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
1872 (let ((inhibit-read-only t) |
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
1873 (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
|
1874 (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
|
1875 (overlay-end comint-last-prompt-overlay) |
56f63de10254
(comint-send-input): Widen the buffer first.
Chong Yidong <cyd@stupidchicken.com>
parents:
76767
diff
changeset
|
1876 (overlay-properties comint-last-prompt-overlay))))) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1877 |
46941
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1878 (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
|
1879 "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
|
1880 Translate carriage return/linefeed sequences to linefeeds. |
689e6d3dbdc2
(comint-carriage-motion): Doc-string tweaks.
Miles Bader <miles@gnu.org>
parents:
37921
diff
changeset
|
1881 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
|
1882 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
|
1883 (save-excursion |
92482
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1884 ;; 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
|
1885 ;; 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
|
1886 ;; 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
|
1887 ;; 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
|
1888 ;; 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
|
1889 (goto-char start) |
92482
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1890 (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
|
1891 (inhibit-read-only t) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1892 (lbeg (line-beginning-position)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1893 delete-end ch) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1894 ;; 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
|
1895 ;; it in delete-end. |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1896 (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
|
1897 (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
|
1898 (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
|
1899 (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
|
1900 (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
|
1901 ;; 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
|
1902 (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
|
1903 (setq ch (following-char)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1904 (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
|
1905 (delete-char 1) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1906 (if (> (point) lbeg) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1907 (delete-char -1))) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1908 ((= ch ?\n) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1909 (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
|
1910 (if (< delete-end (point)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1911 (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
|
1912 (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
|
1913 (setq delete-end nil)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1914 (forward-char 1) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1915 (setq lbeg (point))) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1916 (t ; CH = CR |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1917 (delete-char 1) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1918 (if delete-end |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1919 (when (< delete-end (point)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1920 (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
|
1921 (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
|
1922 (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
|
1923 (when delete-end |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1924 (if (< delete-end (point)) |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1925 ;; 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
|
1926 ;; 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
|
1927 (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
|
1928 ;; 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
|
1929 ;; 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
|
1930 ;; time. |
83962f810455
(comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents:
87903
diff
changeset
|
1931 (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
|
1932 (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
|
1933 (widen)))) |
39182
ed28d0187d3c
(comint-send-input): Handle comint-process-echoes
Gerd Moellmann <gerd@gnu.org>
parents:
39124
diff
changeset
|
1934 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1935 ;; 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
|
1936 ;; 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
|
1937 ;; when output is inserted. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1938 (defun comint-output-filter (process string) |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
1939 (let ((oprocbuf (process-buffer process))) |
26174
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1940 ;; 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
|
1941 (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
|
1942 (with-current-buffer oprocbuf |
30740
46364997df9c
(comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents:
30735
diff
changeset
|
1943 ;; Run preoutput filters |
26174
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1944 (let ((functions comint-preoutput-filter-functions)) |
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1945 (while (and functions string) |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1946 (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
|
1947 (let ((functions |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
1948 (default-value 'comint-preoutput-filter-functions))) |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1949 (while (and functions string) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1950 (setq string (funcall (car functions) string)) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1951 (setq functions (cdr functions)))) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
1952 (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
|
1953 (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
|
1954 |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1955 ;; Insert STRING |
50966
379cf00d7016
(comint-carriage-motion, comint-output-filter):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49549
diff
changeset
|
1956 (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
|
1957 ;; 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
|
1958 (saved-point (copy-marker (point) t))) |
31038 | 1959 |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1960 ;; 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
|
1961 ;; 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
|
1962 (save-restriction |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1963 (widen) |
30740
46364997df9c
(comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents:
30735
diff
changeset
|
1964 |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1965 (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
|
1966 (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
|
1967 |
31581 | 1968 ;; 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
|
1969 ;; 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
|
1970 ;; window-point-insertion-type instead. |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
1971 (insert string) |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1972 |
31581 | 1973 ;; 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
|
1974 (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
|
1975 |
46941
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1976 (unless comint-inhibit-carriage-motion |
1241ed1e9eee
[original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents:
46250
diff
changeset
|
1977 ;; 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
|
1978 (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
|
1979 |
61592
7c224837fcfe
(comint-output-filter): Run comint-output-filter-functions
Richard M. Stallman <rms@gnu.org>
parents:
61449
diff
changeset
|
1980 ;; 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
|
1981 (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
|
1982 (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
|
1983 (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
|
1984 |
45916
e8271a03c1eb
(comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents:
45898
diff
changeset
|
1985 (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
|
1986 |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
1987 (unless comint-use-prompt-regexp |
55881
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
1988 (let ((inhibit-read-only t) |
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
1989 (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
|
1990 (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
|
1991 '(front-sticky |
e3190eb9e11b
(comint-output-filter): Make output field properties front-sticky
Miles Bader <miles@gnu.org>
parents:
97764
diff
changeset
|
1992 (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
|
1993 rear-nonsticky t |
55223
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
1994 field output |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
1995 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
|
1996 |
45727
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
1997 ;; 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
|
1998 ;; 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
|
1999 (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
|
2000 (inhibit-read-only t) |
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
2001 (inhibit-modification-hooks t)) |
55223
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2002 (when comint-prompt-read-only |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2003 (or (= (point-min) prompt-start) |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2004 (get-text-property (1- prompt-start) 'read-only) |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2005 (put-text-property |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2006 (1- prompt-start) prompt-start 'read-only 'fence)) |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2007 (add-text-properties |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2008 prompt-start (point) |
57420
bcfb3a26a3bd
(comint-output-filter): Typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57419
diff
changeset
|
2009 '(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
|
2010 (unless (and (bolp) (null comint-last-prompt-overlay)) |
14d50685dce0
(comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55123
diff
changeset
|
2011 ;; 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
|
2012 ;; 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
|
2013 ;; 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
|
2014 (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
|
2015 ;; 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
|
2016 (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
|
2017 prompt-start (point)) |
a899b2c6ce9b
(comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents:
44663
diff
changeset
|
2018 ;; 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
|
2019 (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
|
2020 (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
|
2021 (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
|
2022 'font-lock-face 'comint-highlight-prompt)))) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
2023 |
45916
e8271a03c1eb
(comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents:
45898
diff
changeset
|
2024 (goto-char saved-point))))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2025 |
4890
dab300dfe449
(comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
4880
diff
changeset
|
2026 (defun comint-preinput-scroll-to-bottom () |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2027 "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
|
2028 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
|
2029 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
|
2030 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
|
2031 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
|
2032 |
4890
dab300dfe449
(comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
4880
diff
changeset
|
2033 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
|
2034 (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
|
2035 (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
|
2036 hilit-yank))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2037 (let* ((selected (selected-window)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2038 (current (current-buffer)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2039 (process (get-buffer-process current)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2040 (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
|
2041 (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
|
2042 (if (eq scroll 'this) |
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
2043 (goto-char (point-max)) |
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
2044 (walk-windows |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2045 (lambda (window) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2046 (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
|
2047 (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
|
2048 (progn |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2049 (select-window window) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2050 (goto-char (point-max)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2051 (select-window selected)))) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2052 nil t)))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2053 |
4890
dab300dfe449
(comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
4880
diff
changeset
|
2054 (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
|
2055 "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
|
2056 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
|
2057 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
|
2058 `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
|
2059 |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
2060 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
|
2061 (let* ((selected (selected-window)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2062 (current (current-buffer)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2063 (process (get-buffer-process current)) |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
2064 (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
|
2065 (unwind-protect |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2066 (if process |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2067 (walk-windows |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2068 (lambda (window) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2069 (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
|
2070 (select-window window) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2071 (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
|
2072 (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
|
2073 ;; 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
|
2074 (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
|
2075 (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
|
2076 ;; 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
|
2077 (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
|
2078 (>= (point) comint-last-output-start)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2079 (goto-char (process-mark process))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2080 ;; 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
|
2081 ;; 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
|
2082 (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
|
2083 (= (point) (point-max))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2084 (save-excursion |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2085 (goto-char (point-max)) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2086 (recenter (- -1 scroll-margin)))) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2087 (select-window selected))) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2088 nil t)) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
2089 (set-buffer current)))) |
2683
21ab70613c42
(comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2680
diff
changeset
|
2090 |
10833
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
2091 (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
|
2092 "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
|
2093 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
|
2094 (interactive) |
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
2095 (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
|
2096 (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
|
2097 (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
|
2098 (beginning-of-line) |
50966
379cf00d7016
(comint-carriage-motion, comint-output-filter):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49549
diff
changeset
|
2099 (let ((inhibit-read-only t)) |
379cf00d7016
(comint-carriage-motion, comint-output-filter):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49549
diff
changeset
|
2100 (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
|
2101 |
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
|
2102 (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
|
2103 "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
|
2104 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
|
2105 (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
|
2106 (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
|
2107 (save-excursion |
20458
ad0d2c5040a0
(comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents:
20020
diff
changeset
|
2108 (condition-case nil |
ad0d2c5040a0
(comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents:
20020
diff
changeset
|
2109 (goto-char |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
105195
diff
changeset
|
2110 (if (called-interactively-p 'interactive) |
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
105195
diff
changeset
|
2111 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
|
2112 (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
|
2113 (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
|
2114 (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
|
2115 (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
|
2116 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2117 (defun comint-show-maximum-output () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2118 "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
|
2119 (interactive) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2120 (goto-char (point-max)) |
64169
20da0da3a956
(comint-postoutput-scroll-to-bottom)
Eli Zaretskii <eliz@gnu.org>
parents:
64091
diff
changeset
|
2121 (recenter (- -1 scroll-margin))) |
2683
21ab70613c42
(comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2680
diff
changeset
|
2122 |
114 | 2123 (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
|
2124 "Default for `comint-get-old-input'. |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2125 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
|
2126 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
|
2127 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
|
2128 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
|
2129 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
|
2130 `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
|
2131 (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
|
2132 (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
|
2133 (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
|
2134 (comint-bol) |
45732
5555fce97d97
Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents:
45727
diff
changeset
|
2135 (buffer-substring-no-properties (point) (line-end-position))))) |
584 | 2136 |
70575
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2137 (defun comint-copy-old-input () |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2138 "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
|
2139 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
|
2140 (interactive) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2141 (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
|
2142 (process (get-buffer-process (current-buffer)))) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2143 (if (not process) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2144 (error "Current buffer has no process") |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2145 (goto-char (process-mark process)) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2146 (insert input)))) |
aaf48e9df47b
(comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents:
70553
diff
changeset
|
2147 |
584 | 2148 (defun comint-skip-prompt () |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
2149 "Skip past the text matching regexp `comint-prompt-regexp'. |
584 | 2150 If this takes us past the end of the current line, don't skip at all." |
54879 | 2151 (if (and (looking-at comint-prompt-regexp) |
2152 (<= (match-end 0) (line-end-position))) | |
2153 (goto-char (match-end 0)))) | |
584 | 2154 |
2155 (defun comint-after-pmark-p () | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2156 "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
|
2157 (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
|
2158 (<= (marker-position pmark) (point)))) |
584 | 2159 |
2160 (defun comint-simple-send (proc string) | |
2161 "Default function for sending to PROC input STRING. | |
54879 | 2162 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
|
2163 set the hook `comint-input-sender'." |
78193
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2164 (let ((send-string |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2165 (if comint-input-sender-no-newline |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2166 string |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2167 ;; 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
|
2168 ;; 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
|
2169 (concat string "\n")))) |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2170 (comint-send-string proc send-string)) |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2171 (if (and comint-input-sender-no-newline |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2172 (not (string-equal string ""))) |
b088dcbbe69a
(comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents:
76897
diff
changeset
|
2173 (process-send-eof))) |
114 | 2174 |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2175 (defun comint-line-beginning-position () |
54879 | 2176 "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
|
2177 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
|
2178 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
|
2179 a buffer local variable." |
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2180 (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
|
2181 ;; Use comint-prompt-regexp |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2182 (save-excursion |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2183 (beginning-of-line) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2184 (comint-skip-prompt) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2185 (point)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2186 ;; 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
|
2187 ;; `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
|
2188 ;; 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
|
2189 ;; 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
|
2190 ;; 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
|
2191 ;; 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
|
2192 ;; (as input fields should be). |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2193 (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
|
2194 |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2195 (defun comint-bol (&optional arg) |
54879 | 2196 "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
|
2197 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
|
2198 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
|
2199 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
|
2200 a buffer local variable." |
114 | 2201 (interactive "P") |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2202 (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
|
2203 ;; 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
|
2204 (forward-line 0) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2205 (goto-char (comint-line-beginning-position)))) |
114 | 2206 |
58588
a44a4cdb021d
(comint-read-noecho): Add trivial compatibility definition.
Richard M. Stallman <rms@gnu.org>
parents:
58375
diff
changeset
|
2207 ;; For compatibility. |
a44a4cdb021d
(comint-read-noecho): Add trivial compatibility definition.
Richard M. Stallman <rms@gnu.org>
parents:
58375
diff
changeset
|
2208 (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
|
2209 (read-passwd prompt)) |
a44a4cdb021d
(comint-read-noecho): Add trivial compatibility definition.
Richard M. Stallman <rms@gnu.org>
parents:
58375
diff
changeset
|
2210 |
14169 | 2211 ;; These three functions are for entering text you don't want echoed or |
2212 ;; 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
|
2213 ;; Just enter m-x send-invisible and type in your line. |
705 | 2214 |
53391
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2215 (defun send-invisible (&optional prompt) |
1356 | 2216 "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
|
2217 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
|
2218 The string is sent using `comint-input-sender'. |
584 | 2219 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
|
2220 \\[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
|
2221 (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
|
2222 (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
|
2223 (prefix |
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2224 (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
|
2225 "" |
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2226 (format "(In buffer %s) " |
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2227 (current-buffer))))) |
53391
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2228 (if proc |
64819
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2229 (let ((str (read-passwd (concat prefix |
fe9134f14297
(send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2230 (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
|
2231 (if (stringp str) |
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2232 (progn |
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2233 (comint-snapshot-last-prompt) |
ab9195f48a6f
(comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53272
diff
changeset
|
2234 (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
|
2235 (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
|
2236 (error "Buffer %s has no process" (current-buffer))))) |
114 | 2237 |
32326 | 2238 (defun comint-watch-for-password-prompt (string) |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
2239 "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
|
2240 This function uses `send-invisible' to read and send a password to the buffer's |
32326 | 2241 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
|
2242 `comint-password-prompt-regexp'. |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
2243 |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
2244 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
|
2245 (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
|
2246 (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
|
2247 (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
|
2248 (send-invisible string))) |
114 | 2249 |
14169 | 2250 ;; Low-level process communication |
114 | 2251 |
30766
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
2252 (defun comint-send-string (process string) |
54879 | 2253 "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
|
2254 (if process |
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
2255 (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
|
2256 (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
|
2257 (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
|
2258 (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
|
2259 (comint-snapshot-last-prompt)) |
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
2260 (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
|
2261 |
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
2262 (defun comint-send-region (process start end) |
54879 | 2263 "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
|
2264 (if process |
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
2265 (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
|
2266 (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
|
2267 (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
|
2268 (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
|
2269 (comint-snapshot-last-prompt)) |
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
2270 (process-send-region process start end)) |
39713
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2271 |
114 | 2272 |
14169 | 2273 ;; Random input hackage |
114 | 2274 |
32613
6aece997f0f9
(comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents:
32598
diff
changeset
|
2275 (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
|
2276 "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
|
2277 Does not delete the prompt." |
114 | 2278 (interactive) |
6998
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2279 (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
|
2280 (replacement nil) |
a27729919ff1
(comint-delete-output): Bind inhibit-read-only to t.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54879
diff
changeset
|
2281 (inhibit-read-only t)) |
6998
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2282 (save-excursion |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2283 (let ((pmark (progn (goto-char (process-mark proc)) |
32598 | 2284 (forward-line 0) |
6998
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2285 (point-marker)))) |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2286 (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
|
2287 (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
|
2288 (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
|
2289 (buffer-substring pmark (point)))) |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2290 (delete-region pmark (point)))) |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
2291 ;; 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
|
2292 (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
|
2293 (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
|
2294 'comint-delete-output "21.1") |
114 | 2295 |
32635
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2296 (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
|
2297 "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
|
2298 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
|
2299 |
32635
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2300 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
|
2301 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
|
2302 |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2303 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
|
2304 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
|
2305 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
|
2306 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
|
2307 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
|
2308 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
|
2309 otherwise." |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2310 (interactive |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2311 (list (read-file-name |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2312 (if current-prefix-arg |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2313 "Append output to file: " |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2314 "Write output to file: ")) |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2315 current-prefix-arg |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2316 (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
|
2317 (save-excursion |
ba88cc6434f3
(comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents:
32623
diff
changeset
|
2318 (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
|
2319 (forward-line 0) |
32635
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
2320 (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
|
2321 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
|
2322 |
32892
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
2323 ;; 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
|
2324 ;; 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
|
2325 (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
|
2326 "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
|
2327 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
|
2328 (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
|
2329 (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
|
2330 |
114 | 2331 (defun comint-show-output () |
584 | 2332 "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
|
2333 Sets mark to the value of point when this command is run." |
114 | 2334 (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
|
2335 (push-mark) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2336 (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
|
2337 (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
|
2338 (goto-char pos) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2339 (beginning-of-line 0) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2340 (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
|
2341 (comint-skip-prompt)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2342 (t |
98385
8f747339c80c
(comint-show-output): Adjust to stickiness changes of the output field.
Romain Francoise <romain@orebokech.com>
parents:
98356
diff
changeset
|
2343 (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
|
2344 (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
|
2345 |
114 | 2346 |
2347 (defun comint-interrupt-subjob () | |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2348 "Interrupt the current subjob. |
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2349 This command also kills the pending input |
54879 | 2350 between the process mark and point." |
114 | 2351 (interactive) |
45836
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2352 (comint-skip-input) |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
2353 (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
|
2354 ;; (process-send-string nil "\n") |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2355 ) |
114 | 2356 |
2357 (defun comint-kill-subjob () | |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2358 "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
|
2359 This command also kills the pending input |
54879 | 2360 between the process mark and point." |
114 | 2361 (interactive) |
45836
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2362 (comint-skip-input) |
584 | 2363 (kill-process nil comint-ptyp)) |
114 | 2364 |
2365 (defun comint-quit-subjob () | |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2366 "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
|
2367 This command also kills the pending input |
54879 | 2368 between the process mark and point." |
114 | 2369 (interactive) |
45836
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2370 (comint-skip-input) |
584 | 2371 (quit-process nil comint-ptyp)) |
114 | 2372 |
2373 (defun comint-stop-subjob () | |
584 | 2374 "Stop the current subjob. |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2375 This command also kills the pending input |
54879 | 2376 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
|
2377 |
114 | 2378 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
|
2379 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
|
2380 this, use \\[comint-continue-subjob] to resume the process. (This |
584 | 2381 is not a problem with most shells, since they ignore this signal.)" |
114 | 2382 (interactive) |
45836
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2383 (comint-skip-input) |
584 | 2384 (stop-process nil comint-ptyp)) |
114 | 2385 |
2386 (defun comint-continue-subjob () | |
584 | 2387 "Send CONT signal to process buffer's process group. |
114 | 2388 Useful if you accidentally suspend the top-level process." |
2389 (interactive) | |
584 | 2390 (continue-process nil comint-ptyp)) |
114 | 2391 |
45836
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2392 (defun comint-skip-input () |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2393 "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
|
2394 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
|
2395 (let ((comint-input-sender 'ignore) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2396 (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
|
2397 (comint-send-input t t)) |
45836
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2398 (end-of-line) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2399 (let ((pos (point)) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2400 (marker (process-mark (get-buffer-process (current-buffer))))) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2401 (insert " " (key-description (this-command-keys))) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2402 (if (= marker pos) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2403 (set-marker marker (point))))) |
e4a48b5ab2fb
(comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents:
45826
diff
changeset
|
2404 |
114 | 2405 (defun comint-kill-input () |
584 | 2406 "Kill all text from last stuff output by interpreter to point." |
114 | 2407 (interactive) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2408 (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
|
2409 (if (> (point) (marker-position pmark)) |
584 | 2410 (kill-region pmark (point))))) |
114 | 2411 |
2412 (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
|
2413 "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
|
2414 Sends an EOF only if point is at the end of the buffer and there is no input." |
114 | 2415 (interactive "p") |
17269
b177ee3c4f0e
(comint-delchar-or-maybe-eof): Check for null proc.
Karl Heuer <kwzh@gnu.org>
parents:
17159
diff
changeset
|
2416 (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
|
2417 (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
|
2418 (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
|
2419 (delete-char arg)))) |
584 | 2420 |
4112
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2421 (defun comint-send-eof () |
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2422 "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
|
2423 (interactive) |
61449
a8e7bc540c1c
(comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents:
61404
diff
changeset
|
2424 (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
|
2425 (process-send-eof)) |
584 | 2426 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2427 |
54879 | 2428 (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
|
2429 "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
|
2430 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
|
2431 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
|
2432 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2433 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
|
2434 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
|
2435 (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
|
2436 (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
|
2437 ;; Use comint-prompt-regexp |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2438 (let* ((re (concat comint-prompt-regexp ".*" regexp)) |
54879 | 2439 (pos (save-excursion (end-of-line (if (> n 0) 0 1)) |
2440 (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
|
2441 (point))))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2442 (if (null pos) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2443 (progn (message "Not found") |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2444 (ding)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2445 (goto-char pos) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2446 (comint-bol nil))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2447 ;; Use input fields |
54879 | 2448 (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
|
2449 (pos |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2450 (save-excursion |
54879 | 2451 (while (/= n 0) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2452 (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
|
2453 (error "Not found")) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2454 (when (eq (get-char-property (point) 'field) 'input) |
54879 | 2455 (setq n (- n dir)))) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2456 (field-beginning)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2457 (goto-char pos)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2458 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2459 |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
2460 (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
|
2461 "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
|
2462 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
|
2463 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
|
2464 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2465 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
|
2466 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
|
2467 (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
|
2468 (comint-backward-matching-input regexp (- n))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2469 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2470 |
4112
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2471 (defun comint-next-prompt (n) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2472 "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
|
2473 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
|
2474 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
|
2475 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
|
2476 (interactive "p") |
61873
1cd2d4d601fa
(comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents:
61592
diff
changeset
|
2477 (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
|
2478 ;; Use comint-prompt-regexp |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2479 (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
|
2480 (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
|
2481 (forward-paragraph n) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2482 (comint-skip-prompt)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2483 ;; Use input fields |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2484 (let ((pos (point)) |
38977
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2485 (input-pos nil) |
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2486 prev-pos) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2487 (while (/= n 0) |
38977
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2488 (setq prev-pos pos) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2489 (setq pos |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2490 (if (> n 0) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2491 (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
|
2492 (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
|
2493 (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
|
2494 ;; 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
|
2495 (when (> n 0) |
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2496 ;; 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
|
2497 ;; 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
|
2498 (setq input-pos (point-max))) |
3037adea8353
(comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents:
38971
diff
changeset
|
2499 ;; stop iterating |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2500 (setq n 0)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2501 ((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
|
2502 (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
|
2503 (setq input-pos pos)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2504 (when input-pos |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2505 (goto-char input-pos))))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2506 |
584 | 2507 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2508 (defun comint-previous-prompt (n) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2509 "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
|
2510 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
|
2511 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
|
2512 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
|
2513 (interactive "p") |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2514 (comint-next-prompt (- n))) |
39713
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2515 |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2516 ;; 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
|
2517 (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
|
2518 (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
|
2519 (defvar comint-insert-previous-argument-last-index nil) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2520 (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
|
2521 |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2522 ;; Needs fixing: |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2523 ;; 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
|
2524 (defun comint-insert-previous-argument (index) |
54879 | 2525 "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
|
2526 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
|
2527 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
|
2528 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
|
2529 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
|
2530 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
|
2531 with the first command). |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2532 This command is like `M-.' in bash." |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2533 (interactive "P") |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2534 (unless (null index) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2535 (setq index (prefix-numeric-value index))) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2536 (cond ((eq last-command this-command) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2537 ;; Delete last input inserted by this command. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2538 (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
|
2539 (setq index comint-insert-previous-argument-last-index)) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2540 (t |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2541 ;; 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
|
2542 (setq comint-input-ring-index nil) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2543 (setq comint-insert-previous-argument-last-index index) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2544 (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
|
2545 ;; First usage; initialize to a marker |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2546 (setq comint-insert-previous-argument-last-start-pos |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2547 (make-marker))))) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2548 ;; 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
|
2549 (if (<= (point) (comint-line-beginning-position)) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2550 (comint-bol) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2551 (just-one-space)) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2552 ;; 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
|
2553 ;; the command is repeated. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2554 (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
|
2555 ;; Insert the argument. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2556 (let ((input-string (comint-previous-input-string 0))) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2557 (when (string-match "[ \t\n]*&" input-string) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2558 ;; strip terminating '&' |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2559 (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
|
2560 (insert (comint-arguments input-string index index))) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2561 ;; Make next invocation return arg from previous input |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2562 (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
|
2563 ;; Add a terminating space if necessary. |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2564 (unless (eolp) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2565 (just-one-space))) |
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
2566 |
114 | 2567 |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2568 ;; 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
|
2569 |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2570 (defun comint-update-fence () |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2571 "Update read-only status of newline before point. |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2572 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
|
2573 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
|
2574 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
|
2575 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
|
2576 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
|
2577 That is what this function does. |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2578 |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2579 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
|
2580 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
|
2581 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
|
2582 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
|
2583 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
|
2584 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
|
2585 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
|
2586 preceding newline is removed." |
55881
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
2587 (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
|
2588 (inhibit-modification-hooks t)) |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2589 (and (bolp) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2590 (not (bobp)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2591 (if (and (get-text-property pt 'read-only) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2592 (if (listp lst) (memq 'read-only lst) t)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2593 (unless (get-text-property (1- pt) 'read-only) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2594 (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
|
2595 (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
|
2596 (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
|
2597 |
70963
098d9b195f6e
(comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70575
diff
changeset
|
2598 (defun comint-kill-whole-line (&optional count) |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2599 "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
|
2600 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
|
2601 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
|
2602 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
|
2603 with negative arguments.) |
70963
098d9b195f6e
(comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70575
diff
changeset
|
2604 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
|
2605 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
|
2606 if necessary." |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2607 (interactive "p") |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2608 (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
|
2609 (kill-whole-line count) |
098d9b195f6e
(comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70575
diff
changeset
|
2610 (when (>= count 0) (comint-update-fence)))) |
55295
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2611 |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2612 (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
|
2613 "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
|
2614 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
|
2615 \"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
|
2616 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
|
2617 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
|
2618 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
|
2619 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
|
2620 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
|
2621 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
|
2622 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
|
2623 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
|
2624 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
|
2625 updated using `comint-update-fence', if necessary." |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2626 (interactive "r") |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2627 (save-excursion |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2628 (let* ((true-beg (min beg end)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2629 (true-end (max beg end)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2630 (beg-bolp (progn (goto-char true-beg) (bolp))) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2631 (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
|
2632 (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
|
2633 (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
|
2634 (end-bolp (progn (goto-char true-end) (bolp))) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2635 (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
|
2636 (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
|
2637 (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
|
2638 (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
|
2639 (and (not end-bolp) end-bad)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2640 (kill-region beg end yank-handler) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2641 (let ((inhibit-read-only t)) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2642 (kill-region beg end yank-handler) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2643 (comint-update-fence)))))) |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2644 |
16abc166af9d
(comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55223
diff
changeset
|
2645 |
14169 | 2646 ;; Support for source-file processing commands. |
2647 ;;============================================================================ | |
2648 ;; Many command-interpreters (e.g., Lisp, Scheme, Soar) have | |
2649 ;; commands that process files of source text (e.g. loading or compiling | |
42205 | 2650 ;; files). So the corresponding process-in-a-buffer modes have commands |
2651 ;; for doing this (e.g., lisp-load-file). The functions below are useful | |
14169 | 2652 ;; for defining these commands. |
2653 ;; | |
2654 ;; Alas, these guys don't do exactly the right thing for Lisp, Scheme | |
2655 ;; and Soar, in that they don't know anything about file extensions. | |
2656 ;; So the compile/load interface gets the wrong default occasionally. | |
2657 ;; The load-file/compile-file default mechanism could be smarter -- it | |
2658 ;; doesn't know about the relationship between filename extensions and | |
42205 | 2659 ;; whether the file is source or executable. If you compile foo.lisp |
14169 | 2660 ;; with compile-file, then the next load-file should use foo.bin for |
42205 | 2661 ;; the default, not foo.lisp. This is tricky to do right, particularly |
14169 | 2662 ;; because the extension for executable files varies so much (.o, .bin, |
2663 ;; .lbin, .mo, .vo, .ao, ...). | |
114 | 2664 |
2665 | |
14169 | 2666 ;; COMINT-SOURCE-DEFAULT -- determines defaults for source-file processing |
2667 ;; commands. | |
2668 ;; | |
2669 ;; COMINT-CHECK-SOURCE -- if FNAME is in a modified buffer, asks you if you | |
2670 ;; want to save the buffer before issuing any process requests to the command | |
2671 ;; interpreter. | |
2672 ;; | |
2673 ;; COMINT-GET-SOURCE -- used by the source-file processing commands to prompt | |
2674 ;; for the file to process. | |
114 | 2675 |
2676 (defun comint-source-default (previous-dir/file source-modes) | |
54879 | 2677 "Compute the defaults for `load-file' and `compile-file' commands. |
2678 | |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
2679 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
|
2680 source-file processing command, or nil if there hasn't been one yet. |
54879 | 2681 SOURCE-MODES is a list used to determine what buffers contain source |
2682 files: if the major mode of the buffer is in SOURCE-MODES, it's source. | |
2683 Typically, (lisp-mode) or (scheme-mode). | |
2684 | |
2685 If the command is given while the cursor is inside a string, *and* | |
2686 the string is an existing filename, *and* the filename is not a directory, | |
2687 then the string is taken as default. This allows you to just position | |
2688 your cursor over a string that's a filename and have it taken as default. | |
2689 | |
2690 If the command is given in a file buffer whose major mode is in | |
2691 SOURCE-MODES, then the filename is the default file, and the | |
2692 file's directory is the default directory. | |
2693 | |
2694 If the buffer isn't a source file buffer (e.g., it's the process buffer), | |
2695 then the default directory & file are what was used in the last source-file | |
2696 processing command (i.e., PREVIOUS-DIR/FILE). If this is the first time | |
2697 the command has been run (PREVIOUS-DIR/FILE is nil), the default directory | |
2698 is the cwd, with no default file. (\"no default file\" = nil) | |
2699 | |
64570
76a0015820fb
(comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents:
64169
diff
changeset
|
2700 SOURCE-MODES is typically going to be something like (tea-mode) |
54879 | 2701 for T programs, (lisp-mode) for Lisp programs, (soar-mode lisp-mode) |
2702 for Soar programs, etc. | |
2703 | |
2704 The function returns a pair: (default-directory . default-file)." | |
114 | 2705 (cond ((and buffer-file-name (memq major-mode source-modes)) |
2706 (cons (file-name-directory buffer-file-name) | |
2707 (file-name-nondirectory buffer-file-name))) | |
2708 (previous-dir/file) | |
2709 (t | |
2710 (cons default-directory nil)))) | |
2711 | |
584 | 2712 |
114 | 2713 (defun comint-check-source (fname) |
54879 | 2714 "Check whether to save buffers visiting file FNAME. |
2715 Prior to loading or compiling (or otherwise processing) a file (in the CMU | |
2716 process-in-a-buffer modes), this function can be called on the filename. | |
2717 If the file is loaded into a buffer, and the buffer is modified, the user | |
2718 is queried to see if he wants to save the buffer before proceeding with | |
2719 the load or compile." | |
114 | 2720 (let ((buff (get-file-buffer fname))) |
2721 (if (and buff | |
2722 (buffer-modified-p buff) | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2723 (y-or-n-p (format "Save buffer %s first? " (buffer-name buff)))) |
114 | 2724 ;; save BUFF. |
2725 (let ((old-buffer (current-buffer))) | |
2726 (set-buffer buff) | |
2727 (save-buffer) | |
2728 (set-buffer old-buffer))))) | |
2729 | |
2730 (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
|
2731 "Return string around point, or nil." |
54879 | 2732 (let ((syntax (syntax-ppss))) |
2733 (when (nth 3 syntax) | |
2734 (condition-case () | |
2735 (buffer-substring-no-properties (1+ (nth 8 syntax)) | |
2736 (progn (goto-char (nth 8 syntax)) | |
2737 (forward-sexp) | |
2738 (1- (point)))) | |
2739 (error nil))))) | |
114 | 2740 |
2741 (defun comint-get-source (prompt prev-dir/file source-modes mustmatch-p) | |
54879 | 2742 "Prompt for filenames in commands that process source files, |
2743 e.g. loading or compiling a file. | |
2744 Provides a default, if there is one, and returns the result filename. | |
2745 | |
2746 See `comint-source-default' for more on determining defaults. | |
2747 | |
57603
bdfa227d18a8
(comint-insert-input): Use @ in `interactive'.
Richard M. Stallman <rms@gnu.org>
parents:
57539
diff
changeset
|
2748 PROMPT is the prompt string. PREV-DIR/FILE is the (DIRECTORY . FILE) pair |
54879 | 2749 from the last source processing command. SOURCE-MODES is a list of major |
2750 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
|
2751 two arguments are used for determining defaults.) If MUSTMATCH-P is true, |
54879 | 2752 then the filename reader will only accept a file that exists. |
2753 | |
2754 A typical use: | |
2755 (interactive (comint-get-source \"Compile file: \" prev-lisp-dir/file | |
2756 '(lisp-mode) t))" | |
114 | 2757 (let* ((def (comint-source-default prev-dir/file source-modes)) |
32326 | 2758 (stringfile (comint-extract-string)) |
114 | 2759 (sfile-p (and stringfile |
584 | 2760 (condition-case () |
2761 (file-exists-p stringfile) | |
2762 (error nil)) | |
114 | 2763 (not (file-directory-p stringfile)))) |
2764 (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
|
2765 (car def))) |
114 | 2766 (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
|
2767 (cdr def))) |
114 | 2768 (ans (read-file-name (if deffile (format "%s(default %s) " |
2769 prompt deffile) | |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2770 prompt) |
114 | 2771 defdir |
2772 (concat defdir deffile) | |
2773 mustmatch-p))) | |
2774 (list (expand-file-name (substitute-in-file-name ans))))) | |
2775 | |
14169 | 2776 ;; I am somewhat divided on this string-default feature. It seems |
2777 ;; to violate the principle-of-least-astonishment, in that it makes | |
2778 ;; the default harder to predict, so you actually have to look and see | |
2779 ;; what the default really is before choosing it. This can trip you up. | |
2780 ;; On the other hand, it can be useful, I guess. I would appreciate feedback | |
2781 ;; on this. | |
2782 ;; -Olin | |
584 | 2783 |
114 | 2784 |
14169 | 2785 ;; Simple process query facility. |
2786 ;; =========================================================================== | |
2787 ;; This function is for commands that want to send a query to the process | |
2788 ;; and show the response to the user. For example, a command to get the | |
2789 ;; arglist for a Common Lisp function might send a "(arglist 'foo)" query | |
2790 ;; to an inferior Common Lisp process. | |
32326 | 2791 ;; |
14169 | 2792 ;; This simple facility just sends strings to the inferior process and pops |
2793 ;; up a window for the process buffer so you can see what the process | |
2794 ;; responds with. We don't do anything fancy like try to intercept what the | |
2795 ;; process responds with and put it in a pop-up window or on the message | |
2796 ;; line. We just display the buffer. Low tech. Simple. Works good. | |
114 | 2797 |
2798 (defun comint-proc-query (proc str) | |
54879 | 2799 "Send to the inferior process PROC the string STR. |
2800 Pop-up but do not select a window for the inferior process so that | |
2801 its response can be seen." | |
114 | 2802 (let* ((proc-buf (process-buffer proc)) |
2803 (proc-mark (process-mark proc))) | |
2804 (display-buffer proc-buf) | |
2805 (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
|
2806 (let ((proc-win (get-buffer-window proc-buf 0)) |
114 | 2807 (proc-pt (marker-position proc-mark))) |
2808 (comint-send-string proc str) ; send the query | |
2809 (accept-process-output proc) ; wait for some output | |
2810 ;; Try to position the proc window so you can see the answer. | |
2811 ;; This is bogus code. If you delete the (sit-for 0), it breaks. | |
2812 ;; 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
|
2813 (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
|
2814 (let ((opoint (window-point proc-win))) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2815 (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
|
2816 (sit-for 0) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2817 (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
|
2818 (push-mark opoint) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2819 (set-window-point proc-win opoint))))))) |
114 | 2820 |
2821 | |
14169 | 2822 ;; Filename/command/history completion in a buffer |
2823 ;; =========================================================================== | |
2824 ;; Useful completion functions, courtesy of the Ergo group. | |
114 | 2825 |
14169 | 2826 ;; Six commands: |
2827 ;; comint-dynamic-complete Complete or expand command, filename, | |
2828 ;; history at point. | |
2829 ;; comint-dynamic-complete-filename Complete filename at point. | |
2830 ;; comint-dynamic-list-filename-completions List completions in help buffer. | |
2831 ;; comint-replace-by-expanded-filename Expand and complete filename at point; | |
2832 ;; replace with expanded/completed name. | |
2833 ;; 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
|
2834 |
14169 | 2835 ;; These are not installed in the comint-mode keymap. But they are |
2836 ;; available for people who want them. Shell-mode installs them: | |
2837 ;; (define-key shell-mode-map "\t" 'comint-dynamic-complete) | |
2838 ;; (define-key shell-mode-map "\M-?" | |
2839 ;; 'comint-dynamic-list-filename-completions))) | |
2840 ;; | |
2841 ;; Commands like this are fine things to put in load hooks if you | |
2842 ;; want them present in specific modes. | |
584 | 2843 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2844 (defcustom comint-completion-autolist nil |
100171 | 2845 "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
|
2846 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
|
2847 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2848 :group 'comint-completion) |
114 | 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-addsuffix t |
100171 | 2851 "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
|
2852 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
|
2853 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
|
2854 This mirrors the optional behavior of tcsh." |
33166
61e62bc5bd7f
(comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents:
33138
diff
changeset
|
2855 :type '(choice (const :tag "None" nil) |
33167 | 2856 (const :tag "Add /" t) |
33166
61e62bc5bd7f
(comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents:
33138
diff
changeset
|
2857 (cons :tag "Suffix pair" |
61e62bc5bd7f
(comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents:
33138
diff
changeset
|
2858 (string :tag "Directory suffix") |
61e62bc5bd7f
(comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents:
33138
diff
changeset
|
2859 (string :tag "File suffix"))) |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2860 :group 'comint-completion) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2861 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2862 (defcustom comint-completion-recexact nil |
100171 | 2863 "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
|
2864 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
|
2865 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2866 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
|
2867 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2868 :group 'comint-completion) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2869 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2870 (defcustom comint-completion-fignore nil |
100171 | 2871 "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
|
2872 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
|
2873 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2874 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
|
2875 :type '(repeat (string :tag "Suffix")) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2876 :group 'comint-completion) |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
2877 |
65113
58d4ddcf0c9a
(comint-file-name-prefix): Add autoload.
Richard M. Stallman <rms@gnu.org>
parents:
64819
diff
changeset
|
2878 ;;;###autoload |
105957
25e1d7e37015
* widget.el (define-widget): Purecopy the docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105828
diff
changeset
|
2879 (defvar comint-file-name-prefix (purecopy "") |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2880 "Prefix prepended to absolute file names taken from process input. |
54879 | 2881 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
|
2882 directory tracking functions.") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2883 |
15817
9e94b5fdaab1
(comint-file-name-chars): Was comint-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
15727
diff
changeset
|
2884 (defvar comint-file-name-chars |
49549
99be3a1e2589
Cygwin support patch.
Juanma Barranquero <lekktu@gmail.com>
parents:
48987
diff
changeset
|
2885 (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
|
2886 "~/A-Za-z0-9_^$!#%&{}@`'.,:()-" |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2887 "[]~/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
|
2888 "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
|
2889 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
|
2890 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
|
2891 |
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
|
2892 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
|
2893 |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2894 (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
|
2895 "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
|
2896 |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2897 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
|
2898 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2899 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2900 (defun comint-directory (directory) |
54879 | 2901 "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
|
2902 (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
|
2903 (concat comint-file-name-prefix directory) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2904 directory))) |
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 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2907 (defun comint-word (word-chars) |
54879 | 2908 "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
|
2909 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
|
2910 inside of a \"[...]\" (see `skip-chars-forward'), plus all non-ASCII characters." |
584 | 2911 (save-excursion |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2912 (let ((here (point)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2913 giveup) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2914 (while (not giveup) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2915 (let ((startpoint (point))) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2916 (skip-chars-backward (concat "\\\\" word-chars)) |
54879 | 2917 ;; Fixme: This isn't consistent with Bash, at least -- not |
2918 ;; 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
|
2919 (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
|
2920 (= (char-after (- (point) 2)) ?\\)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2921 (forward-char -2)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2922 (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
|
2923 (>= (char-after (- (point) 1)) 128)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2924 (forward-char -1)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2925 (if (= (point) startpoint) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
2926 (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
|
2927 ;; 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
|
2928 (when (< (point) here) |
21152
8197c659e85c
(comint-word): store-match-data => set-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
21018
diff
changeset
|
2929 (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
|
2930 (match-string 0))))) |
584 | 2931 |
15369
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2932 (defun comint-substitute-in-file-name (filename) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2933 "Return FILENAME with environment variables substituted. |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2934 Supports additional environment variable syntax of the command |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2935 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
|
2936 (let ((name (substitute-in-file-name filename))) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2937 (if (memq system-type '(ms-dos windows-nt)) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2938 (let (env-var-name |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2939 env-var-val) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2940 (save-match-data |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2941 (while (string-match "%\\([^\\\\/]*\\)%" name) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
2942 (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
|
2943 (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
|
2944 (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
|
2945 name)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2946 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2947 (defun comint-match-partial-filename () |
70186
a2173a369f78
(comint-match-partial-filename): Doc fix.
Romain Francoise <romain@orebokech.com>
parents:
70116
diff
changeset
|
2948 "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
|
2949 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
|
2950 (let ((filename (comint-word comint-file-name-chars))) |
32326 | 2951 (and filename (comint-substitute-in-file-name |
15369
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2952 (comint-unquote-filename filename))))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2953 |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2954 |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2955 (defun comint-quote-filename (filename) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2956 "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
|
2957 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
|
2958 (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
|
2959 filename |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2960 (let ((regexp |
53272
bb2708b976f1
(comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
2961 (format "[%s]" |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
2962 (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
|
2963 (save-match-data |
53272
bb2708b976f1
(comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
2964 (let ((i 0)) |
bb2708b976f1
(comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
2965 (while (string-match regexp filename i) |
bb2708b976f1
(comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
2966 (setq filename (replace-match "\\\\\\&" nil nil filename)) |
bb2708b976f1
(comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
2967 (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
|
2968 filename)))) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2969 |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2970 (defun comint-unquote-filename (filename) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2971 "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
|
2972 (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
|
2973 filename |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2974 (save-match-data |
15337
cf1e6f4dd2b0
(comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents:
14814
diff
changeset
|
2975 (let ((i 0)) |
cf1e6f4dd2b0
(comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents:
14814
diff
changeset
|
2976 (while (string-match "\\\\\\(.\\)" filename i) |
cf1e6f4dd2b0
(comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents:
14814
diff
changeset
|
2977 (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
|
2978 (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
|
2979 filename))) |
114 | 2980 |
584 | 2981 |
114 | 2982 (defun comint-dynamic-complete () |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2983 "Dynamically perform completion at point. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2984 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
|
2985 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
|
2986 assumed to have occurred." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2987 (interactive) |
12208
d10ef5c093ce
(comint-mode): Use make-local-hook.
Karl Heuer <kwzh@gnu.org>
parents:
12058
diff
changeset
|
2988 (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
|
2989 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2990 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2991 (defun comint-dynamic-complete-filename () |
584 | 2992 "Dynamically complete the filename at point. |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2993 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
|
2994 `comint-dynamic-complete-as-filename'. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2995 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
|
2996 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
|
2997 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
|
2998 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
|
2999 |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
3000 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
|
3001 `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
|
3002 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
|
3003 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3004 Returns t if successful." |
114 | 3005 (interactive) |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3006 (when (comint-match-partial-filename) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3007 (unless (window-minibuffer-p (selected-window)) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3008 (message "Completing file name...")) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3009 (comint-dynamic-complete-as-filename))) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3010 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3011 (defun comint-dynamic-complete-as-filename () |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3012 "Dynamically complete at point as a filename. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3013 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
|
3014 (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
|
3015 (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
|
3016 ;; 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
|
3017 ;; 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
|
3018 ;; 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
|
3019 ;;(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
|
3020 (minibuffer-p (window-minibuffer-p (selected-window))) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3021 (success t) |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3022 (dirsuffix (cond ((not comint-completion-addsuffix) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3023 "") |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3024 ((not (consp comint-completion-addsuffix)) |
51421
79dc5a8eacfe
(comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
50966
diff
changeset
|
3025 "/") |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3026 (t |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3027 (car comint-completion-addsuffix)))) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3028 (filesuffix (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)) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3031 " ") |
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 (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
|
3034 (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
|
3035 (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
|
3036 (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
|
3037 (filename (or filename "")) |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3038 (filedir (file-name-directory filename)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3039 (filenondir (file-name-nondirectory filename)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3040 (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
|
3041 (completion (file-name-completion filenondir directory))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3042 (cond ((null completion) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3043 (if minibuffer-p |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3044 (minibuffer-message "No completions of %s" filename) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3045 (message "No completions of %s" filename)) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3046 (setq success nil)) |
32326 | 3047 ((eq completion t) ; Means already completed "file". |
3048 (insert filesuffix) | |
3049 (unless minibuffer-p | |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3050 (message "Sole completion"))) |
32326 | 3051 ((string-equal completion "") ; Means completion on "directory/". |
3052 (comint-dynamic-list-filename-completions)) | |
3053 (t ; Completion string returned. | |
3054 (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
|
3055 ;; 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
|
3056 ;; 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
|
3057 ;; 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
|
3058 (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
|
3059 (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
|
3060 (insert (comint-quote-filename (directory-file-name completion))) |
32326 | 3061 (cond ((symbolp (file-name-completion completion directory)) |
3062 ;; 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
|
3063 (insert (if (file-directory-p file) dirsuffix filesuffix)) |
32326 | 3064 (unless minibuffer-p |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3065 (message "Completed"))) |
32326 | 3066 ((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
|
3067 (string-equal filenondir completion) |
32326 | 3068 (file-exists-p file)) |
3069 ;; It's not unique, but user wants shortest match. | |
3070 (insert (if (file-directory-p file) dirsuffix filesuffix)) | |
3071 (unless minibuffer-p | |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3072 (message "Completed shortest"))) |
32326 | 3073 ((or comint-completion-autolist |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3074 (string-equal filenondir completion)) |
32326 | 3075 ;; It's not unique, list possible completions. |
3076 (comint-dynamic-list-filename-completions)) | |
3077 (t | |
3078 (unless minibuffer-p | |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
3079 (message "Partially completed"))))))) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3080 success)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3081 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3082 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3083 (defun comint-replace-by-expanded-filename () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3084 "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
|
3085 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
|
3086 \"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
|
3087 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
|
3088 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
|
3089 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
|
3090 `comint-dynamic-complete-filename'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3091 (interactive) |
43530
aee3db99fcca
(comint-replace-by-expanded-filename): Do nothing if
Kim F. Storm <storm@cua.dk>
parents:
43492
diff
changeset
|
3092 (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
|
3093 (when filename |
aee3db99fcca
(comint-replace-by-expanded-filename): Do nothing if
Kim F. Storm <storm@cua.dk>
parents:
43492
diff
changeset
|
3094 (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
|
3095 (comint-dynamic-complete-filename)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3096 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3097 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3098 (defun comint-dynamic-simple-complete (stub candidates) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3099 "Dynamically complete STUB from CANDIDATES list. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3100 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
|
3101 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
|
3102 if completion is ambiguous. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3103 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3104 Returns nil if no completion was inserted. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3105 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
|
3106 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
|
3107 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
|
3108 Returns `listed' if a completion listing was shown. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3109 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3110 See also `comint-dynamic-complete-filename'." |
49549
99be3a1e2589
Cygwin support patch.
Juanma Barranquero <lekktu@gmail.com>
parents:
48987
diff
changeset
|
3111 (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
|
3112 (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
|
3113 (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
|
3114 ((not (consp comint-completion-addsuffix)) " ") |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
3115 (t (cdr comint-completion-addsuffix)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3116 (completions (all-completions stub candidates))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3117 (cond ((null completions) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3118 (if minibuffer-p |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3119 (minibuffer-message "No completions of %s" stub) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3120 (message "No completions of %s" stub)) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3121 nil) |
32326 | 3122 ((= 1 (length completions)) ; Gotcha! |
3123 (let ((completion (car completions))) | |
3124 (if (string-equal completion stub) | |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3125 (unless minibuffer-p |
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3126 (message "Sole completion")) |
32326 | 3127 (insert (substring completion (length stub))) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3128 (unless minibuffer-p |
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3129 (message "Completed"))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
3130 (insert suffix) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3131 'sole)) |
32326 | 3132 (t ; There's no unique completion. |
3133 (let ((completion (try-completion stub candidates))) | |
3134 ;; Insert the longest substring. | |
3135 (insert (substring completion (length stub))) | |
3136 (cond ((and comint-completion-recexact comint-completion-addsuffix | |
3137 (string-equal stub completion) | |
3138 (member completion completions)) | |
3139 ;; It's not unique, but user wants shortest match. | |
3140 (insert suffix) | |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3141 (unless minibuffer-p |
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3142 (message "Completed shortest")) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3143 'shortest) |
32326 | 3144 ((or comint-completion-autolist |
3145 (string-equal stub completion)) | |
3146 ;; It's not unique, list possible completions. | |
93134
4e8466e2b7c4
* comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents:
93132
diff
changeset
|
3147 (comint-dynamic-list-completions completions stub) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3148 'listed) |
32326 | 3149 (t |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3150 (unless minibuffer-p |
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3151 (message "Partially completed")) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3152 'partial))))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3153 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3154 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3155 (defun comint-dynamic-list-filename-completions () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3156 "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
|
3157 (interactive) |
81822
64c8ecd78bf2
(comint-dynamic-complete-as-filename,comint-dynamic-list-filename-completions):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81801
diff
changeset
|
3158 (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
|
3159 ;; 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
|
3160 ;; 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
|
3161 ;; 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
|
3162 ;;(file-name-handler-alist nil) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
3163 (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
|
3164 (filedir (file-name-directory filename)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3165 (filenondir (file-name-nondirectory filename)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3166 (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
|
3167 (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
|
3168 (if (not completions) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3169 (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
|
3170 (minibuffer-message "No completions of %s" filename) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3171 (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
|
3172 (comint-dynamic-list-completions |
93134
4e8466e2b7c4
* comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents:
93132
diff
changeset
|
3173 (mapcar 'comint-quote-filename completions) |
97764
0445036f6742
(comint-dynamic-list-filename-completions): Quote common substring.
Chong Yidong <cyd@stupidchicken.com>
parents:
97762
diff
changeset
|
3174 (comint-quote-filename filenondir))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3175 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
3176 |
46171
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3177 ;; 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
|
3178 ;; 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
|
3179 ;; 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
|
3180 (defvar comint-displayed-dynamic-completions nil) |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3181 |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3182 (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
|
3183 |
93134
4e8466e2b7c4
* comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents:
93132
diff
changeset
|
3184 (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
|
3185 "List in help buffer sorted COMPLETIONS. |
93134
4e8466e2b7c4
* comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents:
93132
diff
changeset
|
3186 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
|
3187 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
|
3188 (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
|
3189 (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
|
3190 (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
|
3191 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
|
3192 (buffer-name (window-buffer window)) |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3193 ;; 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
|
3194 ;; 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
|
3195 ;; 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
|
3196 ;; 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
|
3197 ;; previous completion command with a different set of |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3198 ;; 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
|
3199 ;; 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
|
3200 ;; displayed set. |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3201 (equal completions |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3202 (buffer-local-value 'comint-displayed-dynamic-completions |
c1c7a7405444
(comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents:
45916
diff
changeset
|
3203 (window-buffer window)))) |
42669
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3204 ;; If this command was repeated, and |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3205 ;; 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
|
3206 ;; 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
|
3207 (with-current-buffer (window-buffer window) |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3208 (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
|
3209 (set-window-start window (point-min)) |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3210 (save-selected-window |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3211 (select-window window) |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3212 (scroll-up)))) |
356ecd21a13c
(comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
42450
diff
changeset
|
3213 |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3214 ;; 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
|
3215 (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
|
3216 (current-window-configuration)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3217 (with-output-to-temp-buffer "*Completions*" |
93134
4e8466e2b7c4
* comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents:
93132
diff
changeset
|
3218 (display-completion-list completions common-substring)) |
93132
13f0e673b94b
(comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents:
92765
diff
changeset
|
3219 (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
|
3220 (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
|
3221 (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
|
3222 |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3223 ;; 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
|
3224 (let (key first) |
55881
79a700a71463
(comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55295
diff
changeset
|
3225 (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
|
3226 (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
|
3227 completions) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3228 (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
|
3229 first (aref key 0)) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3230 (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
|
3231 (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
|
3232 (get-buffer "*Completions*")) |
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3233 (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
|
3234 ;; 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
|
3235 ;; 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
|
3236 (progn |
105740
f6fc3559bd1d
(comint-dynamic-list-completions): Use choose-completion rather than
Glenn Morris <rgm@gnu.org>
parents:
105703
diff
changeset
|
3237 (choose-completion first) |
53399
9a9d11c249b9
(comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents:
53391
diff
changeset
|
3238 (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
|
3239 (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
|
3240 (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
|
3241 (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
|
3242 |
114 | 3243 |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3244 (defun comint-get-next-from-history () |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3245 "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
|
3246 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
|
3247 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
|
3248 (interactive) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3249 (if comint-save-input-ring-index |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3250 (progn |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3251 (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
|
3252 (comint-next-input 1)) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3253 (message "No previous history command"))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3254 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3255 (defun comint-accumulate () |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3256 "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
|
3257 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
|
3258 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
|
3259 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
|
3260 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
|
3261 when you send it." |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3262 (interactive) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3263 (insert "\n") |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3264 (set-marker comint-accum-marker (point)) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3265 (if comint-input-ring-index |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3266 (setq comint-save-input-ring-index |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3267 (- comint-input-ring-index 1)))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3268 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3269 (defun comint-goto-process-mark () |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3270 "Move point to the process mark. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3271 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
|
3272 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
|
3273 (interactive) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3274 (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
|
3275 (error "Current buffer has no process")))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3276 (goto-char (process-mark proc)) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
105195
diff
changeset
|
3277 (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
|
3278 (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
|
3279 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3280 (defun comint-bol-or-process-mark () |
24765
6c69a507d9bd
(comint-bol-or-process-mark): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
24719
diff
changeset
|
3281 "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
|
3282 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
|
3283 \(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
|
3284 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
|
3285 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3286 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
|
3287 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
|
3288 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
|
3289 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
|
3290 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
|
3291 (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
|
3292 (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
|
3293 (comint-bol nil) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3294 (comint-goto-process-mark))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3295 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3296 (defun comint-set-process-mark () |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3297 "Set the process mark at point." |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3298 (interactive) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3299 (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
|
3300 (error "Current buffer has no process")))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3301 (set-marker (process-mark proc) (point)) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3302 (message "Process mark set"))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3303 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
3304 |
42887 | 3305 ;; 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
|
3306 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3307 ;; 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
|
3308 ;; 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
|
3309 ;; or buffers, and then go back to using the comint shell. |
32326 | 3310 ;; |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3311 ;; 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
|
3312 ;; query using the process associated with a comint-buffer, and save that |
54879 | 3313 ;; 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
|
3314 ;; 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
|
3315 ;; process and having it execute the query and then finish, would not |
54879 | 3316 ;; 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
|
3317 ;; starting a new process is the simpler, and thus preferable, approach. |
32326 | 3318 ;; |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3319 ;; The basic implementation is as follows: comint-redirect changes the |
54879 | 3320 ;; preoutput filter functions (`comint-preoutput-filter-functions') to use |
3321 ;; 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
|
3322 ;; or buffers, until it sees a regexp that tells it to stop (by default, |
54879 | 3323 ;; 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
|
3324 ;; sees the stop regexp, it restores the old filter functions, and runs |
54879 | 3325 ;; `comint-redirect-hook'. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3326 ;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3327 ;; 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
|
3328 ;; 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
|
3329 ;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3330 ;; 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
|
3331 ;; correct prompt for your interpreter, or that you supply a regexp that says |
54879 | 3332 ;; when the redirection is finished. Otherwise, redirection will continue |
3333 ;; 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
|
3334 ;; 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
|
3335 ;; this prompt is set correctly. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3336 ;; |
54879 | 3337 ;; 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
|
3338 ;; 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
|
3339 ;; 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
|
3340 ;; |
54879 | 3341 ;; 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
|
3342 ;; `comint-use-prompt-regexp' is true. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3343 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3344 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3345 ;; Variables |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3346 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3347 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3348 (defcustom comint-redirect-verbose nil |
100171 | 3349 "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
|
3350 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
|
3351 :group 'comint |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3352 :type 'boolean) |
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 ;; Directly analagous to comint-preoutput-filter-functions |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3355 (defvar comint-redirect-filter-functions nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3356 "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
|
3357 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
|
3358 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
|
3359 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
|
3360 string. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3361 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3362 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
|
3363 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
|
3364 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
|
3365 |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3366 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
|
3367 either globally or locally.") |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3368 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3369 ;; Internal variables |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3370 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3371 (defvar comint-redirect-output-buffer nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3372 "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
|
3373 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3374 (defvar comint-redirect-finished-regexp nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3375 "Regular expression that determines when to stop redirection in Comint. |
32326 | 3376 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
|
3377 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
|
3378 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3379 (defvar comint-redirect-insert-matching-regexp nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3380 "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
|
3381 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
|
3382 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
|
3383 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
|
3384 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3385 (defvar comint-redirect-echo-input nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3386 "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
|
3387 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3388 (defvar comint-redirect-completed nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3389 "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
|
3390 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3391 (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
|
3392 "Original mode line for redirected process.") |
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-perform-sanity-check t |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3395 "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
|
3396 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
|
3397 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
|
3398 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
|
3399 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
|
3400 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
|
3401 in the process buffer already.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3402 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3403 (defvar comint-redirect-original-filter-function nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3404 "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
|
3405 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
|
3406 this value.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3407 |
54879 | 3408 (defvar comint-redirect-subvert-readonly nil |
65784
06a7b3628c63
(comint-redirect-subvert-readonly): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
65724
diff
changeset
|
3409 "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
|
3410 This works by binding `inhibit-read-only' around the insertion. |
54879 | 3411 This is useful, for instance, for insertion into Help mode buffers. |
3412 You probably want to set it locally to the output buffer.") | |
3413 | |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3414 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3415 ;; Functions |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3416 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3417 |
32326 | 3418 (defun comint-redirect-setup (output-buffer |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3419 comint-buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3420 finished-regexp |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3421 &optional echo-input) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3422 "Set up for output redirection. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3423 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
|
3424 to perform redirection. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3425 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3426 Output from COMINT-BUFFER is redirected to OUTPUT-BUFFER, until something |
32326 | 3427 in the output matches FINISHED-REGEXP. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3428 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3429 If optional argument ECHO-INPUT is non-nil, output is echoed to the |
54879 | 3430 original Comint buffer. |
26553
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 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
|
3433 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
|
3434 (with-current-buffer comint-buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3435 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3436 (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
|
3437 (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
|
3438 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3439 (make-local-variable 'comint-redirect-output-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3440 (setq comint-redirect-output-buffer output-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-finished-regexp) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3443 (setq comint-redirect-finished-regexp finished-regexp) |
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-echo-input) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3446 (setq comint-redirect-echo-input echo-input) |
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-completed) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3449 (setq comint-redirect-completed nil) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3450 |
32326 | 3451 (setq mode-line-process |
3452 (if mode-line-process | |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3453 (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
|
3454 (list ":%s Redirection"))))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3455 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3456 (defun comint-redirect-cleanup () |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3457 "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
|
3458 (interactive) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3459 ;; Restore the process filter |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3460 (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
|
3461 comint-redirect-original-filter-function) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3462 ;; Restore the mode line |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3463 (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
|
3464 ;; Set the completed flag |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3465 (setq comint-redirect-completed t)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3466 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3467 ;; 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
|
3468 ;; that it really occurs. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3469 (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
|
3470 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3471 (defun comint-redirect-filter (process input-string) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3472 "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
|
3473 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
|
3474 place output in. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3475 |
54879 | 3476 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
|
3477 |
32326 | 3478 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
|
3479 end user." |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3480 (and process |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3481 (with-current-buffer (process-buffer process) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3482 (comint-redirect-preoutput-filter input-string) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3483 ;; 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
|
3484 (and comint-redirect-echo-input |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3485 comint-redirect-original-filter-function |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3486 (funcall comint-redirect-original-filter-function |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3487 process input-string))))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3488 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3489 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3490 (defun comint-redirect-preoutput-filter (input-string) |
54879 | 3491 "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
|
3492 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
|
3493 place output in. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3494 |
54879 | 3495 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
|
3496 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3497 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
|
3498 (let ((output-buffer-list |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3499 (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
|
3500 comint-redirect-output-buffer |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3501 (list comint-redirect-output-buffer))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3502 (filtered-input-string input-string)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3503 |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3504 ;; 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
|
3505 ;; the string. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3506 (let ((functions comint-redirect-filter-functions)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3507 (while (and functions filtered-input-string) |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3508 (if (eq (car functions) t) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3509 ;; 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
|
3510 ;; do that. |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3511 (let ((functions |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3512 (default-value 'comint-redirect-filter-functions))) |
43579
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3513 (while (and functions filtered-input-string) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3514 (setq filtered-input-string |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3515 (funcall (car functions) filtered-input-string)) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3516 (setq functions (cdr functions)))) |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3517 (setq filtered-input-string |
ebb2754ac469
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43530
diff
changeset
|
3518 (funcall (car functions) filtered-input-string))) |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3519 (setq functions (cdr functions)))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3520 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3521 ;; Clobber `comint-redirect-finished-regexp' |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3522 (or comint-redirect-insert-matching-regexp |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3523 (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
|
3524 (setq filtered-input-string |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3525 (replace-match "" nil nil filtered-input-string)))) |
32326 | 3526 |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3527 ;; Send output to all registered buffers |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3528 (save-excursion |
54879 | 3529 (dolist (buf output-buffer-list) |
3530 ;; Set this buffer to the output buffer | |
3531 (set-buffer (get-buffer-create buf)) | |
3532 ;; Go to the end of the buffer | |
3533 (goto-char (point-max)) | |
3534 ;; Insert the output | |
3535 (let ((inhibit-read-only comint-redirect-subvert-readonly)) | |
3536 (insert filtered-input-string)))) | |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3537 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3538 ;; Message |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3539 (and comint-redirect-verbose |
32326 | 3540 (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
|
3541 (mapconcat 'identity output-buffer-list " "))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3542 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3543 ;; If we see the prompt, tidy up |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3544 ;; 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
|
3545 ;; clobber it |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3546 (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
|
3547 (progn |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3548 (and comint-redirect-verbose |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3549 (message "Redirection completed")) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3550 (comint-redirect-cleanup) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3551 (run-hooks 'comint-redirect-hook))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3552 ;; Echo input? |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3553 (if comint-redirect-echo-input |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3554 filtered-input-string |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3555 ""))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3556 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3557 ;;;###autoload |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3558 (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
|
3559 "Send COMMAND to process in current buffer, with output to OUTPUT-BUFFER. |
54879 | 3560 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
|
3561 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3562 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
|
3563 (interactive "sCommand: \nBOutput Buffer: \nP") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3564 (let ((process (get-buffer-process (current-buffer)))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3565 (if process |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3566 (comint-redirect-send-command-to-process |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3567 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
|
3568 (error "No process for current buffer")))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3569 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3570 ;;;###autoload |
32326 | 3571 (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
|
3572 (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
|
3573 "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
|
3574 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
|
3575 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3576 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
|
3577 (interactive "sCommand: \nBOutput Buffer: \nbProcess Buffer: \nP") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3578 (let* (;; The process buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3579 (process-buffer (if (processp process) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3580 (process-buffer process) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3581 process)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3582 (proc (get-buffer-process process-buffer))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3583 ;; 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
|
3584 (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
|
3585 |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3586 ;; 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
|
3587 (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
|
3588 (save-excursion |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3589 (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
|
3590 (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
|
3591 (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
|
3592 |
42831
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3593 ;; 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
|
3594 (comint-redirect-setup |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3595 output-buffer |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3596 (current-buffer) ; Comint Buffer |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3597 comint-prompt-regexp ; Finished Regexp |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3598 echo) ; Echo input |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3599 |
42831
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3600 ;; Set the filter |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3601 (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
|
3602 (process-filter proc)) |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3603 (set-process-filter proc 'comint-redirect-filter) |
32326 | 3604 |
42831
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3605 ;; Send the command |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3606 (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
|
3607 |
42831
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3608 ;; Show the output |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3609 (or no-display |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3610 (display-buffer |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3611 (get-buffer-create |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3612 (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
|
3613 (car output-buffer) |
ba5189cc6432
(comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
42803
diff
changeset
|
3614 output-buffer))))))) |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3615 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3616 ;;;###autoload |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3617 (defun comint-redirect-results-list (command regexp regexp-group) |
32326 | 3618 "Send COMMAND to current process. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3619 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
|
3620 REGEXP-GROUP is the regular expression group in REGEXP to use." |
32326 | 3621 (comint-redirect-results-list-from-process |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3622 (get-buffer-process (current-buffer)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3623 command regexp regexp-group)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3624 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3625 ;;;###autoload |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3626 (defun comint-redirect-results-list-from-process (process command regexp regexp-group) |
32326 | 3627 "Send COMMAND to PROCESS. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3628 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
|
3629 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
|
3630 (let ((output-buffer " *Comint Redirect Work Buffer*") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3631 results) |
105703
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3632 (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
|
3633 (erase-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3634 (comint-redirect-send-command-to-process command |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3635 output-buffer process nil t) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3636 ;; Wait for the process to complete |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3637 (set-buffer (process-buffer process)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3638 (while (null comint-redirect-completed) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3639 (accept-process-output nil 1)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3640 ;; Collect the output |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3641 (set-buffer output-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3642 (goto-char (point-min)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3643 ;; 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
|
3644 (and (looking-at command) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3645 (forward-line)) |
32326 | 3646 (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
|
3647 (push (buffer-substring-no-properties |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3648 (match-beginning regexp-group) |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3649 (match-end regexp-group)) |
56a197ab757c
(comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105601
diff
changeset
|
3650 results)) |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3651 results))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3652 |
92765
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3653 (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
|
3654 "^Empty input ring$" |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3655 "^No history$" |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3656 "^Not found$" ; Too common? |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3657 "^Current buffer has no process$")) |
8a7561cc8360
Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92482
diff
changeset
|
3658 (add-to-list 'debug-ignored-errors x)) |
39713
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
3659 |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3660 |
14169 | 3661 ;; Converting process modes to use comint mode |
3662 ;; =========================================================================== | |
3663 ;; The code in the Emacs 19 distribution has all been modified to use comint | |
3664 ;; where needed. However, there are `third-party' packages out there that | |
3665 ;; still use the old shell mode. Here's a guide to conversion. | |
3666 ;; | |
3667 ;; Renaming variables | |
3668 ;; Most of the work is renaming variables and functions. These are the common | |
3669 ;; ones: | |
3670 ;; Local variables: | |
3671 ;; last-input-start comint-last-input-start | |
32326 | 3672 ;; last-input-end comint-last-input-end |
14169 | 3673 ;; shell-prompt-pattern comint-prompt-regexp |
3674 ;; shell-set-directory-error-hook <no equivalent> | |
3675 ;; Miscellaneous: | |
3676 ;; shell-set-directory <unnecessary> | |
32326 | 3677 ;; shell-mode-map comint-mode-map |
14169 | 3678 ;; Commands: |
3679 ;; shell-send-input comint-send-input | |
3680 ;; shell-send-eof comint-delchar-or-maybe-eof | |
32326 | 3681 ;; kill-shell-input comint-kill-input |
14169 | 3682 ;; interrupt-shell-subjob comint-interrupt-subjob |
3683 ;; stop-shell-subjob comint-stop-subjob | |
3684 ;; quit-shell-subjob comint-quit-subjob | |
3685 ;; 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
|
3686 ;; kill-output-from-shell comint-delete-output |
14169 | 3687 ;; show-output-from-shell comint-show-output |
3688 ;; copy-last-shell-input Use comint-previous-input/comint-next-input | |
3689 ;; | |
3690 ;; SHELL-SET-DIRECTORY is gone, its functionality taken over by | |
3691 ;; SHELL-DIRECTORY-TRACKER, the shell mode's comint-input-filter-functions. | |
3692 ;; Comint mode does not provide functionality equivalent to | |
3693 ;; shell-set-directory-error-hook; it is gone. | |
3694 ;; | |
3695 ;; comint-last-input-start is provided for modes which want to munge | |
3696 ;; the buffer after input is sent, perhaps because the inferior | |
3697 ;; insists on echoing the input. The LAST-INPUT-START variable in | |
3698 ;; the old shell package was used to implement a history mechanism, | |
3699 ;; but you should think twice before using comint-last-input-start | |
3700 ;; for this; the input history ring often does the job better. | |
32326 | 3701 ;; |
14169 | 3702 ;; If you are implementing some process-in-a-buffer mode, called foo-mode, do |
3703 ;; *not* create the comint-mode local variables in your foo-mode function. | |
3704 ;; This is not modular. Instead, call comint-mode, and let *it* create the | |
3705 ;; necessary comint-specific local variables. Then create the | |
3706 ;; foo-mode-specific local variables in foo-mode. Set the buffer's keymap to | |
3707 ;; be foo-mode-map, and its mode to be foo-mode. Set the comint-mode hooks | |
3708 ;; (comint-{prompt-regexp, input-filter, input-filter-functions, | |
3709 ;; get-old-input) that need to be different from the defaults. Call | |
3710 ;; foo-mode-hook, and you're done. Don't run the comint-mode hook yourself; | |
3711 ;; comint-mode will take care of it. The following example, from shell.el, | |
3712 ;; is typical: | |
32326 | 3713 ;; |
14169 | 3714 ;; (defvar shell-mode-map '()) |
3715 ;; (cond ((not shell-mode-map) | |
3716 ;; (setq shell-mode-map (copy-keymap comint-mode-map)) | |
3717 ;; (define-key shell-mode-map "\C-c\C-f" 'shell-forward-command) | |
3718 ;; (define-key shell-mode-map "\C-c\C-b" 'shell-backward-command) | |
3719 ;; (define-key shell-mode-map "\t" 'comint-dynamic-complete) | |
3720 ;; (define-key shell-mode-map "\M-?" | |
3721 ;; 'comint-dynamic-list-filename-completions))) | |
3722 ;; | |
3723 ;; (defun shell-mode () | |
3724 ;; (interactive) | |
3725 ;; (comint-mode) | |
3726 ;; (setq comint-prompt-regexp shell-prompt-pattern) | |
3727 ;; (setq major-mode 'shell-mode) | |
3728 ;; (setq mode-name "Shell") | |
3729 ;; (use-local-map shell-mode-map) | |
3730 ;; (make-local-variable 'shell-directory-stack) | |
3731 ;; (setq shell-directory-stack nil) | |
3732 ;; (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
|
3733 ;; (run-mode-hooks 'shell-mode-hook)) |
14169 | 3734 ;; |
3735 ;; | |
3736 ;; Completion for comint-mode users | |
32326 | 3737 ;; |
14169 | 3738 ;; For modes that use comint-mode, comint-dynamic-complete-functions is the |
3739 ;; hook to add completion functions to. Functions on this list should return | |
3740 ;; non-nil if completion occurs (i.e., further completion should not occur). | |
3741 ;; You could use comint-dynamic-simple-complete to do the bulk of the | |
3742 ;; completion job. | |
584 | 3743 |
39713
25d48943cd58
(comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents:
39240
diff
changeset
|
3744 |
584 | 3745 (provide 'comint) |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
638
diff
changeset
|
3746 |
57419
658b7dadee60
(comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56220
diff
changeset
|
3747 ;; arch-tag: 1793314c-09db-40be-9549-9aeae3e75164 |
38409
153f1b1f2efd
Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents:
38073
diff
changeset
|
3748 ;;; comint.el ends here |