Mercurial > emacs
annotate lisp/comint.el @ 37081:71fe12822bf3
Fix last change.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 30 Mar 2001 10:21:06 +0000 |
parents | 76fed386fc02 |
children | b5ddd589d143 |
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 |
34977
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
3 ;; Copyright (C) 1988, 90, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001 |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
638
diff
changeset
|
5 |
18805 | 6 ;; Author: Olin Shivers <shivers@cs.cmu.edu> then |
25278 | 7 ;; Simon Marshall <simon@gnu.org> |
18805 | 8 ;; Maintainer: FSF |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2025
diff
changeset
|
9 ;; Keywords: processes |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
811
diff
changeset
|
10 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
11 ;; This file is part of GNU Emacs. |
114 | 12 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
13 ;; GNU Emacs is free software; you can redistribute it and/or modify |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
14 ;; it under the terms of the GNU General Public License as published by |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
15 ;; the Free Software Foundation; either version 2, or (at your option) |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
16 ;; any later version. |
114 | 17 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
18 ;; 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
|
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
21 ;; GNU General Public License for more details. |
114 | 22 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
23 ;; You should have received a copy of the GNU General Public License |
14169 | 24 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
26 ;; Boston, MA 02111-1307, USA. | |
114 | 27 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
793
diff
changeset
|
28 ;;; Commentary: |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
793
diff
changeset
|
29 |
14169 | 30 ;; Please send me bug reports, bug fixes, and extensions, so that I can |
31 ;; merge them into the master source. | |
32 ;; - Olin Shivers (shivers@cs.cmu.edu) | |
25278 | 33 ;; - Simon Marshall (simon@gnu.org) |
584 | 34 |
14169 | 35 ;; This file defines a general command-interpreter-in-a-buffer package |
36 ;; (comint mode). The idea is that you can build specific process-in-a-buffer | |
37 ;; modes on top of comint mode -- e.g., lisp, shell, scheme, T, soar, .... | |
32326 | 38 ;; This way, all these specific packages share a common base functionality, |
14169 | 39 ;; and a common set of bindings, which makes them easier to use (and |
40 ;; saves code, implementation time, etc., etc.). | |
114 | 41 |
14169 | 42 ;; Several packages are already defined using comint mode: |
43 ;; - shell.el defines a shell-in-a-buffer mode. | |
44 ;; - cmulisp.el defines a simple lisp-in-a-buffer mode. | |
45 ;; | |
46 ;; - The file cmuscheme.el defines a scheme-in-a-buffer mode. | |
47 ;; - The file tea.el tunes scheme and inferior-scheme modes for T. | |
48 ;; - The file soar.el tunes lisp and inferior-lisp modes for Soar. | |
49 ;; - cmutex.el defines tex and latex modes that invoke tex, latex, bibtex, | |
50 ;; previewers, and printers from within emacs. | |
51 ;; - background.el allows csh-like job control inside emacs. | |
52 ;; It is pretty easy to make new derived modes for other processes. | |
584 | 53 |
14169 | 54 ;; For documentation on the functionality provided by comint mode, and |
55 ;; the hooks available for customising it, see the comments below. | |
32326 | 56 ;; For further information on the standard derived modes (shell, |
14169 | 57 ;; inferior-lisp, inferior-scheme, ...), see the relevant source files. |
114 | 58 |
14169 | 59 ;; For hints on converting existing process modes (e.g., tex-mode, |
60 ;; background, dbx, gdb, kermit, prolog, telnet) to use comint-mode | |
61 ;; instead of shell-mode, see the notes at the end of this file. | |
114 | 62 |
63 | |
14169 | 64 ;; Brief Command Documentation: |
65 ;;============================================================================ | |
66 ;; Comint Mode Commands: (common to all derived modes, like shell & cmulisp | |
67 ;; mode) | |
68 ;; | |
32326 | 69 ;; m-p comint-previous-input Cycle backwards in input history |
70 ;; m-n comint-next-input Cycle forwards | |
14169 | 71 ;; m-r comint-previous-matching-input Previous input matching a regexp |
72 ;; m-s comint-next-matching-input Next input that matches | |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
73 ;; m-c-l comint-show-output Show last batch of process output |
14169 | 74 ;; return comint-send-input |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
75 ;; c-d comint-delchar-or-maybe-eof Delete char unless at end of buff |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
76 ;; c-c c-a comint-bol-or-process-mark First time, move point to bol; |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
77 ;; second time, move to process-mark. |
32326 | 78 ;; c-c c-u comint-kill-input ^u |
79 ;; c-c c-w backward-kill-word ^w | |
80 ;; c-c c-c comint-interrupt-subjob ^c | |
81 ;; c-c c-z comint-stop-subjob ^z | |
82 ;; c-c c-\ comint-quit-subjob ^\ | |
32613
6aece997f0f9
(comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents:
32598
diff
changeset
|
83 ;; c-c c-o comint-delete-output Delete last batch of process output |
14169 | 84 ;; c-c c-r comint-show-output Show last batch of process output |
85 ;; c-c c-l comint-dynamic-list-input-ring List input history | |
86 ;; | |
87 ;; Not bound by default in comint-mode (some are in shell mode) | |
88 ;; comint-run Run a program under comint-mode | |
89 ;; send-invisible Read a line w/o echo, and send to proc | |
90 ;; comint-dynamic-complete-filename Complete filename at point. | |
91 ;; comint-dynamic-complete-variable Complete variable name at point. | |
92 ;; comint-dynamic-list-filename-completions List completions in help buffer. | |
93 ;; comint-replace-by-expanded-filename Expand and complete filename at point; | |
94 ;; replace with expanded/completed name. | |
95 ;; comint-replace-by-expanded-history Expand history at point; | |
96 ;; replace with expanded name. | |
97 ;; comint-magic-space Expand history and add (a) space(s). | |
98 ;; comint-kill-subjob No mercy. | |
99 ;; comint-show-maximum-output Show as much output as possible. | |
100 ;; comint-continue-subjob Send CONT signal to buffer's process | |
101 ;; group. Useful if you accidentally | |
102 ;; 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
|
103 ;; 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
|
104 ;; 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
|
105 ;; as input. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
106 ;; 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
|
107 ;; comint-set-process-mark Set process-mark to point. |
114 | 108 |
14169 | 109 ;; comint-mode-hook is the comint mode hook. Basically for your keybindings. |
584 | 110 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
793
diff
changeset
|
111 ;;; Code: |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
793
diff
changeset
|
112 |
1131 | 113 (require 'ring) |
114 | 114 |
14169 | 115 ;; Buffer Local Variables: |
116 ;;============================================================================ | |
117 ;; Comint mode buffer local variables: | |
32326 | 118 ;; 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
|
119 ;; 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
|
120 ;; 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
|
121 ;; 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
|
122 ;; 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
|
123 ;; 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
|
124 ;; comint-input-ring-index number ... |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
125 ;; 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
|
126 ;; 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
|
127 ;; 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
|
128 ;; 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
|
129 ;; 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
|
130 ;; 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
|
131 ;; comint-file-name-quote-list list ... |
32326 | 132 ;; 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
|
133 ;; 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
|
134 ;; 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
|
135 ;; 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
|
136 ;; 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
|
137 ;; 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
|
138 ;; 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
|
139 ;; 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
|
140 ;; comint-scroll-to-bottom-on-input symbol For scroll behavior |
6f32894f4ad3
1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents:
15541
diff
changeset
|
141 ;; comint-scroll-to-bottom-on-output symbol ... |
32326 | 142 ;; 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
|
143 ;; comint-accum-marker maker For comint-accumulate |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
144 ;; comint-last-output-overlay overlay |
14169 | 145 ;; |
146 ;; 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
|
147 ;; 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
|
148 ;; 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
|
149 ;; comint-completion-recexact boolean ... |
114 | 150 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
151 (defgroup comint nil |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
152 "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
|
153 :group 'processes) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
154 |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
155 (defgroup comint-completion nil |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
156 "Completion facilities in comint" |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
157 :group 'comint) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
158 |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
159 (defgroup comint-source nil |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
160 "Source finding facilities in comint" |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
161 :prefix "comint-" |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
162 :group 'comint) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
163 |
584 | 164 (defvar comint-prompt-regexp "^" |
165 "Regexp to recognise prompts in the inferior process. | |
166 Defaults to \"^\", the null string at BOL. | |
114 | 167 |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
168 This variable is only used if the variable |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
169 `comint-use-prompt-regexp-instead-of-fields' is non-nil. |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
170 |
114 | 171 Good choices: |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
172 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
|
173 Lucid Common Lisp: \"^\\\\(>\\\\|\\\\(->\\\\)+\\\\) *\" |
fc25d1816641
* comint.el (comint-prompt-regexp): Double the backslashes in the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
174 franz: \"^\\\\(->\\\\|<[0-9]*>:\\\\) *\" |
584 | 175 kcl: \"^>+ *\" |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
176 shell: \"^[^#$%>\\n]*[#$%>] *\" |
584 | 177 T: \"^>+ *\" |
114 | 178 |
584 | 179 This is a good thing to set in mode hooks.") |
114 | 180 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
181 (defvar comint-delimiter-argument-list () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
182 "List of characters to recognise as separate arguments in input. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
183 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
|
184 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
|
185 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
|
186 Defaults to the empty list. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
187 |
6154
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
188 For shells, a good value is (?\\| ?& ?< ?> ?\\( ?\\) ?;). |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
189 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
190 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
|
191 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
192 (defcustom comint-input-autoexpand nil |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
193 "*If non-nil, expand input command history references on completion. |
4923
63aed739d09d
(comint-postoutput-scroll-to-bottom):
Richard M. Stallman <rms@gnu.org>
parents:
4899
diff
changeset
|
194 This mirrors the optional behavior of tcsh (its autoexpand and histlit). |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
195 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
196 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
|
197 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
|
198 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
|
199 `comint-dynamic-complete'. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
200 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
201 This variable is buffer-local." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
202 :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
|
203 (const input) |
22569
b5923f76f35b
(comint-input-autoexpand): Use `other' widget type.
Andreas Schwab <schwab@suse.de>
parents:
22272
diff
changeset
|
204 (const history) |
b5923f76f35b
(comint-input-autoexpand): Use `other' widget type.
Andreas Schwab <schwab@suse.de>
parents:
22272
diff
changeset
|
205 (other :tag "on" t)) |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
206 :group 'comint) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
207 |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
208 (defcustom comint-highlight-input t |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
209 "*If non-nil, highlight input; also allow choosing previous input with a mouse. |
32743
fd31939b0747
(comint-highlight-input, comint-highlight-prompt):
Miles Bader <miles@gnu.org>
parents:
32635
diff
changeset
|
210 The face used is `comint-highlight-input'." |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
211 :type 'boolean |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
212 :group 'comint) |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
213 |
32743
fd31939b0747
(comint-highlight-input, comint-highlight-prompt):
Miles Bader <miles@gnu.org>
parents:
32635
diff
changeset
|
214 (defface comint-highlight-input '((t (:bold t))) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
215 "Face to use to highlight input when `comint-highlight-input' is non-nil." |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
216 :group 'comint) |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
217 |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
218 (defcustom comint-highlight-prompt t |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
219 "*If non-nil, highlight program prompts. |
32743
fd31939b0747
(comint-highlight-input, comint-highlight-prompt):
Miles Bader <miles@gnu.org>
parents:
32635
diff
changeset
|
220 The face used is `comint-highlight-prompt'." |
33023
ab1061464a32
(comint-highlight-prompt): Add :type.
Miles Bader <miles@gnu.org>
parents:
32942
diff
changeset
|
221 :type 'boolean |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
222 :group 'comint) |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
223 |
32743
fd31939b0747
(comint-highlight-input, comint-highlight-prompt):
Miles Bader <miles@gnu.org>
parents:
32635
diff
changeset
|
224 (defface comint-highlight-prompt |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
225 '((((background dark)) (:foreground "cyan")) |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
226 (t (:foreground "dark blue"))) |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
227 "Face to use to highlight prompt when `comint-highlight-prompt' is non-nil." |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
228 :group 'comint) |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
229 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
230 (defcustom comint-input-ignoredups nil |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
231 "*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
|
232 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
|
233 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
234 This variable is buffer-local." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
235 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
236 :group 'comint) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
237 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
238 (defcustom comint-input-ring-file-name nil |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
239 "*If non-nil, name of the file to read/write input history. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
240 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
|
241 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
242 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
|
243 :type '(choice (const :tag "nil" nil) |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
244 file) |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
245 :group 'comint) |
4872
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 (defcustom comint-scroll-to-bottom-on-input nil |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
248 "*Controls whether input to interpreter causes window to scroll. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
249 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
|
250 If `this', scroll only the selected window. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
251 |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
252 The default is nil. |
4880
a658d0e341b1
(comint-scroll-to-bottom-on-input)
Richard M. Stallman <rms@gnu.org>
parents:
4872
diff
changeset
|
253 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
254 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
|
255 :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
|
256 (const t) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
257 (const all) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
258 (const this)) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
259 :group 'comint) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
260 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
261 (defcustom comint-scroll-to-bottom-on-output nil |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
262 "*Controls whether interpreter output causes window to scroll. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
263 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
|
264 If `this', scroll only the selected window. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
265 If `others', scroll only those that are not the selected window. |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
266 |
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
267 The default is nil. |
4880
a658d0e341b1
(comint-scroll-to-bottom-on-input)
Richard M. Stallman <rms@gnu.org>
parents:
4872
diff
changeset
|
268 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
269 See variable `comint-scroll-show-maximum-output' and function |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
270 `comint-postoutput-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
|
271 :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
|
272 (const t) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
273 (const all) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
274 (const this) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
275 (const others)) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
276 :group 'comint) |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
277 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
278 (defcustom comint-scroll-show-maximum-output nil |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
279 "*Controls how interpreter output causes window to scroll. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
280 If non-nil, then show the maximum output when the window is scrolled. |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
281 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
282 See variable `comint-scroll-to-bottom-on-output' and function |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
283 `comint-postoutput-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
|
284 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
285 :group 'comint) |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
286 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
287 (defcustom comint-buffer-maximum-size 1024 |
10833
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
288 "*The maximum size in lines for comint buffers. |
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
289 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
|
290 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
|
291 :type 'integer |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
292 :group 'comint) |
10833
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
293 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
294 (defvar comint-input-ring-size 32 |
584 | 295 "Size of input history ring.") |
114 | 296 |
25443
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
297 (defvar comint-input-ring-separator "\n" |
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
298 "Separator between commands in the history file.") |
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
299 |
34977
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
300 (defvar comint-input-history-ignore "^#" |
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
301 "Regexp for history entries that should be ignored when comint initializes.") |
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
302 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
303 (defcustom comint-process-echoes nil |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
304 "*If non-nil, assume that the subprocess echoes any input. |
2539
577c77cfd199
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
2518
diff
changeset
|
305 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
|
306 appears in the buffer. |
2539
577c77cfd199
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
2518
diff
changeset
|
307 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
308 This variable is buffer-local." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
309 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
310 :group 'comint) |
2539
577c77cfd199
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
2518
diff
changeset
|
311 |
24471
cddc33d259d4
(comint-password-prompt-regexp): Accept "login password:"
Karl Heuer <kwzh@gnu.org>
parents:
23615
diff
changeset
|
312 ;; 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
|
313 ;; 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
|
314 ;; 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
|
315 ;; ssh-add prints a prompt like `Enter passphrase: '. |
24893
c74f4b5eb657
(comint-password-prompt-regexp): Allow "(again)".
Karl Heuer <kwzh@gnu.org>
parents:
24765
diff
changeset
|
316 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
317 (defcustom comint-password-prompt-regexp |
34834
792f41f27d41
From Markus Rost <markus.rost@mathematik.uni-regensburg.de>:
Miles Bader <miles@gnu.org>
parents:
34606
diff
changeset
|
318 "\\(\\([Oo]ld \\|[Nn]ew \\|Kerberos \\|'s \\|login \\|CVS \\|^\\)\ |
24893
c74f4b5eb657
(comint-password-prompt-regexp): Allow "(again)".
Karl Heuer <kwzh@gnu.org>
parents:
24765
diff
changeset
|
319 [Pp]assword\\( (again)\\)?\\|pass phrase\\|Enter passphrase\\)\ |
24700
00ced60fa6df
(comint-password-prompt-regexp): Fix last change to be more specific.
Karl Heuer <kwzh@gnu.org>
parents:
24698
diff
changeset
|
320 \\( for [^@ \t\n]+@[^@ \t\n]+\\)?:\\s *\\'" |
8087
c22d7c5168f5
comint-password-prompt-regexp: New variable.
Noah Friedman <friedman@splode.com>
parents:
8060
diff
changeset
|
321 "*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
|
322 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
|
323 :type 'regexp |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
324 :group 'comint) |
8087
c22d7c5168f5
comint-password-prompt-regexp: New variable.
Noah Friedman <friedman@splode.com>
parents:
8060
diff
changeset
|
325 |
14169 | 326 ;; Here are the per-interpreter hooks. |
584 | 327 (defvar comint-get-old-input (function comint-get-old-input-default) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
328 "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
|
329 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
|
330 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
|
331 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
|
332 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
|
333 text matching `comint-prompt-regexp', depending on the value of |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
334 `comint-use-prompt-regexp-instead-of-fields'.") |
114 | 335 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
336 (defvar comint-dynamic-complete-functions |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
337 '(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
|
338 "List of functions called to perform completion. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
339 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
|
340 See also `comint-dynamic-complete'. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
341 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
342 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
|
343 |
584 | 344 (defvar comint-input-filter |
345 (function (lambda (str) (not (string-match "\\`\\s *\\'" str)))) | |
346 "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
|
347 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
|
348 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
|
349 |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
350 (defvar comint-input-filter-functions '() |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
351 "Functions to call before input is sent to the process. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
352 These functions get one argument, a string containing the text to send. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
353 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
354 This variable is buffer-local.") |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
355 |
32326 | 356 (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
357 "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
|
358 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
|
359 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
|
360 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
|
361 `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
|
362 functions have already modified the buffer. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
363 |
19515
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
364 See also `comint-preoutput-filter-functions'. |
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
365 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
366 This variable is buffer-local.") |
584 | 367 |
368 (defvar comint-input-sender (function comint-simple-send) | |
369 "Function to actually send to PROCESS the STRING submitted by user. | |
32326 | 370 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
|
371 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
|
372 `comint-simple-send' just sends the string plus a newline. |
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
373 This is called from the user command `comint-send-input'.") |
584 | 374 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
375 (defcustom comint-eol-on-send t |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
376 "*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
|
377 See `comint-send-input'." |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
378 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
379 :group 'comint) |
114 | 380 |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
381 ;; 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
|
382 ;; 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
|
383 ;; places that need attention. |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
384 (defcustom comint-use-prompt-regexp-instead-of-fields nil |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
385 "*If non-nil, use `comint-prompt-regexp' to distinguish prompts from user-input. |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
386 If nil, then program output and user-input are given different `field' |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
387 properties, which emacs commands can use to distinguish them (in |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
388 particular, common movement commands such as begining-of-line respect |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
389 field boundaries in a natural way)." |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
390 :type 'boolean |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
391 :group 'comint) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
392 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
393 (defcustom comint-mode-hook '() |
31970
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
394 "Called upon entry into `comint-mode' |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
395 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
|
396 :type 'hook |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
397 :group 'comint) |
584 | 398 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
399 (defcustom comint-exec-hook '() |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
400 "Called each time a process is exec'd by `comint-exec'. |
584 | 401 This is called after the process is cranked up. It is useful for things that |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
402 must be done each time a process is executed in a comint mode buffer (e.g., |
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
403 `(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
|
404 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
|
405 :type 'hook |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
406 :group 'comint) |
584 | 407 |
408 (defvar comint-mode-map nil) | |
114 | 409 |
1131 | 410 (defvar comint-ptyp t |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
411 "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
|
412 This is to work around a bug in Emacs process signaling.") |
1131 | 413 |
932
a93f0b1ba909
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
925
diff
changeset
|
414 (defvar comint-input-ring nil) |
861
345296f94a1e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
415 (defvar comint-last-input-start) |
345296f94a1e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
416 (defvar comint-last-input-end) |
5424
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
417 (defvar comint-last-output-start) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
418 (defvar comint-input-ring-index nil |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
419 "Index of last matched history element.") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
420 (defvar comint-matching-input-from-input-string "" |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
421 "Input previously used to match input history.") |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
422 (defvar comint-save-input-ring-index |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
423 "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
|
424 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
|
425 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
426 (defvar comint-accum-marker nil |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
427 "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
|
428 The command \\[comint-accumulate] sets this.") |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
429 |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
430 (put 'comint-replace-by-expanded-history 'menu-enable 'comint-input-autoexpand) |
1131 | 431 (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
|
432 (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
|
433 (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
|
434 (put 'comint-input-autoexpand 'permanent-local t) |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
435 (put 'comint-input-filter-functions 'permanent-local t) |
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
436 (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
|
437 (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
|
438 (put 'comint-scroll-to-bottom-on-input 'permanent-local t) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
439 (put 'comint-scroll-to-bottom-on-output 'permanent-local t) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
440 (put 'comint-scroll-show-maximum-output 'permanent-local t) |
1131 | 441 (put 'comint-ptyp 'permanent-local t) |
861
345296f94a1e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
442 |
17652
0d08e67b280f
(comint-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17583
diff
changeset
|
443 (put 'comint-mode 'mode-class 'special) |
0d08e67b280f
(comint-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17583
diff
changeset
|
444 |
31970
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
445 (define-derived-mode comint-mode fundamental-mode "Comint" |
114 | 446 "Major mode for interacting with an inferior interpreter. |
447 Interpreter name is same as buffer name, sans the asterisks. | |
448 Return at end of buffer sends line as input. | |
449 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
|
450 Setting variable `comint-eol-on-send' means jump to the end of the line |
584 | 451 before submitting new input. |
114 | 452 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
453 This mode is customised to create major modes such as Inferior Lisp |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
454 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
|
455 `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
|
456 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
|
457 `comint-prompt-regexp' to the appropriate regular expression. |
114 | 458 |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
459 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
|
460 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
|
461 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
|
462 \\[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
|
463 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
|
464 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
|
465 |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
466 Commands with no default key bindings include `send-invisible', |
32326 | 467 `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
|
468 `comint-magic-space'. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
469 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
470 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
|
471 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
|
472 `comint-preoutput-filter-functions', `comint-scroll-to-bottom-on-input', |
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
473 and `comint-scroll-to-bottom-on-output'. |
114 | 474 |
475 If you accidentally suspend your process, use \\[comint-continue-subjob] | |
476 to continue it. | |
477 | |
478 \\{comint-mode-map} | |
479 | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
480 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
|
481 (setq mode-line-process '(":%s")) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
482 (make-local-variable 'comint-last-input-start) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
483 (setq comint-last-input-start (make-marker)) |
6998
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
484 (set-marker comint-last-input-start (point-min)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
485 (make-local-variable 'comint-last-input-end) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
486 (setq comint-last-input-end (make-marker)) |
6998
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
487 (set-marker comint-last-input-end (point-min)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
488 (make-local-variable 'comint-last-output-start) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
489 (setq comint-last-output-start (make-marker)) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
490 (make-local-variable 'comint-last-output-overlay) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
491 (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
|
492 (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
|
493 (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
|
494 (make-local-variable 'comint-input-ring) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
495 (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
|
496 (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
|
497 (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
|
498 (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
|
499 (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
|
500 (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
|
501 (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
|
502 (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
|
503 (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
|
504 (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
|
505 (make-local-variable 'comint-input-autoexpand) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
506 (make-local-variable 'comint-input-ignoredups) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
507 (make-local-variable 'comint-delimiter-argument-list) |
12208
d10ef5c093ce
(comint-mode): Use make-local-hook.
Karl Heuer <kwzh@gnu.org>
parents:
12058
diff
changeset
|
508 (make-local-hook 'comint-dynamic-complete-functions) |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
509 (make-local-variable 'comint-completion-fignore) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
510 (make-local-variable 'comint-get-old-input) |
12208
d10ef5c093ce
(comint-mode): Use make-local-hook.
Karl Heuer <kwzh@gnu.org>
parents:
12058
diff
changeset
|
511 (make-local-hook 'comint-input-filter-functions) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
512 (make-local-variable 'comint-input-filter) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
513 (make-local-variable 'comint-input-sender) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
514 (make-local-variable 'comint-eol-on-send) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
515 (make-local-variable 'comint-scroll-to-bottom-on-input) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
516 (make-local-variable 'comint-scroll-to-bottom-on-output) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
517 (make-local-variable 'comint-scroll-show-maximum-output) |
23347
49e47671810d
make pre-command-hook & comint-exec-hook local hooks.
Simon Marshall <simon@gnu.org>
parents:
23209
diff
changeset
|
518 (add-hook 'pre-command-hook 'comint-preinput-scroll-to-bottom t t) |
12208
d10ef5c093ce
(comint-mode): Use make-local-hook.
Karl Heuer <kwzh@gnu.org>
parents:
12058
diff
changeset
|
519 (make-local-hook 'comint-output-filter-functions) |
23347
49e47671810d
make pre-command-hook & comint-exec-hook local hooks.
Simon Marshall <simon@gnu.org>
parents:
23209
diff
changeset
|
520 (make-local-hook 'comint-exec-hook) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
521 (make-local-variable 'comint-ptyp) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
522 (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
|
523 (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
|
524 (make-local-variable 'comint-file-name-quote-list) |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
525 (make-local-variable 'comint-accum-marker) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
526 (setq comint-accum-marker (make-marker)) |
32892
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
527 (set-marker comint-accum-marker nil) |
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
528 ;; 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
|
529 (set (make-local-variable 'next-line-add-newlines) nil)) |
114 | 530 |
584 | 531 (if comint-mode-map |
532 nil | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
533 ;; Keys: |
584 | 534 (setq comint-mode-map (make-sparse-keymap)) |
535 (define-key comint-mode-map "\ep" 'comint-previous-input) | |
536 (define-key comint-mode-map "\en" 'comint-next-input) | |
10125
317294dfa695
(comint-mode-map): Treat C-up, C-down like M-p, M-n.
Richard M. Stallman <rms@gnu.org>
parents:
9919
diff
changeset
|
537 (define-key comint-mode-map [C-up] 'comint-previous-input) |
317294dfa695
(comint-mode-map): Treat C-up, C-down like M-p, M-n.
Richard M. Stallman <rms@gnu.org>
parents:
9919
diff
changeset
|
538 (define-key comint-mode-map [C-down] 'comint-next-input) |
2673
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
539 (define-key comint-mode-map "\er" 'comint-previous-matching-input) |
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
540 (define-key comint-mode-map "\es" 'comint-next-matching-input) |
22272
91aa269656e4
(comint-mode-map): Move bindings of
Richard M. Stallman <rms@gnu.org>
parents:
22265
diff
changeset
|
541 (define-key comint-mode-map [?\C-c ?\M-r] 'comint-previous-matching-input-from-input) |
91aa269656e4
(comint-mode-map): Move bindings of
Richard M. Stallman <rms@gnu.org>
parents:
22265
diff
changeset
|
542 (define-key comint-mode-map [?\C-c ?\M-s] 'comint-next-matching-input-from-input) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
543 (define-key comint-mode-map "\e\C-l" 'comint-show-output) |
584 | 544 (define-key comint-mode-map "\C-m" 'comint-send-input) |
545 (define-key comint-mode-map "\C-d" 'comint-delchar-or-maybe-eof) | |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
546 (define-key comint-mode-map "\C-c " 'comint-accumulate) |
22272
91aa269656e4
(comint-mode-map): Move bindings of
Richard M. Stallman <rms@gnu.org>
parents:
22265
diff
changeset
|
547 (define-key comint-mode-map "\C-c\C-x" 'comint-get-next-from-history) |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
548 (define-key comint-mode-map "\C-c\C-a" 'comint-bol-or-process-mark) |
584 | 549 (define-key comint-mode-map "\C-c\C-u" 'comint-kill-input) |
550 (define-key comint-mode-map "\C-c\C-w" 'backward-kill-word) | |
551 (define-key comint-mode-map "\C-c\C-c" 'comint-interrupt-subjob) | |
552 (define-key comint-mode-map "\C-c\C-z" 'comint-stop-subjob) | |
553 (define-key comint-mode-map "\C-c\C-\\" 'comint-quit-subjob) | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
554 (define-key comint-mode-map "\C-c\C-m" 'comint-copy-old-input) |
32613
6aece997f0f9
(comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents:
32598
diff
changeset
|
555 (define-key comint-mode-map "\C-c\C-o" 'comint-delete-output) |
584 | 556 (define-key comint-mode-map "\C-c\C-r" 'comint-show-output) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
557 (define-key comint-mode-map "\C-c\C-e" 'comint-show-maximum-output) |
7048
d4575065e6aa
(comint-mode-map): comint-dynamic-list-input-ring now on C-c C-l.
Richard M. Stallman <rms@gnu.org>
parents:
6998
diff
changeset
|
558 (define-key comint-mode-map "\C-c\C-l" 'comint-dynamic-list-input-ring) |
4112
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
559 (define-key comint-mode-map "\C-c\C-n" 'comint-next-prompt) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
560 (define-key comint-mode-map "\C-c\C-p" 'comint-previous-prompt) |
4112
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
561 (define-key comint-mode-map "\C-c\C-d" 'comint-send-eof) |
32633
dbe52563690e
(comint-mode-map): Bind `C-c C-s' to comint-write-output.
Miles Bader <miles@gnu.org>
parents:
32631
diff
changeset
|
562 (define-key comint-mode-map "\C-c\C-s" 'comint-write-output) |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
563 ;; Mouse Buttons: |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
564 (define-key comint-mode-map [mouse-2] 'comint-insert-clicked-input) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
565 ;; Menu bars: |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
566 ;; completion: |
32326 | 567 (define-key comint-mode-map [menu-bar completion] |
4899
3b157c1195a6
(comint-mode-map): Merge menu bar item Output into Input.
Richard M. Stallman <rms@gnu.org>
parents:
4890
diff
changeset
|
568 (cons "Complete" (make-sparse-keymap "Complete"))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
569 (define-key comint-mode-map [menu-bar completion complete-expand] |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
570 '("Expand File Name" . comint-replace-by-expanded-filename)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
571 (define-key comint-mode-map [menu-bar completion complete-listing] |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
572 '("File Completion Listing" . comint-dynamic-list-filename-completions)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
573 (define-key comint-mode-map [menu-bar completion complete-file] |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
574 '("Complete File Name" . comint-dynamic-complete-filename)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
575 (define-key comint-mode-map [menu-bar completion complete] |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
576 '("Complete Before Point" . comint-dynamic-complete)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
577 ;; Input history: |
32326 | 578 (define-key comint-mode-map [menu-bar inout] |
4899
3b157c1195a6
(comint-mode-map): Merge menu bar item Output into Input.
Richard M. Stallman <rms@gnu.org>
parents:
4890
diff
changeset
|
579 (cons "In/Out" (make-sparse-keymap "In/Out"))) |
32613
6aece997f0f9
(comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents:
32598
diff
changeset
|
580 (define-key comint-mode-map [menu-bar inout delete-output] |
6aece997f0f9
(comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents:
32598
diff
changeset
|
581 '("Delete Current Output Group" . comint-delete-output)) |
32892
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
582 (define-key comint-mode-map [menu-bar inout append-output-to-file] |
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
583 '("Append Current Output Group to File" . comint-append-output-to-file)) |
32631
ba88cc6434f3
(comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents:
32623
diff
changeset
|
584 (define-key comint-mode-map [menu-bar inout write-output] |
ba88cc6434f3
(comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents:
32623
diff
changeset
|
585 '("Write Current Output Group to File" . comint-write-output)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
586 (define-key comint-mode-map [menu-bar inout next-prompt] |
4899
3b157c1195a6
(comint-mode-map): Merge menu bar item Output into Input.
Richard M. Stallman <rms@gnu.org>
parents:
4890
diff
changeset
|
587 '("Forward Output Group" . comint-next-prompt)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
588 (define-key comint-mode-map [menu-bar inout previous-prompt] |
4899
3b157c1195a6
(comint-mode-map): Merge menu bar item Output into Input.
Richard M. Stallman <rms@gnu.org>
parents:
4890
diff
changeset
|
589 '("Backward Output Group" . comint-previous-prompt)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
590 (define-key comint-mode-map [menu-bar inout show-maximum-output] |
4899
3b157c1195a6
(comint-mode-map): Merge menu bar item Output into Input.
Richard M. Stallman <rms@gnu.org>
parents:
4890
diff
changeset
|
591 '("Show Maximum Output" . comint-show-maximum-output)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
592 (define-key comint-mode-map [menu-bar inout show-output] |
4899
3b157c1195a6
(comint-mode-map): Merge menu bar item Output into Input.
Richard M. Stallman <rms@gnu.org>
parents:
4890
diff
changeset
|
593 '("Show Current Output Group" . comint-show-output)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
594 (define-key comint-mode-map [menu-bar inout kill-input] |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
595 '("Kill Current Input" . comint-kill-input)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
596 (define-key comint-mode-map [menu-bar inout copy-input] |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
597 '("Copy Old Input" . comint-copy-old-input)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
598 (define-key comint-mode-map [menu-bar inout forward-matching-history] |
4899
3b157c1195a6
(comint-mode-map): Merge menu bar item Output into Input.
Richard M. Stallman <rms@gnu.org>
parents:
4890
diff
changeset
|
599 '("Forward Matching Input..." . comint-forward-matching-input)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
600 (define-key comint-mode-map [menu-bar inout backward-matching-history] |
4899
3b157c1195a6
(comint-mode-map): Merge menu bar item Output into Input.
Richard M. Stallman <rms@gnu.org>
parents:
4890
diff
changeset
|
601 '("Backward Matching Input..." . comint-backward-matching-input)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
602 (define-key comint-mode-map [menu-bar inout next-matching-history] |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
603 '("Next Matching Input..." . comint-next-matching-input)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
604 (define-key comint-mode-map [menu-bar inout previous-matching-history] |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
605 '("Previous Matching Input..." . comint-previous-matching-input)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
606 (define-key comint-mode-map [menu-bar inout next-matching-history-from-input] |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
607 '("Next Matching Current Input" . comint-next-matching-input-from-input)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
608 (define-key comint-mode-map [menu-bar inout previous-matching-history-from-input] |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
609 '("Previous Matching Current Input" . comint-previous-matching-input-from-input)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
610 (define-key comint-mode-map [menu-bar inout next-history] |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
611 '("Next Input" . comint-next-input)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
612 (define-key comint-mode-map [menu-bar inout previous-history] |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
613 '("Previous Input" . comint-previous-input)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
614 (define-key comint-mode-map [menu-bar inout list-history] |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
615 '("List Input History" . comint-dynamic-list-input-ring)) |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
616 (define-key comint-mode-map [menu-bar inout expand-history] |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
617 '("Expand History Before Point" . comint-replace-by-expanded-history)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
618 ;; Signals |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
619 (define-key comint-mode-map [menu-bar signals] |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
620 (cons "Signals" (make-sparse-keymap "Signals"))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
621 (define-key comint-mode-map [menu-bar signals eof] |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
622 '("EOF" . comint-send-eof)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
623 (define-key comint-mode-map [menu-bar signals kill] |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
624 '("KILL" . comint-kill-subjob)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
625 (define-key comint-mode-map [menu-bar signals quit] |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
626 '("QUIT" . comint-quit-subjob)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
627 (define-key comint-mode-map [menu-bar signals cont] |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
628 '("CONT" . comint-continue-subjob)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
629 (define-key comint-mode-map [menu-bar signals stop] |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
630 '("STOP" . comint-stop-subjob)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
631 (define-key comint-mode-map [menu-bar signals break] |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
632 '("BREAK" . comint-interrupt-subjob)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
633 ;; Put them in the menu bar: |
6148
ec063baec3e0
(full-copy-sparse-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
6095
diff
changeset
|
634 (setq menu-bar-final-items (append '(completion inout signals) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
635 menu-bar-final-items)) |
584 | 636 ) |
637 | |
638 (defun comint-check-proc (buffer) | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
639 "Return t 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
|
640 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
|
641 BUFFER can be either a buffer or the name of one." |
584 | 642 (let ((proc (get-buffer-process buffer))) |
9388
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
643 (and proc (memq (process-status proc) '(open run stop))))) |
114 | 644 |
14644
325bc6726a7b
(make-comint, comint-run): Fix autoload cookie.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
645 ;;;###autoload |
32942
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
646 (defun make-comint-in-buffer (name buffer program &optional startfile &rest switches) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
647 "Make a comint process NAME in BUFFER, running PROGRAM. |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
648 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
|
649 PROGRAM should be either a string denoting an executable program to create |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
650 via `start-process', or a cons pair of the form (HOST . SERVICE) denoting a TCP |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
651 connection to be opened via `open-network-stream'. If there is already a |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
652 running process in that buffer, it is not restarted. Optional third arg |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
653 STARTFILE is the name of a file to send the contents of to the process. |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
654 |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
655 If PROGRAM is a string, any more args are arguments to PROGRAM." |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
656 (or (fboundp 'start-process) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
657 (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
|
658 (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
|
659 ;; 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
|
660 ;; 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
|
661 (unless (comint-check-proc buffer) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
662 (with-current-buffer buffer |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
663 (comint-mode)) ; Install local vars, mode, keymap, ... |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
664 (comint-exec buffer name program startfile switches)) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
665 buffer) |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
666 |
395a1cdfb022
(make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32892
diff
changeset
|
667 ;;;###autoload |
114 | 668 (defun make-comint (name program &optional startfile &rest switches) |
1839
e10cdcb857d2
(make-comint): Added docstring.
Roland McGrath <roland@gnu.org>
parents:
1821
diff
changeset
|
669 "Make a comint process NAME in a buffer, running PROGRAM. |
e10cdcb857d2
(make-comint): Added docstring.
Roland McGrath <roland@gnu.org>
parents:
1821
diff
changeset
|
670 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
|
671 PROGRAM should be either a string denoting an executable program to create |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
672 via `start-process', or a cons pair of the form (HOST . SERVICE) denoting a TCP |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
673 connection to be opened via `open-network-stream'. If there is already a |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
674 running process in that buffer, it is not restarted. Optional third arg |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
675 STARTFILE is the name of a file to send the contents of to the process. |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
676 |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
677 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
|
678 (apply #'make-comint-in-buffer name nil program startfile switches)) |
114 | 679 |
14644
325bc6726a7b
(make-comint, comint-run): Fix autoload cookie.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
680 ;;;###autoload |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
681 (defun comint-run (program) |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
682 "Run PROGRAM in a comint buffer and switch to it. |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
683 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
|
684 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
|
685 hooks on this symbol are run in the buffer. |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
686 See `make-comint' and `comint-exec'." |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
687 (interactive "sRun program: ") |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
688 (let ((name (file-name-nondirectory program))) |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
689 (switch-to-buffer (make-comint name program)) |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
690 (run-hooks (intern-soft (concat "comint-" name "-hook"))))) |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
691 |
114 | 692 (defun comint-exec (buffer name command startfile switches) |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
693 "Start up a process in buffer BUFFER for comint modes. |
1839
e10cdcb857d2
(make-comint): Added docstring.
Roland McGrath <roland@gnu.org>
parents:
1821
diff
changeset
|
694 Blasts any old process running in the buffer. Doesn't set the buffer mode. |
584 | 695 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
|
696 buffer. The hook `comint-exec-hook' is run after each exec." |
114 | 697 (save-excursion |
698 (set-buffer buffer) | |
699 (let ((proc (get-buffer-process buffer))) ; Blast any old process. | |
700 (if proc (delete-process proc))) | |
701 ;; Crank up a new process | |
9388
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
702 (let ((proc |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
703 (if (consp command) |
c9b5541ec9f5
(comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents:
9245
diff
changeset
|
704 (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
|
705 (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
|
706 (set-process-filter proc 'comint-output-filter) |
584 | 707 (make-local-variable 'comint-ptyp) |
708 (setq comint-ptyp process-connection-type) ; T if pty, NIL if pipe. | |
114 | 709 ;; Jump to the end, and set the process mark. |
584 | 710 (goto-char (point-max)) |
705 | 711 (set-marker (process-mark proc) (point)) |
114 | 712 ;; Feed it the startfile. |
713 (cond (startfile | |
714 ;;This is guaranteed to wait long enough | |
715 ;;but has bad results if the comint does not prompt at all | |
716 ;; (while (= size (buffer-size)) | |
717 ;; (sleep-for 1)) | |
718 ;;I hope 1 second is enough! | |
719 (sleep-for 1) | |
720 (goto-char (point-max)) | |
721 (insert-file-contents startfile) | |
722 (setq startfile (buffer-substring (point) (point-max))) | |
723 (delete-region (point) (point-max)) | |
584 | 724 (comint-send-string proc startfile))) |
725 (run-hooks 'comint-exec-hook) | |
705 | 726 buffer))) |
114 | 727 |
14169 | 728 ;; This auxiliary function cranks up the process for comint-exec in |
729 ;; the appropriate environment. | |
114 | 730 |
731 (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
|
732 (let ((process-environment |
6750
a864110c6fc7
(comint-exec-1): Handle both termcap and terminfo.
Karl Heuer <kwzh@gnu.org>
parents:
6507
diff
changeset
|
733 (nconc |
7327 | 734 ;; If using termcap, we specify `emacs' as the terminal type |
735 ;; 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
|
736 ;; If using terminfo, we specify `dumb' because that is |
7327 | 737 ;; a defined terminal type. `emacs' is not a defined terminal type |
738 ;; and there is no way for us to define it here. | |
739 ;; Some programs that use terminfo get very confused | |
740 ;; if TERM is not a valid terminal type. | |
6750
a864110c6fc7
(comint-exec-1): Handle both termcap and terminfo.
Karl Heuer <kwzh@gnu.org>
parents:
6507
diff
changeset
|
741 (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
|
742 (list "TERM=dumb" "TERMCAP=" |
36896
76fed386fc02
(comint-exec-1): Set columns of the terminal to
Gerd Moellmann <gerd@gnu.org>
parents:
36695
diff
changeset
|
743 (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
|
744 (list "TERM=emacs" |
36896
76fed386fc02
(comint-exec-1): Set columns of the terminal to
Gerd Moellmann <gerd@gnu.org>
parents:
36695
diff
changeset
|
745 (format "TERMCAP=emacs:co#%d:tc=unknown:" (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
|
746 (if (getenv "EMACS") nil (list "EMACS=t")) |
9873
03f3cfdb6a11
(comint-exec-1): Make sure default-directory is a real dir.
Richard M. Stallman <rms@gnu.org>
parents:
9764
diff
changeset
|
747 process-environment)) |
03f3cfdb6a11
(comint-exec-1): Make sure default-directory is a real dir.
Richard M. Stallman <rms@gnu.org>
parents:
9764
diff
changeset
|
748 (default-directory |
16944
54108c7f46e6
(comint-exec-1): Use file-accessible-directory-p.
Richard M. Stallman <rms@gnu.org>
parents:
16849
diff
changeset
|
749 (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
|
750 default-directory |
22652
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
751 (char-to-string directory-sep-char))) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
752 proc decoding encoding changed) |
28064
34cb92c8c3e4
(comint-exec-1): Add the current-dir to the exec-path when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26734
diff
changeset
|
753 (let ((exec-path (if (file-name-directory command) |
34cb92c8c3e4
(comint-exec-1): Add the current-dir to the exec-path when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26734
diff
changeset
|
754 ;; 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
|
755 ;; 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
|
756 (cons default-directory exec-path) exec-path))) |
34cb92c8c3e4
(comint-exec-1): Add the current-dir to the exec-path when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26734
diff
changeset
|
757 (setq proc (apply 'start-process name buffer command switches))) |
22652
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
758 (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
|
759 (setq decoding (car coding-systems) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
760 encoding (cdr coding-systems))) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
761 ;; If start-process decided to use some coding system for decoding |
28064
34cb92c8c3e4
(comint-exec-1): Add the current-dir to the exec-path when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26734
diff
changeset
|
762 ;; data sent from the process and the coding system doesn't |
22652
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
763 ;; specify EOL conversion, we had better convert CRLF to LF. |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
764 (if (vectorp (coding-system-eol-type decoding)) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
765 (setq decoding (coding-system-change-eol-conversion decoding 'dos) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
766 changed t)) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
767 ;; Even if start-process left the coding system for encoding data |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
768 ;; 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
|
769 ;; 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
|
770 ;; conversion. |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
771 (if (and decoding (not encoding)) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
772 (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
|
773 changed t)) |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
774 (if changed |
a453ed3fb89f
(comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents:
22569
diff
changeset
|
775 (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
|
776 proc)) |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
777 |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
778 |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
779 (defun comint-insert-clicked-input (event) |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
780 "In a comint buffer, set the current input to the clicked-on previous input." |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
781 (interactive "e") |
31970
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
782 (let ((over (catch 'found |
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
783 ;; Ignore non-input overlays |
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
784 (dolist (ov (overlays-at (posn-point (event-end event)))) |
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
785 (when (eq (overlay-get ov 'field) 'input) |
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
786 (throw 'found ov)))))) |
36695
8e8c4af5a4ae
(comint-insert-clicked-input): Use the last key
Gerd Moellmann <gerd@gnu.org>
parents:
35514
diff
changeset
|
787 ;; Do we have input in this area? |
31970
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
788 (if over |
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
789 (let ((input-str (buffer-substring (overlay-start over) |
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
790 (overlay-end over)))) |
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
791 (delete-region |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
792 ;; Can't use kill-region as it sets this-command |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
793 (or (marker-position comint-accum-marker) |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
794 (process-mark (get-buffer-process (current-buffer)))) |
31970
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
795 (point)) |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
796 (insert input-str)) |
36695
8e8c4af5a4ae
(comint-insert-clicked-input): Use the last key
Gerd Moellmann <gerd@gnu.org>
parents:
35514
diff
changeset
|
797 ;; Fall back to the global definition. |
8e8c4af5a4ae
(comint-insert-clicked-input): Use the last key
Gerd Moellmann <gerd@gnu.org>
parents:
35514
diff
changeset
|
798 (let* ((keys (this-command-keys)) |
8e8c4af5a4ae
(comint-insert-clicked-input): Use the last key
Gerd Moellmann <gerd@gnu.org>
parents:
35514
diff
changeset
|
799 (last-key (and (vectorp keys) (aref keys (1- (length keys))))) |
8e8c4af5a4ae
(comint-insert-clicked-input): Use the last key
Gerd Moellmann <gerd@gnu.org>
parents:
35514
diff
changeset
|
800 (fun (and last-key (lookup-key global-map (vector last-key))))) |
31970
ebe991a7d6f9
(comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31581
diff
changeset
|
801 (if fun (call-interactively fun)))))) |
32326 | 802 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
803 |
14169 | 804 ;; Input history processing in a buffer |
805 ;; =========================================================================== | |
806 ;; 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
|
807 |
14169 | 808 ;; Eleven commands: |
809 ;; comint-dynamic-list-input-ring List history in help buffer. | |
810 ;; comint-previous-input Previous input... | |
811 ;; comint-previous-matching-input ...matching a string. | |
812 ;; comint-previous-matching-input-from-input ... matching the current input. | |
813 ;; comint-next-input Next input... | |
814 ;; comint-next-matching-input ...matching a string. | |
815 ;; comint-next-matching-input-from-input ... matching the current input. | |
816 ;; comint-backward-matching-input Backwards input... | |
817 ;; comint-forward-matching-input ...matching a string. | |
818 ;; comint-replace-by-expanded-history Expand history at point; | |
819 ;; replace with expanded history. | |
820 ;; comint-magic-space Expand history and insert space. | |
821 ;; | |
822 ;; Three functions: | |
823 ;; comint-read-input-ring Read into comint-input-ring... | |
824 ;; comint-write-input-ring Write to comint-input-ring-file-name. | |
825 ;; 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
|
826 |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
827 (defun comint-read-input-ring (&optional silent) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
828 "Sets the buffer's `comint-input-ring' from a history file. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
829 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
|
830 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
|
831 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
|
832 |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
833 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
|
834 failure to read the history file. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
835 |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
836 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
|
837 |
25443
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
838 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
|
839 `comint-input-ring-separator', and entries that match |
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
840 `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
|
841 comes last. |
25443
a4be8e9452ef
(comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25278
diff
changeset
|
842 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
843 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
|
844 (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
|
845 (equal comint-input-ring-file-name "")) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
846 nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
847 ((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
|
848 (or silent |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
849 (message "Cannot read history file %s" |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
850 comint-input-ring-file-name))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
851 (t |
28880
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
852 (let* ((history-buf (get-buffer-create " *temp*")) |
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
853 (file comint-input-ring-file-name) |
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
854 (count 0) |
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
855 (size comint-input-ring-size) |
a0115904eda4
(comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents:
28064
diff
changeset
|
856 (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
|
857 (unwind-protect |
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
858 (save-excursion |
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
859 (set-buffer history-buf) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
860 (widen) |
8032
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
861 (erase-buffer) |
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
862 (insert-file-contents file) |
936532a595dd
(comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents:
7846
diff
changeset
|
863 ;; 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
|
864 ;; 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
|
865 (goto-char (point-max)) |
32623
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
866 (let (start end history) |
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
867 (while (and (< count comint-input-ring-size) |
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
868 (re-search-backward comint-input-ring-separator nil t) |
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
869 (setq end (match-beginning 0))) |
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
870 (if (re-search-backward comint-input-ring-separator nil t) |
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
871 (setq start (match-end 0)) |
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
872 (setq start (point-min))) |
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
873 (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
|
874 (goto-char start) |
34977
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
875 (if (and (not (string-match comint-input-history-ignore history)) |
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
876 (or (null comint-input-ignoredups) |
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
877 (ring-empty-p ring) |
29a7d4d1846b
(comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34834
diff
changeset
|
878 (not (string-equal (ring-ref ring 0) history)))) |
32623
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
879 (progn |
69b2744032ce
(comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents:
32613
diff
changeset
|
880 (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
|
881 (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
|
882 (kill-buffer history-buf)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
883 (setq comint-input-ring ring |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
884 comint-input-ring-index nil))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
885 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
886 (defun comint-write-input-ring () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
887 "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
|
888 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
|
889 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
|
890 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
|
891 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
892 Useful within process sentinels. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
893 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
894 See also `comint-read-input-ring'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
895 (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
|
896 (equal comint-input-ring-file-name "") |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
897 (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
|
898 nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
899 ((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
|
900 (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
|
901 (t |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
902 (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
|
903 (ring comint-input-ring) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
904 (file comint-input-ring-file-name) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
905 (index (ring-length ring))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
906 ;; 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
|
907 ;; than writing it one line at a time. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
908 (save-excursion |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
909 (set-buffer history-buf) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
910 (erase-buffer) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
911 (while (> index 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
912 (setq index (1- index)) |
32326 | 913 (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
|
914 (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
|
915 (kill-buffer nil)))))) |
584 | 916 |
114 | 917 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
918 (defun comint-dynamic-list-input-ring () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
919 "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
|
920 (interactive) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
921 (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
|
922 (ring-empty-p comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
923 (message "No history") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
924 (let ((history nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
925 (history-buffer " *Input History*") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
926 (index (1- (ring-length comint-input-ring))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
927 (conf (current-window-configuration))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
928 ;; We have to build up a list ourselves from the ring vector. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
929 (while (>= index 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
930 (setq history (cons (ring-ref comint-input-ring index) history) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
931 index (1- index))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
932 ;; Change "completion" to "history reference" |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
933 ;; to make the display accurate. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
934 (with-output-to-temp-buffer history-buffer |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
935 (display-completion-list history) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
936 (set-buffer history-buffer) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
937 (forward-line 3) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
938 (while (search-backward "completion" nil 'move) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
939 (replace-match "history reference"))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
940 (sit-for 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
941 (message "Hit space to flush") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
942 (let ((ch (read-event))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
943 (if (eq ch ?\ ) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
944 (set-window-configuration conf) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
945 (setq unread-command-events (list ch))))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
946 |
584 | 947 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
948 (defun comint-regexp-arg (prompt) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
949 ;; 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
|
950 (let* (;; Don't clobber this. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
951 (last-command last-command) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
952 (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
|
953 'minibuffer-history-search-history))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
954 (list (if (string-equal regexp "") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
955 (setcar minibuffer-history-search-history |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
956 (nth 1 minibuffer-history-search-history)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
957 regexp) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
958 (prefix-numeric-value current-prefix-arg)))) |
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 (defun comint-search-arg (arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
961 ;; 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
|
962 (cond ((not (comint-after-pmark-p)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
963 (error "Not at command line")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
964 ((or (null comint-input-ring) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
965 (ring-empty-p comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
966 (error "Empty input ring")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
967 ((zerop arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
968 ;; 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
|
969 (setq comint-input-ring-index nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
970 1) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
971 (t |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
972 arg))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
973 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
974 (defun comint-search-start (arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
975 ;; Index to start a directional search, starting at comint-input-ring-index |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
976 (if comint-input-ring-index |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
977 ;; 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
|
978 (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
|
979 (ring-length comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
980 ;; 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
|
981 (if (>= arg 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
982 0 ; First elt for forward search |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
983 (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
|
984 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
985 (defun comint-previous-input-string (arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
986 "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
|
987 Moves relative to `comint-input-ring-index'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
988 (ring-ref comint-input-ring (if comint-input-ring-index |
32326 | 989 (mod (+ arg comint-input-ring-index) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
990 (ring-length comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
991 arg))) |
114 | 992 |
993 (defun comint-previous-input (arg) | |
994 "Cycle backwards through input history." | |
995 (interactive "*p") | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
996 (comint-previous-matching-input "." arg)) |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
997 |
114 | 998 (defun comint-next-input (arg) |
999 "Cycle forwards through input history." | |
1000 (interactive "*p") | |
1001 (comint-previous-input (- arg))) | |
1002 | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1003 (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
|
1004 "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
|
1005 Moves relative to `comint-input-ring-index'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1006 (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
|
1007 (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
|
1008 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1009 (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
|
1010 "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
|
1011 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
|
1012 (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
|
1013 (ring-empty-p comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1014 (error "No history")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1015 (let* ((len (ring-length comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1016 (motion (if (> arg 0) 1 -1)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1017 (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
|
1018 (tried-each-ring-item nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1019 (prev nil)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1020 ;; 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
|
1021 (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
|
1022 ;; Step once. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1023 (setq prev n |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1024 n (mod (+ n motion) len)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1025 ;; 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
|
1026 (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
|
1027 (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
|
1028 (setq n (mod (+ n motion) len) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1029 ;; 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
|
1030 tried-each-ring-item (= n prev))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1031 (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
|
1032 ;; 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
|
1033 (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
|
1034 n))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1035 |
2673
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1036 (defun comint-previous-matching-input (regexp arg) |
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1037 "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
|
1038 \(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
|
1039 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
|
1040 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
|
1041 (interactive (comint-regexp-arg "Previous input matching (regexp): ")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1042 (setq arg (comint-search-arg arg)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1043 (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
|
1044 ;; Has a match been found? |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1045 (if (null pos) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1046 (error "Not found") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1047 (setq comint-input-ring-index pos) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1048 (message "History item: %d" (1+ pos)) |
32326 | 1049 (delete-region |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1050 ;; Can't use kill-region as it sets this-command |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
1051 (or (marker-position comint-accum-marker) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
1052 (process-mark (get-buffer-process (current-buffer)))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
1053 (point)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1054 (insert (ring-ref comint-input-ring pos))))) |
584 | 1055 |
2673
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1056 (defun comint-next-matching-input (regexp arg) |
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1057 "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
|
1058 \(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
|
1059 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
|
1060 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
|
1061 (interactive (comint-regexp-arg "Next input matching (regexp): ")) |
2673
27dd7479b158
(comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents:
2627
diff
changeset
|
1062 (comint-previous-matching-input regexp (- arg))) |
584 | 1063 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1064 (defun comint-previous-matching-input-from-input (arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1065 "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
|
1066 \(Previous history elements are earlier commands.) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1067 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
|
1068 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
|
1069 (interactive "p") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1070 (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
|
1071 comint-next-matching-input-from-input))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1072 ;; Starting a new search |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1073 (setq comint-matching-input-from-input-string |
32326 | 1074 (buffer-substring |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
1075 (or (marker-position comint-accum-marker) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
1076 (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
|
1077 (point)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1078 comint-input-ring-index nil)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1079 (comint-previous-matching-input |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1080 (concat "^" (regexp-quote comint-matching-input-from-input-string)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1081 arg)) |
584 | 1082 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1083 (defun comint-next-matching-input-from-input (arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1084 "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
|
1085 \(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
|
1086 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
|
1087 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
|
1088 (interactive "p") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1089 (comint-previous-matching-input-from-input (- arg))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1090 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1091 |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1092 (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
|
1093 "Expand input command history references before point. |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1094 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
|
1095 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1096 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
|
1097 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
|
1098 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1099 Assumes history syntax is like typical Un*x shells'. However, since emacs |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1100 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
|
1101 it cannot expand absolute input line number references. |
584 | 1102 |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1103 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
|
1104 even if history reference seems erroneous. |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1105 |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1106 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
|
1107 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
|
1108 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
|
1109 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1110 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
|
1111 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1112 Returns t if successful." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1113 (interactive) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1114 (if (and comint-input-autoexpand |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1115 (if comint-use-prompt-regexp-instead-of-fields |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1116 ;; Use comint-prompt-regexp |
33053
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1117 (save-excursion |
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1118 (beginning-of-line) |
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1119 (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
|
1120 ;; 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
|
1121 ;; 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
|
1122 (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
|
1123 (string-match "!\\|^\\^" (field-string))))) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1124 ;; 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
|
1125 (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
|
1126 (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
|
1127 (/= previous-modified-tick (buffer-modified-tick))))) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1128 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1129 |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1130 (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
|
1131 "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
|
1132 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
|
1133 |
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1134 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
|
1135 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
|
1136 than the logical beginning of line." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1137 (save-excursion |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1138 (let ((toend (- (line-end-position) (point))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1139 (start (comint-line-beginning-position))) |
35514
e25ec5ecc3f5
(comint-replace-by-expanded-history-before-point): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
35236
diff
changeset
|
1140 (goto-char start) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1141 (while (progn |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1142 (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
|
1143 (< (point) (- (line-end-position) toend))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1144 ;; 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
|
1145 ;; !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
|
1146 ;; 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
|
1147 ;; range specifiers. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1148 ;; 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
|
1149 ;; 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
|
1150 (setq comint-input-ring-index nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1151 (cond ((or (= (preceding-char) ?\\) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1152 (comint-within-quotes start (point))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1153 ;; 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
|
1154 (goto-char (1+ (point)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1155 ((looking-at "![0-9]+\\($\\|[^-]\\)") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1156 ;; 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
|
1157 (goto-char (match-end 0)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1158 (message "Absolute reference cannot be expanded")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1159 ((looking-at "!-\\([0-9]+\\)\\(:?[0-9^$*-]+\\)?") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1160 ;; 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
|
1161 (let ((number (1- (string-to-number |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1162 (buffer-substring (match-beginning 1) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1163 (match-end 1)))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1164 (if (<= number (ring-length comint-input-ring)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1165 (progn |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1166 (replace-match |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1167 (comint-args (comint-previous-input-string number) |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1168 (match-beginning 2) (match-end 2)) |
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1169 t t) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1170 (setq comint-input-ring-index number) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1171 (message "History item: %d" (1+ number))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1172 (goto-char (match-end 0)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1173 (message "Relative reference exceeds input history size")))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1174 ((or (looking-at "!!?:?\\([0-9^$*-]+\\)") (looking-at "!!")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1175 ;; Just a number of args from the previous input line. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1176 (replace-match |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1177 (comint-args (comint-previous-input-string 0) |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1178 (match-beginning 1) (match-end 1)) |
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1179 t t) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1180 (message "History item: previous")) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1181 ((looking-at |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1182 "!\\??\\({\\(.+\\)}\\|\\(\\sw+\\)\\)\\(:?[0-9^$*-]+\\)?") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1183 ;; 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
|
1184 ;; 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
|
1185 (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
|
1186 (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
|
1187 (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
|
1188 (pref (if (save-match-data (looking-at "!\\?")) "" "^")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1189 (pos (save-match-data |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1190 (comint-previous-matching-input-string-position |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1191 (concat pref (regexp-quote exp)) 1)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1192 (if (null pos) |
6886
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1193 (progn |
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1194 (goto-char (match-end 0)) |
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1195 (or silent |
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1196 (progn (message "Not found") |
d4010211153e
(comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents:
6847
diff
changeset
|
1197 (ding)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1198 (setq comint-input-ring-index pos) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1199 (replace-match |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1200 (comint-args (ring-ref comint-input-ring pos) |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1201 (match-beginning 4) (match-end 4)) |
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1202 t t) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1203 (message "History item: %d" (1+ pos))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1204 ((looking-at "\\^\\([^^]+\\)\\^?\\([^^]*\\)\\^?") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1205 ;; Quick substitution on the previous input line. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1206 (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
|
1207 (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
|
1208 (pos nil)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1209 (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
|
1210 (setq pos (point)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1211 (goto-char (match-beginning 0)) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1212 (if (not (search-forward old pos t)) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1213 (or silent |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1214 (error "Not found")) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1215 (replace-match new t t) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1216 (message "History item: substituted")))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1217 (t |
21951
ab7fa71c0957
(comint-replace-by-expanded-history-before-point):
Richard M. Stallman <rms@gnu.org>
parents:
21714
diff
changeset
|
1218 (forward-char 1))))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1219 |
114 | 1220 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1221 (defun comint-magic-space (arg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1222 "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
|
1223 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
|
1224 (interactive "p") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1225 (comint-replace-by-expanded-history) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1226 (self-insert-command arg)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1227 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1228 (defun comint-within-quotes (beg end) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1229 "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
|
1230 Quotes are single and double." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1231 (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
|
1232 (countdq (comint-how-many-region "\\(^\\|[^\\\\]\\)\"" beg end))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1233 (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
|
1234 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1235 (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
|
1236 "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
|
1237 (let ((count 0)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1238 (save-excursion |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1239 (save-match-data |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1240 (goto-char beg) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1241 (while (re-search-forward regexp end t) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1242 (setq count (1+ count))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1243 count)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1244 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1245 (defun comint-args (string begin end) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1246 ;; 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
|
1247 ;; 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
|
1248 ;; 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
|
1249 (save-match-data |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1250 (if (null begin) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1251 (comint-arguments string 0 nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1252 (let* ((range (buffer-substring |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1253 (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
|
1254 (nth (cond ((string-match "^[*^]" range) 1) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1255 ((string-match "^-" range) 0) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1256 ((string-equal range "$") nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1257 (t (string-to-number range)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1258 (mth (cond ((string-match "[-*$]$" range) nil) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1259 ((string-match "-" range) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1260 (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
|
1261 (t nth)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1262 (comint-arguments string nth mth))))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1263 |
6154
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1264 ;; Return a list of arguments from ARG. Break it up at the |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1265 ;; delimiters in comint-delimiter-argument-list. Returned list is backwards. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1266 (defun comint-delim-arg (arg) |
6154
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1267 (if (null comint-delimiter-argument-list) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1268 (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
|
1269 (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
|
1270 (pos 0) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1271 (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
|
1272 (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
|
1273 (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
|
1274 (start pos)) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1275 (if (memq char comint-delimiter-argument-list) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1276 (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
|
1277 (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
|
1278 (while (and (< pos len) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1279 (not (memq (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
|
1280 comint-delimiter-argument-list))) |
385d5fe1c95c
(comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents:
6148
diff
changeset
|
1281 (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
|
1282 (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
|
1283 args))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1284 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1285 (defun comint-arguments (string nth mth) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1286 "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
|
1287 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
|
1288 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
|
1289 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
|
1290 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
|
1291 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
|
1292 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
|
1293 Argument 0 is the command name." |
23209
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1294 ;; 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
|
1295 ;; (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
|
1296 ;; 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
|
1297 ;; 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
|
1298 ;; 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
|
1299 ;; This seems to fit the syntax of BASH 2.0. |
32326 | 1300 (let* ((first (if (and (eq system-type 'windows-nt) |
23209
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1301 (w32-shell-dos-semantics)) |
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1302 "[^ \n\t\"'`]+\\|" |
24968
ced85898ea55
(comint-arguments): Handle \ followed by space or tab.
Karl Heuer <kwzh@gnu.org>
parents:
24893
diff
changeset
|
1303 "[^ \n\t\"'`\\]+\\|\\\\[\"'`\\ \t]+\\|")) |
23209
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1304 (argpart (concat first |
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1305 "\\(\"\\([^\"\\]\\|\\\\.\\)*\"\\|\ |
21018
edbd4156cf68
(comint-arguments): Treat \" and such as part of one arg.
Richard M. Stallman <rms@gnu.org>
parents:
20986
diff
changeset
|
1306 '[^']*'\\|\ |
23209
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1307 `[^`]*`\\)")) |
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1308 (args ()) (pos 0) |
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1309 (count 0) |
601bf7681009
(comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents:
23036
diff
changeset
|
1310 beg str value quotes) |
8616
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1311 ;; 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
|
1312 (while (and (or (null mth) (<= count mth)) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1313 (string-match argpart string pos)) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1314 (if (and beg (= pos (match-beginning 0))) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1315 ;; It's contiguous, part of the same arg. |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1316 (setq pos (match-end 0) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1317 quotes (or quotes (match-beginning 1))) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1318 ;; It's a new separate arg. |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1319 (if beg |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1320 ;; 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
|
1321 (setq str (substring string beg pos) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1322 args (if quotes (cons str args) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1323 (nconc (comint-delim-arg str) args)) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1324 count (1+ count))) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1325 (setq quotes (match-beginning 1)) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1326 (setq beg (match-beginning 0)) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1327 (setq pos (match-end 0)))) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1328 (if beg |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1329 (setq str (substring string beg pos) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1330 args (if quotes (cons str args) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1331 (nconc (comint-delim-arg str) args)) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1332 count (1+ count))) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1333 (let ((n (or nth (1- count))) |
b9a9389714e1
(comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents:
8400
diff
changeset
|
1334 (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
|
1335 (mapconcat |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1336 (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
|
1337 |
14169 | 1338 ;; |
1339 ;; Input processing stuff | |
1340 ;; | |
33138
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1341 (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
|
1342 "Add CMD to the input history. |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1343 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
|
1344 (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
|
1345 (or (null comint-input-ignoredups) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1346 (not (ring-p comint-input-ring)) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1347 (ring-empty-p comint-input-ring) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1348 (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
|
1349 cmd)))) |
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1350 (ring-insert comint-input-ring cmd))) |
584 | 1351 |
32326 | 1352 (defun comint-send-input () |
1356 | 1353 "Send input to process. |
1354 After the process output mark, sends all text from the process mark to | |
1355 point as input to the process. Before the process output mark, calls value | |
2539
577c77cfd199
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
2518
diff
changeset
|
1356 of variable `comint-get-old-input' to retrieve old input, copies it to the |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
1357 process mark, and sends it. If variable `comint-process-echoes' is nil, |
2539
577c77cfd199
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
2518
diff
changeset
|
1358 a terminal newline is also inserted into the buffer and sent to the process |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
1359 \(if it is non-nil, all text from the process mark to point is deleted, |
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
1360 since it is assumed the remote process will re-echo it). |
114 | 1361 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1362 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
|
1363 `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
|
1364 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
|
1365 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
|
1366 `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
|
1367 |
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
1368 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
|
1369 end of line before sending the input. |
114 | 1370 |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1371 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
|
1372 `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
|
1373 in the buffer. E.g., |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
1374 |
114 | 1375 If the interpreter is the csh, |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1376 comint-get-old-input is the default: either return the current |
32326 | 1377 field, or take the current line and discard any |
1378 initial string matching regexp `comint-prompt-regexp', depending | |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1379 on the value of `comint-use-prompt-regexp-instead-of-fields'. |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1380 comint-input-filter-functions monitors input for \"cd\", \"pushd\", and |
32326 | 1381 \"popd\" commands. When it sees one, it cd's the buffer. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1382 comint-input-filter is the default: returns t if the input isn't all white |
584 | 1383 space. |
114 | 1384 |
32326 | 1385 If the comint is Lucid Common Lisp, |
584 | 1386 comint-get-old-input snarfs the sexp ending at point. |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1387 comint-input-filter-functions does nothing. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1388 comint-input-filter returns nil if the input matches input-filter-regexp, |
32326 | 1389 which matches (1) all whitespace (2) :a, :c, etc. |
114 | 1390 |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1391 Similarly for Soar, Scheme, etc." |
114 | 1392 (interactive) |
1393 ;; Note that the input string does not include its terminal newline. | |
584 | 1394 (let ((proc (get-buffer-process (current-buffer)))) |
1395 (if (not proc) (error "Current buffer has no process") | |
1396 (let* ((pmark (process-mark proc)) | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1397 (intxt (if (>= (point) (marker-position pmark)) |
584 | 1398 (progn (if comint-eol-on-send (end-of-line)) |
1399 (buffer-substring pmark (point))) | |
705 | 1400 (let ((copy (funcall comint-get-old-input))) |
1401 (goto-char pmark) | |
1402 (insert copy) | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1403 copy))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1404 (input (if (not (eq comint-input-autoexpand 'input)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1405 ;; Just whatever's already there |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1406 intxt |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1407 ;; Expand and leave it visible in buffer |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1408 (comint-replace-by-expanded-history t pmark) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1409 (buffer-substring pmark (point)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1410 (history (if (not (eq comint-input-autoexpand 'history)) |
5166
7e66b092f331
(comint-send-input): Don't call comint-arguments
Richard M. Stallman <rms@gnu.org>
parents:
5152
diff
changeset
|
1411 input |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1412 ;; This is messy 'cos ultimately the original |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1413 ;; functions used do insertion, rather than return |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1414 ;; strings. We have to expand, then insert back. |
21714
9c454e5e03fa
(comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents:
21617
diff
changeset
|
1415 (comint-replace-by-expanded-history t pmark) |
17956
7af8470b665a
Use insert to preserve marker positions (pmark) and delete last.
Simon Marshall <simon@gnu.org>
parents:
17652
diff
changeset
|
1416 (let ((copy (buffer-substring pmark (point))) |
7af8470b665a
Use insert to preserve marker positions (pmark) and delete last.
Simon Marshall <simon@gnu.org>
parents:
17652
diff
changeset
|
1417 (start (point))) |
7af8470b665a
Use insert to preserve marker positions (pmark) and delete last.
Simon Marshall <simon@gnu.org>
parents:
17652
diff
changeset
|
1418 (insert input) |
7af8470b665a
Use insert to preserve marker positions (pmark) and delete last.
Simon Marshall <simon@gnu.org>
parents:
17652
diff
changeset
|
1419 (delete-region pmark start) |
5166
7e66b092f331
(comint-send-input): Don't call comint-arguments
Richard M. Stallman <rms@gnu.org>
parents:
5152
diff
changeset
|
1420 copy)))) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1421 |
32326 | 1422 (if comint-process-echoes |
1423 (delete-region pmark (point)) | |
30735
7960e7b84348
(comint-send-input): Make the newline boundary overlay rear-nonsticky.
Miles Bader <miles@gnu.org>
parents:
30731
diff
changeset
|
1424 (insert ?\n)) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1425 |
33138
1d835756e8e7
(comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
33055
diff
changeset
|
1426 (comint-add-to-input-history history) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1427 |
12208
d10ef5c093ce
(comint-mode): Use make-local-hook.
Karl Heuer <kwzh@gnu.org>
parents:
12058
diff
changeset
|
1428 (run-hook-with-args 'comint-input-filter-functions |
d10ef5c093ce
(comint-mode): Use make-local-hook.
Karl Heuer <kwzh@gnu.org>
parents:
12058
diff
changeset
|
1429 (concat input "\n")) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1430 |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
1431 (let ((beg (marker-position pmark)) |
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
1432 (end (1- (point)))) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1433 (when (not (> beg end)) ; handle a special case |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1434 ;; Make an overlay for the input field |
31260 | 1435 (let ((over (make-overlay beg end nil nil t))) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1436 (unless comint-use-prompt-regexp-instead-of-fields |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1437 ;; Give old user input a field property of `input', to |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1438 ;; distinguish it from both process output and unsent |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1439 ;; input. The terminating newline is put into a special |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1440 ;; `boundary' field to make cursor movement between input |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1441 ;; and output fields smoother. |
32852
cb10361cc039
(comint-output-filter, comint-send-input):
Miles Bader <miles@gnu.org>
parents:
32743
diff
changeset
|
1442 (overlay-put over 'field 'input)) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1443 (when comint-highlight-input |
32743
fd31939b0747
(comint-highlight-input, comint-highlight-prompt):
Miles Bader <miles@gnu.org>
parents:
32635
diff
changeset
|
1444 (overlay-put over 'face 'comint-highlight-input) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1445 (overlay-put over 'mouse-face 'highlight) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1446 (overlay-put over 'evaporate t)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1447 (unless comint-use-prompt-regexp-instead-of-fields |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1448 ;; Make an overlay for the terminating newline |
31260 | 1449 (let ((over (make-overlay end (1+ end) nil t nil))) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1450 (overlay-put over 'field 'boundary) |
30325
a7f5f8fff5b2
(comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents:
29883
diff
changeset
|
1451 (overlay-put over 'evaporate t)))) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1452 |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1453 (comint-snapshot-last-prompt) |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1454 |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
1455 (setq comint-save-input-ring-index comint-input-ring-index) |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1456 (setq comint-input-ring-index nil) |
8060
5b9bbe66631c
(comint-send-input): Update markers before actually sending the input.
Richard M. Stallman <rms@gnu.org>
parents:
8032
diff
changeset
|
1457 ;; Update the markers before we send the input |
5b9bbe66631c
(comint-send-input): Update markers before actually sending the input.
Richard M. Stallman <rms@gnu.org>
parents:
8032
diff
changeset
|
1458 ;; in case we get output amidst sending the input. |
705 | 1459 (set-marker comint-last-input-start pmark) |
1460 (set-marker comint-last-input-end (point)) | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1461 (set-marker (process-mark proc) (point)) |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
1462 ;; clear the "accumulation" marker |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
1463 (set-marker comint-accum-marker nil) |
8060
5b9bbe66631c
(comint-send-input): Update markers before actually sending the input.
Richard M. Stallman <rms@gnu.org>
parents:
8032
diff
changeset
|
1464 (funcall comint-input-sender proc input) |
16546
06f92ef2857c
(comint-output-filter): Run comint-output-filter-functions
Richard M. Stallman <rms@gnu.org>
parents:
16409
diff
changeset
|
1465 ;; This used to call comint-output-filter-functions, |
06f92ef2857c
(comint-output-filter): Run comint-output-filter-functions
Richard M. Stallman <rms@gnu.org>
parents:
16409
diff
changeset
|
1466 ;; but that scrolled the buffer in undesirable ways. |
06f92ef2857c
(comint-output-filter): Run comint-output-filter-functions
Richard M. Stallman <rms@gnu.org>
parents:
16409
diff
changeset
|
1467 (run-hook-with-args 'comint-output-filter-functions ""))))) |
114 | 1468 |
32326 | 1469 (defvar comint-preoutput-filter-functions nil |
26616
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1470 "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
|
1471 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
|
1472 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
|
1473 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
|
1474 string. |
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1475 |
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1476 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
|
1477 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
|
1478 the last function is the text that is actually inserted in the |
26627 | 1479 redirection buffer. |
26616
615e184ede1b
(comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
26553
diff
changeset
|
1480 |
26627 | 1481 This variable is permanent-local.") |
19515
a0ecbe13b54b
(comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18805
diff
changeset
|
1482 |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1483 ;; When non-nil, this is the last overlay used for output. |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1484 ;; It is kept around so that we can extend it instead of creating |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1485 ;; multiple contiguous overlays for multiple contiguous output chunks. |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1486 (defvar comint-last-output-overlay nil) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1487 |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1488 ;; 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
|
1489 ;; 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
|
1490 (defvar comint-last-prompt-overlay nil) |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1491 |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1492 ;; `snapshot' any current comint-last-prompt-overlay, freezing it in place. |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1493 ;; Any further output will then create a new comint-last-prompt-overlay. |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1494 (defun comint-snapshot-last-prompt () |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1495 (when comint-last-prompt-overlay |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1496 (overlay-put comint-last-prompt-overlay 'evaporate t) |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1497 (setq comint-last-prompt-overlay nil))) |
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1498 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1499 ;; 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
|
1500 ;; 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
|
1501 ;; when output is inserted. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1502 (defun comint-output-filter (process string) |
4939
d9ad390ef4e3
(comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents:
4928
diff
changeset
|
1503 (let ((oprocbuf (process-buffer process))) |
26174
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1504 ;; 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
|
1505 (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
|
1506 (with-current-buffer oprocbuf |
30740
46364997df9c
(comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents:
30735
diff
changeset
|
1507 ;; Run preoutput filters |
26174
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1508 (let ((functions comint-preoutput-filter-functions)) |
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1509 (while (and functions string) |
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1510 (setq string (funcall (car functions) string)) |
6860bca6e233
(comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents:
25443
diff
changeset
|
1511 (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
|
1512 |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1513 ;; Insert STRING |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1514 (let ((buffer-read-only nil) |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1515 ;; Avoid the overhead of save-excursion, since we just |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1516 ;; fiddle with the point |
30964 | 1517 (saved-point (point-marker))) |
30740
46364997df9c
(comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents:
30735
diff
changeset
|
1518 |
31038 | 1519 ;; The point should float after any insertion we do |
1520 (set-marker-insertion-type saved-point t) | |
1521 | |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1522 ;; 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
|
1523 ;; 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
|
1524 (save-restriction |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1525 (widen) |
30740
46364997df9c
(comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents:
30735
diff
changeset
|
1526 |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1527 (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
|
1528 (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
|
1529 |
31581 | 1530 ;; insert-before-markers is a bad thing. XXX |
1531 ;; | |
1532 ;; It is used here to force window-point markers (used to | |
1533 ;; store the value of point in non-selected windows) to | |
1534 ;; advance, but it also screws up any other markers that we | |
1535 ;; don't _want_ to advance, such as the start-marker of some | |
1536 ;; of the overlays we create. | |
1537 ;; | |
1538 ;; We work around the problem with the overlays by | |
1539 ;; explicitly adjusting them after we do the insertion, but | |
1540 ;; in the future this problem should be solved correctly, by | |
1541 ;; using `insert', and making the insertion-type of | |
1542 ;; window-point markers settable (via a buffer-local | |
1543 ;; variable). In comint buffers, this variable would be set | |
1544 ;; to `t', to cause point in non-select windows to advance. | |
1545 (insert-before-markers string) | |
1546 ;; Fixup markers and overlays that got screwed up because we | |
1547 ;; used `insert-before-markers'. | |
1548 (let ((old-point (- (point) (length string)))) | |
32598 | 1549 ;; comint-last-output-start |
31581 | 1550 (set-marker comint-last-output-start old-point) |
32598 | 1551 ;; comint-last-input-end |
1552 (when (and comint-last-input-end | |
1553 (equal (marker-position comint-last-input-end) | |
1554 (point))) | |
1555 (set-marker comint-last-input-end old-point)) | |
31581 | 1556 ;; No overlays we create are set to advance upon insertion |
1557 ;; (at the start/end), so we assume that any overlay which | |
1558 ;; is at the current point was incorrectly advanced by | |
1559 ;; insert-before-markers. First fixup overlays that might | |
1560 ;; start at point: | |
1561 (dolist (over (overlays-at (point))) | |
1562 (when (= (overlay-start over) (point)) | |
1563 (let ((end (overlay-end over))) | |
1564 (move-overlay over | |
1565 old-point | |
1566 (if (= end (point)) old-point end))))) | |
1567 ;; Then do overlays that might end at point: | |
1568 (dolist (over (overlays-at (1- (point)))) | |
1569 (when (= (overlay-end over) (point)) | |
1570 (move-overlay over | |
1571 (min (overlay-start over) old-point) | |
1572 old-point)))) | |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1573 |
31581 | 1574 ;; 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
|
1575 (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
|
1576 |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1577 (unless comint-use-prompt-regexp-instead-of-fields |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1578 ;; We check to see if the last overlay used for output is |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1579 ;; adjacent to the new input, and if so, just extend it. |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1580 (if (and comint-last-output-overlay |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1581 (equal (overlay-end comint-last-output-overlay) |
31038 | 1582 (marker-position comint-last-output-start))) |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1583 ;; Extend comint-last-output-overlay to include the |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1584 ;; most recent output |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1585 (move-overlay comint-last-output-overlay |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1586 (overlay-start comint-last-output-overlay) |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1587 (point)) |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1588 ;; Create a new overlay |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1589 (let ((over (make-overlay 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
|
1590 (overlay-put over 'field 'output) |
31581 | 1591 (overlay-put over 'inhibit-line-move-field-capture t) |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1592 (overlay-put over 'evaporate t) |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1593 (setq comint-last-output-overlay over)))) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1594 |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1595 (when comint-highlight-prompt |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1596 ;; Highlight the prompt, where we define `prompt' to mean |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1597 ;; the most recent output that doesn't end with a newline. |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1598 (unless (and (bolp) (null comint-last-prompt-overlay)) |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1599 ;; Need to create or move the prompt overlay (in the case |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1600 ;; where there is no prompt ((bolp) == t), we still do |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1601 ;; this if there's already an existing overlay). |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1602 (let ((prompt-start (save-excursion (forward-line 0) (point)))) |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1603 (if comint-last-prompt-overlay |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1604 ;; Just move an existing overlay |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1605 (move-overlay comint-last-prompt-overlay |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1606 prompt-start (point)) |
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1607 ;; Need to create the overlay |
32852
cb10361cc039
(comint-output-filter, comint-send-input):
Miles Bader <miles@gnu.org>
parents:
32743
diff
changeset
|
1608 (setq comint-last-prompt-overlay |
cb10361cc039
(comint-output-filter, comint-send-input):
Miles Bader <miles@gnu.org>
parents:
32743
diff
changeset
|
1609 (make-overlay prompt-start (point))) |
cb10361cc039
(comint-output-filter, comint-send-input):
Miles Bader <miles@gnu.org>
parents:
32743
diff
changeset
|
1610 (overlay-put comint-last-prompt-overlay |
cb10361cc039
(comint-output-filter, comint-send-input):
Miles Bader <miles@gnu.org>
parents:
32743
diff
changeset
|
1611 'face 'comint-highlight-prompt))))) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1612 |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1613 (goto-char saved-point) |
30740
46364997df9c
(comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents:
30735
diff
changeset
|
1614 |
30958
ec347dd209e8
(comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents:
30782
diff
changeset
|
1615 (run-hook-with-args 'comint-output-filter-functions string))))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1616 |
4890
dab300dfe449
(comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
4880
diff
changeset
|
1617 (defun comint-preinput-scroll-to-bottom () |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1618 "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
|
1619 Movement occurs if point in the selected window is not after the process mark, |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1620 and `this-command' is an insertion command. Insertion commands recognised |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1621 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
|
1622 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
|
1623 |
4890
dab300dfe449
(comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
4880
diff
changeset
|
1624 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
|
1625 (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
|
1626 (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
|
1627 hilit-yank))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1628 (let* ((selected (selected-window)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1629 (current (current-buffer)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1630 (process (get-buffer-process current)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1631 (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
|
1632 (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
|
1633 (if (eq scroll 'this) |
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
1634 (goto-char (point-max)) |
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
1635 (walk-windows |
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
1636 (function (lambda (window) |
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
1637 (if (and (eq (window-buffer window) current) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1638 (or (eq scroll t) (eq scroll 'all))) |
5122
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
1639 (progn |
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
1640 (select-window window) |
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
1641 (goto-char (point-max)) |
23f6d57ced16
(comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents:
5058
diff
changeset
|
1642 (select-window selected))))) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1643 nil t)))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1644 |
4890
dab300dfe449
(comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
4880
diff
changeset
|
1645 (defun comint-postoutput-scroll-to-bottom (string) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1646 "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
|
1647 Does not scroll if the current line is the last line in the buffer. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1648 Depends on the value of `comint-scroll-to-bottom-on-output' and |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1649 `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
|
1650 |
6187
280d4a97da69
(comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents:
6185
diff
changeset
|
1651 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
|
1652 (let* ((selected (selected-window)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1653 (current (current-buffer)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1654 (process (get-buffer-process current)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1655 (scroll comint-scroll-to-bottom-on-output)) |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1656 (unwind-protect |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1657 (if process |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1658 (walk-windows |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1659 (function (lambda (window) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1660 (if (eq (window-buffer window) current) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1661 (progn |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1662 (select-window window) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1663 (if (and (< (point) (process-mark process)) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1664 (or (eq scroll t) (eq scroll 'all) |
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
|
1665 ;; Maybe user wants point to jump to end. |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1666 (and (eq scroll 'this) (eq selected window)) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1667 (and (eq scroll 'others) (not (eq selected window))) |
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
|
1668 ;; If point was at the end, keep it at end. |
32326 | 1669 (and (marker-position comint-last-output-start) |
1670 (>= (point) comint-last-output-start)))) | |
5284
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1671 (goto-char (process-mark process))) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1672 ;; Optionally scroll so that the text |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1673 ;; ends at the bottom of the window. |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1674 (if (and comint-scroll-show-maximum-output |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1675 (>= (point) (process-mark process))) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1676 (save-excursion |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1677 (goto-char (point-max)) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1678 (recenter -1))) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1679 (select-window selected))))) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1680 nil t)) |
9c8749be37da
(comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents:
5166
diff
changeset
|
1681 (set-buffer current)))) |
2683
21ab70613c42
(comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2680
diff
changeset
|
1682 |
10833
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
1683 (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
|
1684 "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
|
1685 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
|
1686 (interactive) |
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
1687 (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
|
1688 (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
|
1689 (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
|
1690 (beginning-of-line) |
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
1691 (delete-region (point-min) (point)))) |
77d7d3990300
Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents:
10830
diff
changeset
|
1692 |
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
|
1693 (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
|
1694 "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
|
1695 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
|
1696 (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
|
1697 (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
|
1698 (save-excursion |
20458
ad0d2c5040a0
(comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents:
20020
diff
changeset
|
1699 (condition-case nil |
ad0d2c5040a0
(comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents:
20020
diff
changeset
|
1700 (goto-char |
ad0d2c5040a0
(comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents:
20020
diff
changeset
|
1701 (if (interactive-p) comint-last-input-end comint-last-output-start)) |
ad0d2c5040a0
(comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents:
20020
diff
changeset
|
1702 (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
|
1703 (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
|
1704 (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
|
1705 (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
|
1706 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1707 (defun comint-show-maximum-output () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1708 "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
|
1709 (interactive) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1710 (goto-char (point-max)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1711 (recenter -1)) |
2683
21ab70613c42
(comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2680
diff
changeset
|
1712 |
114 | 1713 (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
|
1714 "Default for `comint-get-old-input'. |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1715 Returns either the current field, or the current line with any initial |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1716 text matching `comint-prompt-regexp' stripped off, depending on the |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1717 value of `comint-use-prompt-regexp-instead-of-fields'." |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1718 (if comint-use-prompt-regexp-instead-of-fields |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1719 (save-excursion |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1720 (beginning-of-line) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1721 (comint-skip-prompt) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1722 (let ((beg (point))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1723 (end-of-line) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1724 (buffer-substring beg (point)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1725 ;; Return the contents of the field at the current point. |
33053
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1726 (let ((pos (field-beginning (point)))) |
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1727 (unless (eq (get-char-property pos 'field) 'input) |
33055
968a0ee6275f
(comint-get-old-input-default): Reword error message.
Miles Bader <miles@gnu.org>
parents:
33053
diff
changeset
|
1728 (error "Not an input field")) |
33053
eb3d446c4a6e
(comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents:
33023
diff
changeset
|
1729 (field-string pos)))) |
584 | 1730 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1731 (defun comint-copy-old-input () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1732 "Insert after prompt old input at point as new input to be edited. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1733 Calls `comint-get-old-input' to get old input." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1734 (interactive) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1735 (let ((input (funcall comint-get-old-input)) |
32326 | 1736 (process (get-buffer-process (current-buffer)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1737 (if (not process) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1738 (error "Current buffer has no process") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1739 (goto-char (process-mark process)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1740 (insert input)))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1741 |
584 | 1742 (defun comint-skip-prompt () |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
1743 "Skip past the text matching regexp `comint-prompt-regexp'. |
584 | 1744 If this takes us past the end of the current line, don't skip at all." |
1745 (let ((eol (save-excursion (end-of-line) (point)))) | |
1746 (if (and (looking-at comint-prompt-regexp) | |
1747 (<= (match-end 0) eol)) | |
1748 (goto-char (match-end 0))))) | |
1749 | |
1750 (defun comint-after-pmark-p () | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
1751 "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
|
1752 (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
|
1753 (<= (marker-position pmark) (point)))) |
584 | 1754 |
1755 (defun comint-simple-send (proc string) | |
1756 "Default function for sending to PROC input STRING. | |
1757 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
|
1758 set the hook `comint-input-sender'." |
584 | 1759 (comint-send-string proc string) |
1760 (comint-send-string proc "\n")) | |
114 | 1761 |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1762 (defun comint-line-beginning-position () |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1763 "Returns the buffer position of the beginning of the line, after any prompt. |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1764 If `comint-use-prompt-regexp-instead-of-fields' is non-nil, then the |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1765 prompt skip is done by skipping text matching the regular expression |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1766 `comint-prompt-regexp', a buffer local variable." |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1767 (if comint-use-prompt-regexp-instead-of-fields |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1768 ;; Use comint-prompt-regexp |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1769 (save-excursion |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1770 (beginning-of-line) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1771 (comint-skip-prompt) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1772 (point)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1773 ;; 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
|
1774 ;; `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
|
1775 ;; 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
|
1776 ;; 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
|
1777 ;; 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
|
1778 ;; 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
|
1779 ;; (as input fields should be). |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1780 (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
|
1781 |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1782 (defun comint-bol (&optional arg) |
114 | 1783 "Goes to the beginning of line, then skips 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
|
1784 If prefix argument is given (\\[universal-argument]) the prompt is not skipped. |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1785 If `comint-use-prompt-regexp-instead-of-fields' is non-nil, then the |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1786 prompt skip is done by skipping text matching the regular expression |
8266 | 1787 `comint-prompt-regexp', a buffer local variable." |
114 | 1788 (interactive "P") |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1789 (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
|
1790 ;; 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
|
1791 (forward-line 0) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1792 (goto-char (comint-line-beginning-position)))) |
114 | 1793 |
14169 | 1794 ;; These three functions are for entering text you don't want echoed or |
1795 ;; saved -- typically passwords to ftp, telnet, or somesuch. | |
1796 ;; Just enter m-x send-invisible and type in your line, or add | |
1797 ;; `comint-watch-for-password-prompt' to `comint-output-filter-functions'. | |
584 | 1798 |
705 | 1799 (defun comint-read-noecho (prompt &optional stars) |
32326 | 1800 "Read a single line of text from user without echoing, and return it. |
2455
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1801 Prompt with argument PROMPT, a string. Optional argument STARS causes |
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1802 input to be echoed with '*' characters on the prompt line. Input ends with |
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1803 RET, LFD, or ESC. DEL or C-h rubs out. C-u kills line. C-g aborts (if |
3386
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
1804 `inhibit-quit' is set because e.g. this function was called from a process |
bc4729d67e6e
(comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents:
3113
diff
changeset
|
1805 filter and C-g is pressed, this function returns nil rather than a string). |
2455
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1806 |
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1807 Note that the keystrokes comprising the text can still be recovered |
16409
258a28c21b74
(comint-read-noecho): Clear out the intermediate strings.
Richard M. Stallman <rms@gnu.org>
parents:
15817
diff
changeset
|
1808 \(temporarily) with \\[view-lossage]. Some people find this worrysome. |
258a28c21b74
(comint-read-noecho): Clear out the intermediate strings.
Richard M. Stallman <rms@gnu.org>
parents:
15817
diff
changeset
|
1809 Once the caller uses the password, it can erase the password |
258a28c21b74
(comint-read-noecho): Clear out the intermediate strings.
Richard M. Stallman <rms@gnu.org>
parents:
15817
diff
changeset
|
1810 by doing (fillarray STRING 0)." |
2455
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1811 (let ((ans "") |
16409
258a28c21b74
(comint-read-noecho): Clear out the intermediate strings.
Richard M. Stallman <rms@gnu.org>
parents:
15817
diff
changeset
|
1812 (newans nil) |
2455
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1813 (c 0) |
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1814 (echo-keystrokes 0) |
705 | 1815 (cursor-in-echo-area t) |
11156
31a046cedfc8
(comint-read-noecho): Don't log prompt messages.
Karl Heuer <kwzh@gnu.org>
parents:
11147
diff
changeset
|
1816 (message-log-max nil) |
31a046cedfc8
(comint-read-noecho): Don't log prompt messages.
Karl Heuer <kwzh@gnu.org>
parents:
11147
diff
changeset
|
1817 (done nil)) |
2455
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1818 (while (not done) |
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1819 (if stars |
11147
8c896f45f888
(comint-read-noecho): Use a format string, in case
Karl Heuer <kwzh@gnu.org>
parents:
10833
diff
changeset
|
1820 (message "%s%s" prompt (make-string (length ans) ?*)) |
8c896f45f888
(comint-read-noecho): Use a format string, in case
Karl Heuer <kwzh@gnu.org>
parents:
10833
diff
changeset
|
1821 (message "%s" prompt)) |
9764
077430ee7179
(comint-read-noecho): Use `read-char-exclusive' instead of `read-char'.
Richard M. Stallman <rms@gnu.org>
parents:
9388
diff
changeset
|
1822 ;; Use this instead of `read-char' to avoid "Non-character input-event". |
077430ee7179
(comint-read-noecho): Use `read-char-exclusive' instead of `read-char'.
Richard M. Stallman <rms@gnu.org>
parents:
9388
diff
changeset
|
1823 (setq c (read-char-exclusive)) |
2455
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1824 (cond ((= c ?\C-g) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1825 ;; This function may get called from a process filter, where |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1826 ;; inhibit-quit is set. In later versions of emacs read-char |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1827 ;; may clear quit-flag itself and return C-g. That would make |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1828 ;; it impossible to quit this loop in a simple way, so |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1829 ;; re-enable it here (for backward-compatibility the check for |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1830 ;; quit-flag below would still be necessary, so this seems |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1831 ;; like the simplest way to do things). |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1832 (setq quit-flag t |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1833 done t)) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1834 ((or (= c ?\r) (= c ?\n) (= c ?\e)) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1835 (setq done t)) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1836 ((= c ?\C-u) |
16409
258a28c21b74
(comint-read-noecho): Clear out the intermediate strings.
Richard M. Stallman <rms@gnu.org>
parents:
15817
diff
changeset
|
1837 (fillarray ans 0) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1838 (setq ans "")) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1839 ((and (/= c ?\b) (/= c ?\177)) |
16409
258a28c21b74
(comint-read-noecho): Clear out the intermediate strings.
Richard M. Stallman <rms@gnu.org>
parents:
15817
diff
changeset
|
1840 (setq newans (concat ans (char-to-string c))) |
258a28c21b74
(comint-read-noecho): Clear out the intermediate strings.
Richard M. Stallman <rms@gnu.org>
parents:
15817
diff
changeset
|
1841 (fillarray ans 0) |
258a28c21b74
(comint-read-noecho): Clear out the intermediate strings.
Richard M. Stallman <rms@gnu.org>
parents:
15817
diff
changeset
|
1842 (setq ans newans)) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1843 ((> (length ans) 0) |
16409
258a28c21b74
(comint-read-noecho): Clear out the intermediate strings.
Richard M. Stallman <rms@gnu.org>
parents:
15817
diff
changeset
|
1844 (aset ans (1- (length ans)) 0) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
1845 (setq ans (substring ans 0 -1))))) |
2455
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1846 (if quit-flag |
32326 | 1847 ;; Emulate a true quit, except that we have to return a value. |
1848 (prog1 | |
1849 (setq quit-flag nil) | |
1850 (message "Quit") | |
1851 (beep t)) | |
2455
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1852 (message "") |
27d28402ee59
new comint-read-noecho.
Noah Friedman <friedman@splode.com>
parents:
2307
diff
changeset
|
1853 ans))) |
705 | 1854 |
114 | 1855 (defun send-invisible (str) |
1356 | 1856 "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
|
1857 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
|
1858 The string is sent using `comint-input-sender'. |
584 | 1859 Security bug: your string can still be temporarily recovered with |
1860 \\[view-lossage]." | |
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
|
1861 (interactive "P") ; Defeat snooping via C-x ESC ESC |
114 | 1862 (let ((proc (get-buffer-process (current-buffer)))) |
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
|
1863 (cond ((not proc) |
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
|
1864 (error "Current buffer has no process")) |
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
|
1865 ((stringp str) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
1866 (comint-snapshot-last-prompt) |
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
|
1867 (funcall comint-input-sender proc str)) |
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
|
1868 (t |
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
|
1869 (let ((str (comint-read-noecho "Non-echoed text: " t))) |
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
|
1870 (if (stringp str) |
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
|
1871 (send-invisible str) |
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
|
1872 (message "Warning: text will be echoed"))))))) |
114 | 1873 |
32326 | 1874 (defun comint-watch-for-password-prompt (string) |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
1875 "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
|
1876 This function uses `send-invisible' to read and send a password to the buffer's |
32326 | 1877 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
|
1878 `comint-password-prompt-regexp'. |
6507
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
1879 |
ff41e0e932b8
(comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents:
6256
diff
changeset
|
1880 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
|
1881 (when (string-match comint-password-prompt-regexp string) |
219a95f2ef05
(comint-watch-for-password-prompt): Use STRING as a prompt.
Miles Bader <miles@gnu.org>
parents:
31970
diff
changeset
|
1882 (let ((pw (comint-read-noecho string t))) |
219a95f2ef05
(comint-watch-for-password-prompt): Use STRING as a prompt.
Miles Bader <miles@gnu.org>
parents:
31970
diff
changeset
|
1883 (send-invisible pw)))) |
114 | 1884 |
14169 | 1885 ;; Low-level process communication |
114 | 1886 |
30766
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
1887 (defun comint-send-string (process string) |
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
1888 "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
|
1889 (if process |
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
1890 (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
|
1891 (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
|
1892 (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
|
1893 (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
|
1894 (comint-snapshot-last-prompt)) |
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
1895 (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
|
1896 |
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
1897 (defun comint-send-region (process start end) |
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
1898 "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
|
1899 (if process |
52fc3d972e9c
(comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents:
33182
diff
changeset
|
1900 (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
|
1901 (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
|
1902 (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
|
1903 (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
|
1904 (comint-snapshot-last-prompt)) |
dacf4830a9a0
(comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents:
30740
diff
changeset
|
1905 (process-send-region process start end)) |
114 | 1906 |
14169 | 1907 ;; Random input hackage |
114 | 1908 |
32613
6aece997f0f9
(comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents:
32598
diff
changeset
|
1909 (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
|
1910 "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
|
1911 Does not delete the prompt." |
114 | 1912 (interactive) |
6998
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
1913 (let ((proc (get-buffer-process (current-buffer))) |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
1914 (replacement nil)) |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
1915 (save-excursion |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
1916 (let ((pmark (progn (goto-char (process-mark proc)) |
32598 | 1917 (forward-line 0) |
6998
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
1918 (point-marker)))) |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
1919 (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
|
1920 (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
|
1921 (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
|
1922 (buffer-substring pmark (point)))) |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
1923 (delete-region pmark (point)))) |
40163ff9fc7c
(comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents:
6958
diff
changeset
|
1924 ;; 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
|
1925 (comint-output-filter proc replacement))) |
32613
6aece997f0f9
(comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents:
32598
diff
changeset
|
1926 (defalias 'comint-kill-output 'comint-delete-output) |
6aece997f0f9
(comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents:
32598
diff
changeset
|
1927 (make-obsolete 'comint-kill-output 'comint-delete-output "21.1") |
114 | 1928 |
32635
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
1929 (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
|
1930 "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
|
1931 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
|
1932 |
32635
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
1933 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
|
1934 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
|
1935 |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
1936 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
|
1937 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
|
1938 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
|
1939 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
|
1940 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
|
1941 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
|
1942 otherwise." |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
1943 (interactive |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
1944 (list (read-file-name |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
1945 (if current-prefix-arg |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
1946 "Append output to file: " |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
1947 "Write output to file: ")) |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
1948 current-prefix-arg |
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
1949 (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
|
1950 (save-excursion |
ba88cc6434f3
(comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents:
32623
diff
changeset
|
1951 (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
|
1952 (forward-line 0) |
32635
9a3072529aa5
(comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents:
32633
diff
changeset
|
1953 (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
|
1954 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
|
1955 |
32892
25182c4fd302
(comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents:
32852
diff
changeset
|
1956 ;; 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
|
1957 ;; 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
|
1958 (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
|
1959 "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
|
1960 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
|
1961 (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
|
1962 (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
|
1963 |
114 | 1964 (defun comint-show-output () |
584 | 1965 "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
|
1966 Sets mark to the value of point when this command is run." |
114 | 1967 (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
|
1968 (push-mark) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1969 (let ((pos (or (marker-position comint-last-input-end) (point-max)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1970 (cond (comint-use-prompt-regexp-instead-of-fields |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1971 (goto-char pos) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1972 (beginning-of-line 0) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1973 (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
|
1974 (comint-skip-prompt)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1975 (t |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1976 (goto-char (field-beginning pos)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
1977 (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
|
1978 |
114 | 1979 |
1980 (defun comint-interrupt-subjob () | |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
1981 "Interrupt the current subjob. |
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
1982 This command also kills the pending input |
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
1983 between the process-mark and point." |
114 | 1984 (interactive) |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
1985 (comint-kill-input) |
584 | 1986 (interrupt-process nil comint-ptyp)) |
114 | 1987 |
1988 (defun comint-kill-subjob () | |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
1989 "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
|
1990 This command also kills the pending input |
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
1991 between the process-mark and point." |
114 | 1992 (interactive) |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
1993 (comint-kill-input) |
584 | 1994 (kill-process nil comint-ptyp)) |
114 | 1995 |
1996 (defun comint-quit-subjob () | |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
1997 "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
|
1998 This command also kills the pending input |
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
1999 between the process-mark and point." |
114 | 2000 (interactive) |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2001 (comint-kill-input) |
584 | 2002 (quit-process nil comint-ptyp)) |
114 | 2003 |
2004 (defun comint-stop-subjob () | |
584 | 2005 "Stop the current subjob. |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2006 This command also kills the pending input |
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2007 between the process-mark and point. |
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2008 |
114 | 2009 WARNING: if there is no current subjob, you can end up suspending |
584 | 2010 the top-level process running in the buffer. If you accidentally do |
2011 this, use \\[comint-continue-subjob] to resume the process. (This | |
2012 is not a problem with most shells, since they ignore this signal.)" | |
114 | 2013 (interactive) |
20894
962d8c41cfa2
(comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents:
20458
diff
changeset
|
2014 (comint-kill-input) |
584 | 2015 (stop-process nil comint-ptyp)) |
114 | 2016 |
2017 (defun comint-continue-subjob () | |
584 | 2018 "Send CONT signal to process buffer's process group. |
114 | 2019 Useful if you accidentally suspend the top-level process." |
2020 (interactive) | |
584 | 2021 (continue-process nil comint-ptyp)) |
114 | 2022 |
2023 (defun comint-kill-input () | |
584 | 2024 "Kill all text from last stuff output by interpreter to point." |
114 | 2025 (interactive) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2026 (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
|
2027 (if (> (point) (marker-position pmark)) |
584 | 2028 (kill-region pmark (point))))) |
114 | 2029 |
2030 (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
|
2031 "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
|
2032 Sends an EOF only if point is at the end of the buffer and there is no input." |
114 | 2033 (interactive "p") |
17269
b177ee3c4f0e
(comint-delchar-or-maybe-eof): Check for null proc.
Karl Heuer <kwzh@gnu.org>
parents:
17159
diff
changeset
|
2034 (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
|
2035 (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
|
2036 (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
|
2037 (delete-char arg)))) |
584 | 2038 |
4112
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2039 (defun comint-send-eof () |
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2040 "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
|
2041 (interactive) |
30731
4ce2b3d23348
(comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents:
30694
diff
changeset
|
2042 (comint-snapshot-last-prompt) |
4112
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2043 (process-send-eof)) |
584 | 2044 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2045 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2046 (defun comint-backward-matching-input (regexp arg) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2047 "Search backward through buffer for input fields that match REGEXP. |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2048 If `comint-use-prompt-regexp-instead-of-fields' is non-nil, then input |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2049 fields are identified by lines that match `comint-prompt-regexp'. |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2050 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2051 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
|
2052 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
|
2053 (interactive (comint-regexp-arg "Backward input matching (regexp): ")) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2054 (if comint-use-prompt-regexp-instead-of-fields |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2055 ;; Use comint-prompt-regexp |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2056 (let* ((re (concat comint-prompt-regexp ".*" regexp)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2057 (pos (save-excursion (end-of-line (if (> arg 0) 0 1)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2058 (if (re-search-backward re nil t arg) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2059 (point))))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2060 (if (null pos) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2061 (progn (message "Not found") |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2062 (ding)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2063 (goto-char pos) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2064 (comint-bol nil))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2065 ;; Use input fields |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2066 (let* ((dir (if (< arg 0) -1 1)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2067 (pos |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2068 (save-excursion |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2069 (while (/= arg 0) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2070 (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
|
2071 (error "Not found")) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2072 (when (eq (get-char-property (point) 'field) 'input) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2073 (setq arg (- arg dir)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2074 (field-beginning)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2075 (goto-char pos)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2076 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2077 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2078 (defun comint-forward-matching-input (regexp arg) |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2079 "Search forward through buffer for input fields that match REGEXP. |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2080 If `comint-use-prompt-regexp-instead-of-fields' is non-nil, then input |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2081 fields are identified by lines that match `comint-prompt-regexp'. |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2082 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2083 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
|
2084 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
|
2085 (interactive (comint-regexp-arg "Forward input matching (regexp): ")) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2086 (comint-backward-matching-input regexp (- arg))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2087 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2088 |
4112
ab7dee78e335
(comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents:
3985
diff
changeset
|
2089 (defun comint-next-prompt (n) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2090 "Move to end of Nth next prompt in the buffer. |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2091 If `comint-use-prompt-regexp-instead-of-fields' is nil, then this means |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2092 the beginning of the Nth next `input' field, otherwise, it means the Nth |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2093 occurance of 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
|
2094 (interactive "p") |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2095 (if comint-use-prompt-regexp-instead-of-fields |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2096 ;; Use comint-prompt-regexp |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2097 (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
|
2098 (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
|
2099 (forward-paragraph n) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2100 (comint-skip-prompt)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2101 ;; Use input fields |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2102 (let ((pos (point)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2103 (input-pos nil)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2104 (while (/= n 0) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2105 (setq pos |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2106 (if (> n 0) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2107 (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
|
2108 (previous-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
|
2109 (cond ((null pos) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2110 ;; Ran off the end of the buffer. |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2111 (setq n 0)) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2112 ((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
|
2113 (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
|
2114 (setq input-pos pos)))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2115 (when input-pos |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2116 (goto-char input-pos))))) |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2117 |
584 | 2118 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2119 (defun comint-previous-prompt (n) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2120 "Move to end of Nth previous prompt in the buffer. |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2121 If `comint-use-prompt-regexp-instead-of-fields' is nil, then this means |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2122 the beginning of the Nth previous `input' field, otherwise, it means the Nth |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2123 occurance of 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
|
2124 (interactive "p") |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2125 (comint-next-prompt (- n))) |
114 | 2126 |
14169 | 2127 ;; Support for source-file processing commands. |
2128 ;;============================================================================ | |
2129 ;; Many command-interpreters (e.g., Lisp, Scheme, Soar) have | |
2130 ;; commands that process files of source text (e.g. loading or compiling | |
2131 ;; files). So the corresponding process-in-a-buffer modes have commands | |
2132 ;; for doing this (e.g., lisp-load-file). The functions below are useful | |
2133 ;; for defining these commands. | |
2134 ;; | |
2135 ;; Alas, these guys don't do exactly the right thing for Lisp, Scheme | |
2136 ;; and Soar, in that they don't know anything about file extensions. | |
2137 ;; So the compile/load interface gets the wrong default occasionally. | |
2138 ;; The load-file/compile-file default mechanism could be smarter -- it | |
2139 ;; doesn't know about the relationship between filename extensions and | |
2140 ;; whether the file is source or executable. If you compile foo.lisp | |
2141 ;; with compile-file, then the next load-file should use foo.bin for | |
2142 ;; the default, not foo.lisp. This is tricky to do right, particularly | |
2143 ;; because the extension for executable files varies so much (.o, .bin, | |
2144 ;; .lbin, .mo, .vo, .ao, ...). | |
114 | 2145 |
2146 | |
14169 | 2147 ;; COMINT-SOURCE-DEFAULT -- determines defaults for source-file processing |
2148 ;; commands. | |
2149 ;; | |
2150 ;; COMINT-CHECK-SOURCE -- if FNAME is in a modified buffer, asks you if you | |
2151 ;; want to save the buffer before issuing any process requests to the command | |
2152 ;; interpreter. | |
2153 ;; | |
2154 ;; COMINT-GET-SOURCE -- used by the source-file processing commands to prompt | |
2155 ;; for the file to process. | |
114 | 2156 |
14169 | 2157 ;; (COMINT-SOURCE-DEFAULT previous-dir/file source-modes) |
2158 ;;============================================================================ | |
2159 ;; This function computes the defaults for the load-file and compile-file | |
32326 | 2160 ;; commands for tea, soar, cmulisp, and cmuscheme modes. |
2161 ;; | |
2162 ;; - PREVIOUS-DIR/FILE is a pair (directory . filename) from the last | |
14169 | 2163 ;; source-file processing command. NIL if there hasn't been one yet. |
2164 ;; - SOURCE-MODES is a list used to determine what buffers contain source | |
2165 ;; files: if the major mode of the buffer is in SOURCE-MODES, it's source. | |
2166 ;; Typically, (lisp-mode) or (scheme-mode). | |
32326 | 2167 ;; |
14169 | 2168 ;; If the command is given while the cursor is inside a string, *and* |
2169 ;; the string is an existing filename, *and* the filename is not a directory, | |
2170 ;; then the string is taken as default. This allows you to just position | |
2171 ;; your cursor over a string that's a filename and have it taken as default. | |
2172 ;; | |
2173 ;; If the command is given in a file buffer whose major mode is in | |
2174 ;; SOURCE-MODES, then the the filename is the default file, and the | |
2175 ;; file's directory is the default directory. | |
32326 | 2176 ;; |
14169 | 2177 ;; If the buffer isn't a source file buffer (e.g., it's the process buffer), |
2178 ;; then the default directory & file are what was used in the last source-file | |
2179 ;; processing command (i.e., PREVIOUS-DIR/FILE). If this is the first time | |
2180 ;; the command has been run (PREVIOUS-DIR/FILE is nil), the default directory | |
2181 ;; is the cwd, with no default file. (\"no default file\" = nil) | |
32326 | 2182 ;; |
14169 | 2183 ;; SOURCE-REGEXP is typically going to be something like (tea-mode) |
2184 ;; for T programs, (lisp-mode) for Lisp programs, (soar-mode lisp-mode) | |
2185 ;; for Soar programs, etc. | |
32326 | 2186 ;; |
14169 | 2187 ;; The function returns a pair: (default-directory . default-file). |
114 | 2188 |
2189 (defun comint-source-default (previous-dir/file source-modes) | |
2190 (cond ((and buffer-file-name (memq major-mode source-modes)) | |
2191 (cons (file-name-directory buffer-file-name) | |
2192 (file-name-nondirectory buffer-file-name))) | |
2193 (previous-dir/file) | |
2194 (t | |
2195 (cons default-directory nil)))) | |
2196 | |
584 | 2197 |
14169 | 2198 ;; (COMINT-CHECK-SOURCE fname) |
2199 ;;============================================================================ | |
2200 ;; Prior to loading or compiling (or otherwise processing) a file (in the CMU | |
2201 ;; process-in-a-buffer modes), this function can be called on the filename. | |
2202 ;; If the file is loaded into a buffer, and the buffer is modified, the user | |
2203 ;; is queried to see if he wants to save the buffer before proceeding with | |
2204 ;; the load or compile. | |
114 | 2205 |
2206 (defun comint-check-source (fname) | |
2207 (let ((buff (get-file-buffer fname))) | |
2208 (if (and buff | |
2209 (buffer-modified-p buff) | |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2210 (y-or-n-p (format "Save buffer %s first? " (buffer-name buff)))) |
114 | 2211 ;; save BUFF. |
2212 (let ((old-buffer (current-buffer))) | |
2213 (set-buffer buff) | |
2214 (save-buffer) | |
2215 (set-buffer old-buffer))))) | |
2216 | |
584 | 2217 |
14169 | 2218 ;; (COMINT-GET-SOURCE prompt prev-dir/file source-modes mustmatch-p) |
2219 ;;============================================================================ | |
2220 ;; COMINT-GET-SOURCE is used to prompt for filenames in command-interpreter | |
2221 ;; commands that process source files (like loading or compiling a file). | |
2222 ;; It prompts for the filename, provides a default, if there is one, | |
2223 ;; and returns the result filename. | |
32326 | 2224 ;; |
14169 | 2225 ;; See COMINT-SOURCE-DEFAULT for more on determining defaults. |
32326 | 2226 ;; |
14169 | 2227 ;; PROMPT is the prompt string. PREV-DIR/FILE is the (directory . file) pair |
2228 ;; from the last source processing command. SOURCE-MODES is a list of major | |
2229 ;; modes used to determine what file buffers contain source files. (These | |
2230 ;; two arguments are used for determining defaults). If MUSTMATCH-P is true, | |
2231 ;; then the filename reader will only accept a file that exists. | |
32326 | 2232 ;; |
14169 | 2233 ;; A typical use: |
2234 ;; (interactive (comint-get-source "Compile file: " prev-lisp-dir/file | |
2235 ;; '(lisp-mode) t)) | |
114 | 2236 |
14169 | 2237 ;; This is pretty stupid about strings. It decides we're in a string |
2238 ;; if there's a quote on both sides of point on the current line. | |
114 | 2239 (defun comint-extract-string () |
32326 | 2240 "Return string around POINT that starts the current line, or nil." |
114 | 2241 (save-excursion |
2242 (let* ((point (point)) | |
2243 (bol (progn (beginning-of-line) (point))) | |
2244 (eol (progn (end-of-line) (point))) | |
32326 | 2245 (start (progn (goto-char point) |
2246 (and (search-backward "\"" bol t) | |
114 | 2247 (1+ (point))))) |
2248 (end (progn (goto-char point) | |
2249 (and (search-forward "\"" eol t) | |
2250 (1- (point)))))) | |
2251 (and start end | |
2252 (buffer-substring start end))))) | |
2253 | |
2254 (defun comint-get-source (prompt prev-dir/file source-modes mustmatch-p) | |
2255 (let* ((def (comint-source-default prev-dir/file source-modes)) | |
32326 | 2256 (stringfile (comint-extract-string)) |
114 | 2257 (sfile-p (and stringfile |
584 | 2258 (condition-case () |
2259 (file-exists-p stringfile) | |
2260 (error nil)) | |
114 | 2261 (not (file-directory-p stringfile)))) |
2262 (defdir (if sfile-p (file-name-directory stringfile) | |
32326 | 2263 (car def))) |
114 | 2264 (deffile (if sfile-p (file-name-nondirectory stringfile) |
32326 | 2265 (cdr def))) |
114 | 2266 (ans (read-file-name (if deffile (format "%s(default %s) " |
2267 prompt deffile) | |
2268 prompt) | |
2269 defdir | |
2270 (concat defdir deffile) | |
2271 mustmatch-p))) | |
2272 (list (expand-file-name (substitute-in-file-name ans))))) | |
2273 | |
14169 | 2274 ;; I am somewhat divided on this string-default feature. It seems |
2275 ;; to violate the principle-of-least-astonishment, in that it makes | |
2276 ;; the default harder to predict, so you actually have to look and see | |
2277 ;; what the default really is before choosing it. This can trip you up. | |
2278 ;; On the other hand, it can be useful, I guess. I would appreciate feedback | |
2279 ;; on this. | |
2280 ;; -Olin | |
584 | 2281 |
114 | 2282 |
14169 | 2283 ;; Simple process query facility. |
2284 ;; =========================================================================== | |
2285 ;; This function is for commands that want to send a query to the process | |
2286 ;; and show the response to the user. For example, a command to get the | |
2287 ;; arglist for a Common Lisp function might send a "(arglist 'foo)" query | |
2288 ;; to an inferior Common Lisp process. | |
32326 | 2289 ;; |
14169 | 2290 ;; This simple facility just sends strings to the inferior process and pops |
2291 ;; up a window for the process buffer so you can see what the process | |
2292 ;; responds with. We don't do anything fancy like try to intercept what the | |
2293 ;; process responds with and put it in a pop-up window or on the message | |
2294 ;; line. We just display the buffer. Low tech. Simple. Works good. | |
114 | 2295 |
14169 | 2296 ;; Send to the inferior process PROC the string STR. Pop-up but do not select |
2297 ;; a window for the inferior process so that its response can be seen. | |
114 | 2298 (defun comint-proc-query (proc str) |
2299 (let* ((proc-buf (process-buffer proc)) | |
2300 (proc-mark (process-mark proc))) | |
2301 (display-buffer proc-buf) | |
2302 (set-buffer proc-buf) ; but it's not the selected *window* | |
2303 (let ((proc-win (get-buffer-window proc-buf)) | |
2304 (proc-pt (marker-position proc-mark))) | |
2305 (comint-send-string proc str) ; send the query | |
2306 (accept-process-output proc) ; wait for some output | |
2307 ;; Try to position the proc window so you can see the answer. | |
2308 ;; This is bogus code. If you delete the (sit-for 0), it breaks. | |
2309 ;; 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
|
2310 (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
|
2311 (let ((opoint (window-point proc-win))) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2312 (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
|
2313 (sit-for 0) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2314 (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
|
2315 (push-mark opoint) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2316 (set-window-point proc-win opoint))))))) |
114 | 2317 |
2318 | |
14169 | 2319 ;; Filename/command/history completion in a buffer |
2320 ;; =========================================================================== | |
2321 ;; Useful completion functions, courtesy of the Ergo group. | |
114 | 2322 |
14169 | 2323 ;; Six commands: |
2324 ;; comint-dynamic-complete Complete or expand command, filename, | |
2325 ;; history at point. | |
2326 ;; comint-dynamic-complete-filename Complete filename at point. | |
2327 ;; comint-dynamic-list-filename-completions List completions in help buffer. | |
2328 ;; comint-replace-by-expanded-filename Expand and complete filename at point; | |
2329 ;; replace with expanded/completed name. | |
2330 ;; 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
|
2331 |
14169 | 2332 ;; These are not installed in the comint-mode keymap. But they are |
2333 ;; available for people who want them. Shell-mode installs them: | |
2334 ;; (define-key shell-mode-map "\t" 'comint-dynamic-complete) | |
2335 ;; (define-key shell-mode-map "\M-?" | |
2336 ;; 'comint-dynamic-list-filename-completions))) | |
2337 ;; | |
2338 ;; Commands like this are fine things to put in load hooks if you | |
2339 ;; want them present in specific modes. | |
584 | 2340 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2341 (defcustom comint-completion-autolist nil |
13971
49207f2e2130
(comint-ptyp, comint-completion-autolist): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
13702
diff
changeset
|
2342 "*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
|
2343 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
|
2344 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2345 :group 'comint-completion) |
114 | 2346 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2347 (defcustom comint-completion-addsuffix t |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2348 "*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
|
2349 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
|
2350 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
|
2351 This mirrors the optional behavior of tcsh." |
33166
61e62bc5bd7f
(comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents:
33138
diff
changeset
|
2352 :type '(choice (const :tag "None" nil) |
33167 | 2353 (const :tag "Add /" t) |
33166
61e62bc5bd7f
(comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents:
33138
diff
changeset
|
2354 (cons :tag "Suffix pair" |
61e62bc5bd7f
(comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents:
33138
diff
changeset
|
2355 (string :tag "Directory suffix") |
61e62bc5bd7f
(comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents:
33138
diff
changeset
|
2356 (string :tag "File suffix"))) |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2357 :group 'comint-completion) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2358 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2359 (defcustom comint-completion-recexact nil |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2360 "*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
|
2361 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
|
2362 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2363 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
|
2364 :type 'boolean |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2365 :group 'comint-completion) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2366 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2367 (defcustom comint-completion-fignore nil |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
2368 "*List of suffixes to be disregarded during file completion. |
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
2369 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
|
2370 |
17428
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2371 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
|
2372 :type '(repeat (string :tag "Suffix")) |
653c0e2e1b31
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17269
diff
changeset
|
2373 :group 'comint-completion) |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
2374 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2375 (defvar comint-file-name-prefix "" |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2376 "Prefix prepended to absolute file names taken from process input. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2377 This is used by comint's and shell's completion functions, and by shell's |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2378 directory tracking functions.") |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2379 |
15817
9e94b5fdaab1
(comint-file-name-chars): Was comint-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
15727
diff
changeset
|
2380 (defvar comint-file-name-chars |
21617
c944e3c8ebe2
(comint-filename-chars): Combine DOS and Windows strings.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21243
diff
changeset
|
2381 (if (memq system-type '(ms-dos windows-nt)) |
c944e3c8ebe2
(comint-filename-chars): Combine DOS and Windows strings.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21243
diff
changeset
|
2382 "~/A-Za-z0-9_^$!#%&{}@`'.,:()-" |
c944e3c8ebe2
(comint-filename-chars): Combine DOS and Windows strings.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21243
diff
changeset
|
2383 "~/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
|
2384 "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
|
2385 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
|
2386 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
|
2387 |
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
|
2388 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
|
2389 |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2390 (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
|
2391 "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
|
2392 |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2393 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
|
2394 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2395 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2396 (defun comint-directory (directory) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2397 ;; Return expanded DIRECTORY, with `comint-file-name-prefix' if absolute. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2398 (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
|
2399 (concat comint-file-name-prefix directory) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2400 directory))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2401 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2402 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2403 (defun comint-word (word-chars) |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2404 "Return the word of WORD-CHARS at point, or nil if non is found. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2405 Word constituents are considered to be those in WORD-CHARS, which is like the |
19842
5797c2cbac2a
(comint-file-name-chars): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19678
diff
changeset
|
2406 inside of a \"[...]\" (see `skip-chars-forward'), |
5797c2cbac2a
(comint-file-name-chars): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19678
diff
changeset
|
2407 plus all non-ASCII characters." |
584 | 2408 (save-excursion |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2409 (let ((non-word-chars (concat "[^\\\\" word-chars "]")) (here (point))) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2410 (while (and (re-search-backward non-word-chars nil 'move) |
19842
5797c2cbac2a
(comint-file-name-chars): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19678
diff
changeset
|
2411 ;;(memq (char-after (point)) shell-file-name-quote-list) |
5797c2cbac2a
(comint-file-name-chars): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19678
diff
changeset
|
2412 (or (>= (following-char) 128) |
5797c2cbac2a
(comint-file-name-chars): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19678
diff
changeset
|
2413 (eq (preceding-char) ?\\))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2414 (backward-char 1)) |
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
|
2415 ;; Don't go forward over a word-char (this can happen if we're at bob). |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2416 (when (or (not (bobp)) (looking-at non-word-chars)) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2417 (forward-char 1)) |
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
|
2418 ;; 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
|
2419 (when (< (point) here) |
21152
8197c659e85c
(comint-word): store-match-data => set-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
21018
diff
changeset
|
2420 (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
|
2421 (match-string 0))))) |
584 | 2422 |
15369
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2423 (defun comint-substitute-in-file-name (filename) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2424 "Return FILENAME with environment variables substituted. |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2425 Supports additional environment variable syntax of the command |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2426 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
|
2427 (let ((name (substitute-in-file-name filename))) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2428 (if (memq system-type '(ms-dos windows-nt)) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2429 (let (env-var-name |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2430 env-var-val) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2431 (save-match-data |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2432 (while (string-match "%\\([^\\\\/]*\\)%" name) |
32326 | 2433 (setq env-var-name |
15369
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2434 (substring name (match-beginning 1) (match-end 1))) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2435 (setq env-var-val (if (getenv env-var-name) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2436 (getenv env-var-name) |
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2437 "")) |
29883
53bc9bb1f0b8
(comint-substitute-in-file-name): Call replace-match
Gerd Moellmann <gerd@gnu.org>
parents:
29078
diff
changeset
|
2438 (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
|
2439 name)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2440 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2441 (defun comint-match-partial-filename () |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2442 "Return the filename at point, or nil if non is found. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2443 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
|
2444 (let ((filename (comint-word comint-file-name-chars))) |
32326 | 2445 (and filename (comint-substitute-in-file-name |
15369
0c818ae83d43
(comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents:
15361
diff
changeset
|
2446 (comint-unquote-filename filename))))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2447 |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2448 |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2449 (defun comint-quote-filename (filename) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2450 "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
|
2451 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
|
2452 (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
|
2453 filename |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2454 (let ((regexp |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2455 (format "\\(^\\|[^\\]\\)\\([%s]\\)" |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2456 (mapconcat 'char-to-string comint-file-name-quote-list "")))) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2457 (save-match-data |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2458 (while (string-match regexp filename) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2459 (setq filename (replace-match "\\1\\\\\\2" nil nil filename))) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2460 filename)))) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2461 |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2462 (defun comint-unquote-filename (filename) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2463 "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
|
2464 (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
|
2465 filename |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2466 (save-match-data |
15337
cf1e6f4dd2b0
(comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents:
14814
diff
changeset
|
2467 (let ((i 0)) |
cf1e6f4dd2b0
(comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents:
14814
diff
changeset
|
2468 (while (string-match "\\\\\\(.\\)" filename i) |
cf1e6f4dd2b0
(comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents:
14814
diff
changeset
|
2469 (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
|
2470 (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
|
2471 filename))) |
114 | 2472 |
584 | 2473 |
114 | 2474 (defun comint-dynamic-complete () |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2475 "Dynamically perform completion at point. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2476 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
|
2477 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
|
2478 assumed to have occurred." |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2479 (interactive) |
12208
d10ef5c093ce
(comint-mode): Use make-local-hook.
Karl Heuer <kwzh@gnu.org>
parents:
12058
diff
changeset
|
2480 (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
|
2481 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2482 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2483 (defun comint-dynamic-complete-filename () |
584 | 2484 "Dynamically complete the filename at point. |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2485 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
|
2486 `comint-dynamic-complete-as-filename'. |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2487 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
|
2488 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
|
2489 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
|
2490 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
|
2491 |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
2492 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
|
2493 `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
|
2494 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
|
2495 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2496 Returns t if successful." |
114 | 2497 (interactive) |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2498 (when (comint-match-partial-filename) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2499 (unless (window-minibuffer-p (selected-window)) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2500 (message "Completing file name...")) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2501 (comint-dynamic-complete-as-filename))) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2502 |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2503 (defun comint-dynamic-complete-as-filename () |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2504 "Dynamically complete at point as a filename. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2505 See `comint-dynamic-complete-filename'. Returns t if successful." |
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
|
2506 (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt))) |
6256
3810012eb29f
(comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6239
diff
changeset
|
2507 (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
|
2508 ;; 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
|
2509 ;; 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
|
2510 ;; 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
|
2511 ;;(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
|
2512 (minibuffer-p (window-minibuffer-p (selected-window))) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2513 (success t) |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2514 (dirsuffix (cond ((not comint-completion-addsuffix) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2515 "") |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2516 ((not (consp comint-completion-addsuffix)) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2517 (char-to-string directory-sep-char)) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2518 (t |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2519 (car comint-completion-addsuffix)))) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2520 (filesuffix (cond ((not comint-completion-addsuffix) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2521 "") |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2522 ((not (consp comint-completion-addsuffix)) |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2523 " ") |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2524 (t |
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2525 (cdr comint-completion-addsuffix)))) |
6847
9481abcaa7de
(comint-dynamic-complete-as-filename): Simplify.
Karl Heuer <kwzh@gnu.org>
parents:
6797
diff
changeset
|
2526 (filename (or (comint-match-partial-filename) "")) |
9481abcaa7de
(comint-dynamic-complete-as-filename): Simplify.
Karl Heuer <kwzh@gnu.org>
parents:
6797
diff
changeset
|
2527 (pathdir (file-name-directory filename)) |
9481abcaa7de
(comint-dynamic-complete-as-filename): Simplify.
Karl Heuer <kwzh@gnu.org>
parents:
6797
diff
changeset
|
2528 (pathnondir (file-name-nondirectory filename)) |
9481abcaa7de
(comint-dynamic-complete-as-filename): Simplify.
Karl Heuer <kwzh@gnu.org>
parents:
6797
diff
changeset
|
2529 (directory (if pathdir (comint-directory pathdir) default-directory)) |
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
|
2530 (completion (file-name-completion pathnondir directory))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2531 (cond ((null completion) |
32326 | 2532 (message "No completions of %s" filename) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2533 (setq success nil)) |
32326 | 2534 ((eq completion t) ; Means already completed "file". |
2535 (insert filesuffix) | |
2536 (unless minibuffer-p | |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2537 (message "Sole completion"))) |
32326 | 2538 ((string-equal completion "") ; Means completion on "directory/". |
2539 (comint-dynamic-list-filename-completions)) | |
2540 (t ; Completion string returned. | |
2541 (let ((file (concat (file-name-as-directory directory) completion))) | |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2542 (insert (comint-quote-filename |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2543 (substring (directory-file-name completion) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2544 (length pathnondir)))) |
32326 | 2545 (cond ((symbolp (file-name-completion completion directory)) |
2546 ;; 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
|
2547 (insert (if (file-directory-p file) dirsuffix filesuffix)) |
32326 | 2548 (unless minibuffer-p |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2549 (message "Completed"))) |
32326 | 2550 ((and comint-completion-recexact comint-completion-addsuffix |
2551 (string-equal pathnondir completion) | |
2552 (file-exists-p file)) | |
2553 ;; It's not unique, but user wants shortest match. | |
2554 (insert (if (file-directory-p file) dirsuffix filesuffix)) | |
2555 (unless minibuffer-p | |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2556 (message "Completed shortest"))) |
32326 | 2557 ((or comint-completion-autolist |
2558 (string-equal pathnondir completion)) | |
2559 ;; It's not unique, list possible completions. | |
2560 (comint-dynamic-list-filename-completions)) | |
2561 (t | |
2562 (unless minibuffer-p | |
20986
72fa617ce5e2
Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents:
20894
diff
changeset
|
2563 (message "Partially completed"))))))) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2564 success)) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2565 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2566 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2567 (defun comint-replace-by-expanded-filename () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2568 "Dynamically expand and complete the filename at point. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2569 Replace the filename with an expanded, canonicalised and completed replacement. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2570 \"Expanded\" means environment variables (e.g., $HOME) and `~'s are replaced |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2571 with the corresponding directories. \"Canonicalised\" means `..' and `.' are |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2572 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
|
2573 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
|
2574 `comint-dynamic-complete-filename'." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2575 (interactive) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2576 (replace-match (expand-file-name (comint-match-partial-filename)) t t) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2577 (comint-dynamic-complete-filename)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2578 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2579 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2580 (defun comint-dynamic-simple-complete (stub candidates) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2581 "Dynamically complete STUB from CANDIDATES list. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2582 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
|
2583 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
|
2584 if completion is ambiguous. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2585 |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2586 Returns nil if no completion was inserted. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2587 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
|
2588 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
|
2589 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
|
2590 Returns `listed' if a completion listing was shown. |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2591 |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2592 See also `comint-dynamic-complete-filename'." |
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
|
2593 (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2594 (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
|
2595 ((not (consp comint-completion-addsuffix)) " ") |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2596 (t (cdr comint-completion-addsuffix)))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2597 (candidates (mapcar (function (lambda (x) (list x))) candidates)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2598 (completions (all-completions stub candidates))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2599 (cond ((null completions) |
32326 | 2600 (message "No completions of %s" stub) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2601 nil) |
32326 | 2602 ((= 1 (length completions)) ; Gotcha! |
2603 (let ((completion (car completions))) | |
2604 (if (string-equal completion stub) | |
2605 (message "Sole completion") | |
2606 (insert (substring completion (length stub))) | |
2607 (message "Completed")) | |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2608 (insert suffix) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2609 'sole)) |
32326 | 2610 (t ; There's no unique completion. |
2611 (let ((completion (try-completion stub candidates))) | |
2612 ;; Insert the longest substring. | |
2613 (insert (substring completion (length stub))) | |
2614 (cond ((and comint-completion-recexact comint-completion-addsuffix | |
2615 (string-equal stub completion) | |
2616 (member completion completions)) | |
2617 ;; It's not unique, but user wants shortest match. | |
2618 (insert suffix) | |
2619 (message "Completed shortest") | |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2620 'shortest) |
32326 | 2621 ((or comint-completion-autolist |
2622 (string-equal stub completion)) | |
2623 ;; It's not unique, list possible completions. | |
2624 (comint-dynamic-list-completions completions) | |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2625 'listed) |
32326 | 2626 (t |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2627 (message "Partially completed") |
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2628 'partial))))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2629 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2630 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2631 (defun comint-dynamic-list-filename-completions () |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2632 "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
|
2633 (interactive) |
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
|
2634 (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt))) |
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
|
2635 ;; 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
|
2636 ;; 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
|
2637 ;; 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
|
2638 ;;(file-name-handler-alist nil) |
6185
82a92cf44059
(comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents:
6154
diff
changeset
|
2639 (filename (or (comint-match-partial-filename) "")) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2640 (pathdir (file-name-directory filename)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2641 (pathnondir (file-name-nondirectory filename)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2642 (directory (if pathdir (comint-directory pathdir) default-directory)) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2643 (completions (file-name-all-completions pathnondir directory))) |
11187
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2644 (if (not completions) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2645 (message "No completions of %s" filename) |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2646 (comint-dynamic-list-completions |
ac3611b5f490
Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents:
11156
diff
changeset
|
2647 (mapcar 'comint-quote-filename completions))))) |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2648 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2649 |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2650 (defun comint-dynamic-list-completions (completions) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2651 "List in help buffer sorted COMPLETIONS. |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2652 Typing SPC flushes the help buffer." |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2653 (let ((conf (current-window-configuration))) |
7846
46db50437ebb
(comint-dynamic-list-completions): No space in *Completions*.
Richard M. Stallman <rms@gnu.org>
parents:
7766
diff
changeset
|
2654 (with-output-to-temp-buffer "*Completions*" |
4872
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2655 (display-completion-list (sort completions 'string-lessp))) |
628cbf7e7005
(comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents:
4675
diff
changeset
|
2656 (message "Hit space to flush") |
5424
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2657 (let (key first) |
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2658 (if (save-excursion |
7846
46db50437ebb
(comint-dynamic-list-completions): No space in *Completions*.
Richard M. Stallman <rms@gnu.org>
parents:
7766
diff
changeset
|
2659 (set-buffer (get-buffer "*Completions*")) |
5424
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2660 (setq key (read-key-sequence nil) |
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2661 first (aref key 0)) |
10445
a657f6491234
Make sure the event read by comint-dynamic-list-completions isn't
Simon Marshall <simon@gnu.org>
parents:
10125
diff
changeset
|
2662 (and (consp first) (consp (event-start first)) |
5424
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2663 (eq (window-buffer (posn-window (event-start first))) |
7846
46db50437ebb
(comint-dynamic-list-completions): No space in *Completions*.
Richard M. Stallman <rms@gnu.org>
parents:
7766
diff
changeset
|
2664 (get-buffer "*Completions*")) |
5424
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2665 (eq (key-binding key) 'mouse-choose-completion))) |
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2666 ;; If the user does mouse-choose-completion with the mouse, |
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2667 ;; execute the command, then delete the completion window. |
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2668 (progn |
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2669 (mouse-choose-completion first) |
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2670 (set-window-configuration conf)) |
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2671 (if (eq first ?\ ) |
51eecae04837
(comint-last-output-start): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
5323
diff
changeset
|
2672 (set-window-configuration conf) |
8332
1b4a8157f36c
(comint-dynamic-list-completions): Listify the key
Richard M. Stallman <rms@gnu.org>
parents:
8266
diff
changeset
|
2673 (setq unread-command-events (listify-key-sequence key))))))) |
114 | 2674 |
22265
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2675 (defun comint-get-next-from-history () |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2676 "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
|
2677 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
|
2678 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
|
2679 (interactive) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2680 (if comint-save-input-ring-index |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2681 (progn |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2682 (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
|
2683 (comint-next-input 1)) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2684 (message "No previous history command"))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2685 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2686 (defun comint-accumulate () |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2687 "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
|
2688 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
|
2689 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
|
2690 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
|
2691 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
|
2692 when you send it." |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2693 (interactive) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2694 (insert "\n") |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2695 (set-marker comint-accum-marker (point)) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2696 (if comint-input-ring-index |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2697 (setq comint-save-input-ring-index |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2698 (- comint-input-ring-index 1)))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2699 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2700 (defun comint-goto-process-mark () |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2701 "Move point to the process mark. |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2702 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
|
2703 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
|
2704 (interactive) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2705 (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
|
2706 (error "Current buffer has no process")))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2707 (goto-char (process-mark proc)) |
35236
ebc45a028f0f
(comint-goto-process-mark): Don't print a message
Gerd Moellmann <gerd@gnu.org>
parents:
34977
diff
changeset
|
2708 (when (interactive-p) |
ebc45a028f0f
(comint-goto-process-mark): Don't print a message
Gerd Moellmann <gerd@gnu.org>
parents:
34977
diff
changeset
|
2709 (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
|
2710 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2711 (defun comint-bol-or-process-mark () |
24765
6c69a507d9bd
(comint-bol-or-process-mark): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
24719
diff
changeset
|
2712 "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
|
2713 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
|
2714 \(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
|
2715 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
|
2716 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2717 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
|
2718 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
|
2719 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
|
2720 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
|
2721 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
|
2722 (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
|
2723 (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
|
2724 (comint-bol nil) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2725 (comint-goto-process-mark))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2726 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2727 (defun comint-set-process-mark () |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2728 "Set the process mark at point." |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2729 (interactive) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2730 (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
|
2731 (error "Current buffer has no process")))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2732 (set-marker (process-mark proc) (point)) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2733 (message "Process mark set"))) |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2734 |
46bb1b22d269
(comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents:
21951
diff
changeset
|
2735 |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2736 ;; Author: Peter Breton <pbreton@ne.mediaone.net> |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2737 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2738 ;; 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
|
2739 ;; 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
|
2740 ;; or buffers, and then go back to using the comint shell. |
32326 | 2741 ;; |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2742 ;; 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
|
2743 ;; query using the process associated with a comint-buffer, and save that |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2744 ;; somewhere else. Because the process might have state (for example, it |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2745 ;; 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
|
2746 ;; process and having it execute the query and then finish, would not |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2747 ;; work. I'm sure there are other uses as well, although in many cases |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2748 ;; starting a new process is the simpler, and thus preferable, approach. |
32326 | 2749 ;; |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2750 ;; The basic implementation is as follows: comint-redirect changes the |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2751 ;; preoutput filter functions (comint-preoutput-filter-functions) to use |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2752 ;; its own filter. The filter puts the output into the designated buffer, |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2753 ;; or buffers, until it sees a regexp that tells it to stop (by default, |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2754 ;; this is the prompt for the interpreter, comint-prompt-regexp). When it |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2755 ;; sees the stop regexp, it restores the old filter functions, and runs |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2756 ;; comint-redirect-hook. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2757 ;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2758 ;; 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
|
2759 ;; 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
|
2760 ;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2761 ;; 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
|
2762 ;; correct prompt for your interpreter, or that you supply a regexp that says |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2763 ;; when the redirection is finished. Otherwise, redirection will continue |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2764 ;; indefinitely. The code now does a sanity check to ensure that it can find |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2765 ;; 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
|
2766 ;; this prompt is set correctly. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2767 ;; |
30640
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2768 ;; XXX: This doesn't work so well unless comint-prompt-regexp is set; |
6f943008c543
(comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents:
30325
diff
changeset
|
2769 ;; 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
|
2770 ;; 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
|
2771 ;; |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2772 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2773 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2774 ;; Variables |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2775 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2776 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2777 (defcustom comint-redirect-verbose nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2778 "*If non-nil, print messages each time the redirection filter is invoked. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2779 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
|
2780 :group 'comint |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2781 :type 'boolean) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2782 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2783 ;; Directly analagous to comint-preoutput-filter-functions |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2784 (defvar comint-redirect-filter-functions nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2785 "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
|
2786 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
|
2787 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
|
2788 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
|
2789 string. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2790 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2791 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
|
2792 the string returned by the previous one. The string returned by the |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2793 last function is the text that is actually inserted in the redirection buffer.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2794 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2795 (make-variable-buffer-local 'comint-redirect-filter-functions) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2796 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2797 ;; Internal variables |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2798 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2799 (defvar comint-redirect-output-buffer nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2800 "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
|
2801 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2802 (defvar comint-redirect-finished-regexp nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2803 "Regular expression that determines when to stop redirection in Comint. |
32326 | 2804 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
|
2805 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
|
2806 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2807 (defvar comint-redirect-insert-matching-regexp nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2808 "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
|
2809 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
|
2810 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
|
2811 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
|
2812 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2813 (defvar comint-redirect-echo-input nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2814 "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
|
2815 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2816 (defvar comint-redirect-completed nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2817 "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
|
2818 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2819 (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
|
2820 "Original mode line for redirected process.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2821 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2822 (defvar comint-redirect-perform-sanity-check t |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2823 "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
|
2824 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
|
2825 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
|
2826 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
|
2827 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
|
2828 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
|
2829 in the process buffer already.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2830 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2831 (defvar comint-redirect-original-filter-function nil |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2832 "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
|
2833 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
|
2834 this value.") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2835 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2836 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2837 ;; Functions |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2838 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2839 |
32326 | 2840 (defun comint-redirect-setup (output-buffer |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2841 comint-buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2842 finished-regexp |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2843 &optional echo-input) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2844 "Set up for output redirection. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2845 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
|
2846 to perform redirection. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2847 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2848 Output from COMINT-BUFFER is redirected to OUTPUT-BUFFER, until something |
32326 | 2849 in the output matches FINISHED-REGEXP. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2850 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2851 If optional argument ECHO-INPUT is non-nil, output is echoed to the |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2852 original comint buffer. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2853 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2854 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
|
2855 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
|
2856 (with-current-buffer comint-buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2857 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2858 (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
|
2859 (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
|
2860 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2861 (make-local-variable 'comint-redirect-output-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2862 (setq comint-redirect-output-buffer output-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2863 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2864 (make-local-variable 'comint-redirect-finished-regexp) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2865 (setq comint-redirect-finished-regexp finished-regexp) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2866 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2867 (make-local-variable 'comint-redirect-echo-input) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2868 (setq comint-redirect-echo-input echo-input) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2869 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2870 (make-local-variable 'comint-redirect-completed) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2871 (setq comint-redirect-completed nil) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2872 |
32326 | 2873 (setq mode-line-process |
2874 (if mode-line-process | |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2875 (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
|
2876 (list ":%s Redirection"))))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2877 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2878 (defun comint-redirect-cleanup () |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2879 "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
|
2880 (interactive) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2881 ;; Restore the process filter |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2882 (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
|
2883 comint-redirect-original-filter-function) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2884 ;; Restore the mode line |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2885 (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
|
2886 ;; Set the completed flag |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2887 (setq comint-redirect-completed t)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2888 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2889 ;; 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
|
2890 ;; that it really occurs. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2891 (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
|
2892 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2893 (defun comint-redirect-filter (process input-string) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2894 "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
|
2895 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
|
2896 place output in. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2897 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2898 INPUT-STRING is the input from the comint process. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2899 |
32326 | 2900 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
|
2901 end user." |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2902 (and process |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2903 (with-current-buffer (process-buffer process) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2904 (comint-redirect-preoutput-filter input-string) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2905 ;; 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
|
2906 (and comint-redirect-echo-input |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2907 comint-redirect-original-filter-function |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2908 (funcall comint-redirect-original-filter-function |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2909 process input-string))))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2910 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2911 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2912 (defun comint-redirect-preoutput-filter (input-string) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2913 "Comint filter function which redirects comint output to a buffer or buffers. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2914 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
|
2915 place output in. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2916 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2917 INPUT-STRING is the input from the comint process. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2918 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2919 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
|
2920 (let ((output-buffer-list |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2921 (if (listp comint-redirect-output-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2922 comint-redirect-output-buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2923 (list comint-redirect-output-buffer))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2924 (filtered-input-string input-string)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2925 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2926 ;; If there are any filter functions, give them a chance to modify the string |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2927 (let ((functions comint-redirect-filter-functions)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2928 (while (and functions filtered-input-string) |
32326 | 2929 (setq filtered-input-string |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2930 (funcall (car functions) filtered-input-string)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2931 (setq functions (cdr functions)))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2932 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2933 ;; Clobber `comint-redirect-finished-regexp' |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2934 (or comint-redirect-insert-matching-regexp |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2935 (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
|
2936 (setq filtered-input-string |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2937 (replace-match "" nil nil filtered-input-string)))) |
32326 | 2938 |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2939 ;; Send output to all registered buffers |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2940 (save-excursion |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2941 (mapcar |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2942 (function (lambda(buf) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2943 ;; Set this buffer to the output buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2944 (set-buffer (get-buffer-create buf)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2945 ;; Go to the end of the buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2946 (goto-char (point-max)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2947 ;; Insert the output |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2948 (insert filtered-input-string))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2949 output-buffer-list)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2950 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2951 ;; Message |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2952 (and comint-redirect-verbose |
32326 | 2953 (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
|
2954 (mapconcat 'identity output-buffer-list " "))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2955 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2956 ;; If we see the prompt, tidy up |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2957 ;; 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
|
2958 ;; clobber it |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2959 (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
|
2960 (progn |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2961 (and comint-redirect-verbose |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2962 (message "Redirection completed")) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2963 (comint-redirect-cleanup) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2964 (run-hooks 'comint-redirect-hook))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2965 ;; Echo input? |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2966 (if comint-redirect-echo-input |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2967 filtered-input-string |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2968 ""))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2969 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2970 ;;;###autoload |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2971 (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
|
2972 "Send COMMAND to process in current buffer, with output to OUTPUT-BUFFER. |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2973 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
|
2974 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2975 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
|
2976 (interactive "sCommand: \nBOutput Buffer: \nP") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2977 (let ((process (get-buffer-process (current-buffer)))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2978 (if process |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2979 (comint-redirect-send-command-to-process |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2980 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
|
2981 (error "No process for current buffer")))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2982 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2983 ;;;###autoload |
32326 | 2984 (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
|
2985 (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
|
2986 "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
|
2987 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
|
2988 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2989 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
|
2990 (interactive "sCommand: \nBOutput Buffer: \nbProcess Buffer: \nP") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2991 (let* (;; The process buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2992 (process-buffer (if (processp process) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2993 (process-buffer process) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2994 process)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2995 (proc (get-buffer-process process-buffer))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2996 ;; Change to the process buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2997 (set-buffer process-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2998 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
2999 ;; Make sure there's a prompt in the current process buffer |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3000 (and comint-redirect-perform-sanity-check |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3001 (save-excursion |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3002 (goto-char (point-max)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3003 (or (re-search-backward comint-prompt-regexp nil t) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3004 (error "No prompt found or `comint-prompt-regexp' not set properly")))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3005 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3006 ;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3007 ;; Set up for redirection |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3008 ;;;;;;;;;;;;;;;;;;;;; |
32326 | 3009 (comint-redirect-setup |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3010 ;; Output Buffer |
32326 | 3011 output-buffer |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3012 ;; Comint Buffer |
32326 | 3013 (current-buffer) |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3014 ;; Finished Regexp |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3015 comint-prompt-regexp |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3016 ;; Echo input |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3017 echo) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3018 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3019 ;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3020 ;; Set the filter |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3021 ;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3022 ;; Save the old filter |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3023 (setq comint-redirect-original-filter-function |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3024 (process-filter proc)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3025 (set-process-filter proc 'comint-redirect-filter) |
32326 | 3026 |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3027 ;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3028 ;; Send the command |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3029 ;;;;;;;;;;;;;;;;;;;;; |
32326 | 3030 (process-send-string |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3031 (current-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3032 (concat command "\n")) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3033 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3034 ;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3035 ;; Show the output |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3036 ;;;;;;;;;;;;;;;;;;;;; |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3037 (or no-display |
32326 | 3038 (display-buffer |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3039 (get-buffer-create |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3040 (if (listp output-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3041 (car output-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3042 output-buffer)))))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3043 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3044 ;;;###autoload |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3045 (defun comint-redirect-results-list (command regexp regexp-group) |
32326 | 3046 "Send COMMAND to current process. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3047 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
|
3048 REGEXP-GROUP is the regular expression group in REGEXP to use." |
32326 | 3049 (comint-redirect-results-list-from-process |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3050 (get-buffer-process (current-buffer)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3051 command regexp regexp-group)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3052 |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3053 ;;;###autoload |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3054 (defun comint-redirect-results-list-from-process (process command regexp regexp-group) |
32326 | 3055 "Send COMMAND to PROCESS. |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3056 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
|
3057 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
|
3058 (let ((output-buffer " *Comint Redirect Work Buffer*") |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3059 results) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3060 (save-excursion |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3061 (set-buffer (get-buffer-create output-buffer)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3062 (erase-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3063 (comint-redirect-send-command-to-process command |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3064 output-buffer process nil t) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3065 ;; Wait for the process to complete |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3066 (set-buffer (process-buffer process)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3067 (while (null comint-redirect-completed) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3068 (accept-process-output nil 1)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3069 ;; Collect the output |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3070 (set-buffer output-buffer) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3071 (goto-char (point-min)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3072 ;; 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
|
3073 (and (looking-at command) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3074 (forward-line)) |
32326 | 3075 (while (re-search-forward regexp nil t) |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3076 (setq results |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3077 (cons (buffer-substring-no-properties |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3078 (match-beginning regexp-group) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3079 (match-end regexp-group)) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3080 results))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3081 results))) |
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3082 |
29078 | 3083 (mapc (lambda (x) |
3084 (add-to-list 'debug-ignored-errors x)) | |
3085 '("^Not at command line$" | |
3086 "^Empty input ring$" | |
3087 "^No history$" | |
3088 "^Not found$" ; Too common? | |
3089 "^Current buffer has no process$")) | |
26553
b3b1f3b51229
Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents:
26174
diff
changeset
|
3090 |
14169 | 3091 ;; Converting process modes to use comint mode |
3092 ;; =========================================================================== | |
3093 ;; The code in the Emacs 19 distribution has all been modified to use comint | |
3094 ;; where needed. However, there are `third-party' packages out there that | |
3095 ;; still use the old shell mode. Here's a guide to conversion. | |
3096 ;; | |
3097 ;; Renaming variables | |
3098 ;; Most of the work is renaming variables and functions. These are the common | |
3099 ;; ones: | |
3100 ;; Local variables: | |
3101 ;; last-input-start comint-last-input-start | |
32326 | 3102 ;; last-input-end comint-last-input-end |
14169 | 3103 ;; shell-prompt-pattern comint-prompt-regexp |
3104 ;; shell-set-directory-error-hook <no equivalent> | |
3105 ;; Miscellaneous: | |
3106 ;; shell-set-directory <unnecessary> | |
32326 | 3107 ;; shell-mode-map comint-mode-map |
14169 | 3108 ;; Commands: |
3109 ;; shell-send-input comint-send-input | |
3110 ;; shell-send-eof comint-delchar-or-maybe-eof | |
32326 | 3111 ;; kill-shell-input comint-kill-input |
14169 | 3112 ;; interrupt-shell-subjob comint-interrupt-subjob |
3113 ;; stop-shell-subjob comint-stop-subjob | |
3114 ;; quit-shell-subjob comint-quit-subjob | |
3115 ;; 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
|
3116 ;; kill-output-from-shell comint-delete-output |
14169 | 3117 ;; show-output-from-shell comint-show-output |
3118 ;; copy-last-shell-input Use comint-previous-input/comint-next-input | |
3119 ;; | |
3120 ;; SHELL-SET-DIRECTORY is gone, its functionality taken over by | |
3121 ;; SHELL-DIRECTORY-TRACKER, the shell mode's comint-input-filter-functions. | |
3122 ;; Comint mode does not provide functionality equivalent to | |
3123 ;; shell-set-directory-error-hook; it is gone. | |
3124 ;; | |
3125 ;; comint-last-input-start is provided for modes which want to munge | |
3126 ;; the buffer after input is sent, perhaps because the inferior | |
3127 ;; insists on echoing the input. The LAST-INPUT-START variable in | |
3128 ;; the old shell package was used to implement a history mechanism, | |
3129 ;; but you should think twice before using comint-last-input-start | |
3130 ;; for this; the input history ring often does the job better. | |
32326 | 3131 ;; |
14169 | 3132 ;; If you are implementing some process-in-a-buffer mode, called foo-mode, do |
3133 ;; *not* create the comint-mode local variables in your foo-mode function. | |
3134 ;; This is not modular. Instead, call comint-mode, and let *it* create the | |
3135 ;; necessary comint-specific local variables. Then create the | |
3136 ;; foo-mode-specific local variables in foo-mode. Set the buffer's keymap to | |
3137 ;; be foo-mode-map, and its mode to be foo-mode. Set the comint-mode hooks | |
3138 ;; (comint-{prompt-regexp, input-filter, input-filter-functions, | |
3139 ;; get-old-input) that need to be different from the defaults. Call | |
3140 ;; foo-mode-hook, and you're done. Don't run the comint-mode hook yourself; | |
3141 ;; comint-mode will take care of it. The following example, from shell.el, | |
3142 ;; is typical: | |
32326 | 3143 ;; |
14169 | 3144 ;; (defvar shell-mode-map '()) |
3145 ;; (cond ((not shell-mode-map) | |
3146 ;; (setq shell-mode-map (copy-keymap comint-mode-map)) | |
3147 ;; (define-key shell-mode-map "\C-c\C-f" 'shell-forward-command) | |
3148 ;; (define-key shell-mode-map "\C-c\C-b" 'shell-backward-command) | |
3149 ;; (define-key shell-mode-map "\t" 'comint-dynamic-complete) | |
3150 ;; (define-key shell-mode-map "\M-?" | |
3151 ;; 'comint-dynamic-list-filename-completions))) | |
3152 ;; | |
3153 ;; (defun shell-mode () | |
3154 ;; (interactive) | |
3155 ;; (comint-mode) | |
3156 ;; (setq comint-prompt-regexp shell-prompt-pattern) | |
3157 ;; (setq major-mode 'shell-mode) | |
3158 ;; (setq mode-name "Shell") | |
3159 ;; (use-local-map shell-mode-map) | |
3160 ;; (make-local-variable 'shell-directory-stack) | |
3161 ;; (setq shell-directory-stack nil) | |
3162 ;; (add-hook 'comint-input-filter-functions 'shell-directory-tracker) | |
3163 ;; (run-hooks 'shell-mode-hook)) | |
3164 ;; | |
3165 ;; | |
3166 ;; Completion for comint-mode users | |
32326 | 3167 ;; |
14169 | 3168 ;; For modes that use comint-mode, comint-dynamic-complete-functions is the |
3169 ;; hook to add completion functions to. Functions on this list should return | |
3170 ;; non-nil if completion occurs (i.e., further completion should not occur). | |
3171 ;; You could use comint-dynamic-simple-complete to do the bulk of the | |
3172 ;; completion job. | |
584 | 3173 |
3174 (provide 'comint) | |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
638
diff
changeset
|
3175 |
14169 | 3176 ;; comint.el ends here |