annotate lisp/comint.el @ 33748:2827e4066e08

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