annotate lisp/comint.el @ 88237:a98285deef68

(set-rmail-inbox-list): Rewrite to only set inbox list temporarily for a session.
author Henrik Enberg <henrik.enberg@telia.com>
date Fri, 20 Jan 2006 16:27:37 +0000
parents d7ddb3e565de
children
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
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3 ;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
4 ;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
662
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 638
diff changeset
5
38409
153f1b1f2efd Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 38073
diff changeset
6 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
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
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
26 ;; Boston, MA 02110-1301, 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 ;; This file defines a general command-interpreter-in-a-buffer package
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
31 ;; (comint mode). The idea is that you can build specific process-in-a-buffer
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
32 ;; 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
33 ;; 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
34 ;; 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
35 ;; saves code, implementation time, etc., etc.).
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
36
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
37 ;; Several packages are already defined using comint mode:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
38 ;; - shell.el defines a shell-in-a-buffer mode.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
39 ;; - cmulisp.el defines a simple lisp-in-a-buffer mode.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
40 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
41 ;; - 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
42 ;; - The file tea.el tunes scheme and inferior-scheme modes for T.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
43 ;; - The file soar.el tunes Lisp and inferior-lisp modes for Soar.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
44 ;; - cmutex.el defines TeX and LaTeX modes that invoke TeX, LaTeX, BibTeX,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
45 ;; previewers, and printers from within Emacs.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
46 ;; - background.el allows csh-like job control inside Emacs.
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
47 ;; 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
48
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
49 ;; For documentation on the functionality provided by Comint mode, and
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
50 ;; the hooks available for customising it, see the comments below.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
51 ;; For further information on the standard derived modes (shell,
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
52 ;; inferior-lisp, inferior-scheme, ...), see the relevant source files.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
53
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
54 ;; 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
55 ;; background, dbx, gdb, kermit, prolog, telnet) to use comint-mode
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
56 ;; 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
57
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 ;; Brief Command Documentation:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
60 ;;============================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
61 ;; 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
62 ;; mode)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
63 ;;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
64 ;; M-p comint-previous-input Cycle backwards in input history
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
65 ;; M-n comint-next-input Cycle forwards
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
66 ;; M-r comint-previous-matching-input Previous input matching a regexp
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
67 ;; M-s comint-next-matching-input Next input that matches
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
68 ;; M-C-l comint-show-output Show last batch of process output
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
69 ;; RET comint-send-input
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
70 ;; C-d comint-delchar-or-maybe-eof Delete char unless at end of buff
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
71 ;; C-c C-a comint-bol-or-process-mark First time, move point to bol;
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
72 ;; second time, move to process-mark.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
73 ;; C-c C-u comint-kill-input ^u
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
74 ;; C-c C-w backward-kill-word ^w
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
75 ;; C-c C-c comint-interrupt-subjob ^c
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
76 ;; C-c C-z comint-stop-subjob ^z
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
77 ;; C-c C-\ comint-quit-subjob ^\
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
78 ;; C-c C-o comint-delete-output Delete last batch of process output
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
79 ;; C-c C-r comint-show-output Show last batch of process output
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
80 ;; C-c C-l comint-dynamic-list-input-ring List input history
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
81 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
82 ;; 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
83 ;; comint-run Run a program under comint-mode
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
84 ;; 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
85 ;; comint-dynamic-complete-filename Complete filename at point.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
86 ;; comint-dynamic-list-filename-completions List completions in help buffer.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
87 ;; 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
88 ;; replace with expanded/completed name.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
89 ;; comint-replace-by-expanded-history Expand history at point;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
90 ;; replace with expanded name.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
91 ;; comint-magic-space Expand history and add (a) space(s).
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
92 ;; comint-kill-subjob No mercy.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
93 ;; comint-show-maximum-output Show as much output as possible.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
94 ;; comint-continue-subjob Send CONT signal to buffer's process
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
95 ;; group. Useful if you accidentally
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
96 ;; 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
97 ;; 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
98 ;; 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
99 ;; as input.
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
100 ;; 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
101 ;; comint-set-process-mark Set process-mark to point.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
102
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
103 ;; 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
104
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 793
diff changeset
105 ;;; Code:
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 793
diff changeset
106
1131
853d0d4c61fb entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 932
diff changeset
107 (require 'ring)
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 ;; Buffer Local Variables:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
110 ;;============================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
111 ;; Comint mode buffer local variables:
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
112 ;; 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
113 ;; 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
114 ;; 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
115 ;; 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
116 ;; 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
117 ;; 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
118 ;; comint-input-ring-index number ...
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
119 ;; 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
120 ;; 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
121 ;; 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
122 ;; 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
123 ;; 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
124 ;; 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
125 ;; comint-file-name-quote-list list ...
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
126 ;; 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
127 ;; 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
128 ;; 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
129 ;; 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
130 ;; 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
131 ;; 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
132 ;; 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
133 ;; 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
134 ;; 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
135 ;; comint-scroll-to-bottom-on-output symbol ...
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
136 ;; 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
137 ;; comint-accum-marker maker For comint-accumulate
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
138 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
139 ;; 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
140 ;; 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
141 ;; 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
142 ;; comint-completion-recexact boolean ...
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
143
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
144 (defgroup comint nil
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
145 "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
146 :group 'processes)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
147
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
148 (defgroup comint-completion nil
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
149 "Completion facilities in comint."
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
150 :group 'comint)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
151
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
152 (defgroup comint-source nil
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
153 "Source finding facilities in comint."
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
154 :prefix "comint-"
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
155 :group 'comint)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
156
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
157 (defvar comint-prompt-regexp "^"
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
158 "Regexp to recognize prompts in the inferior process.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
159 Defaults to \"^\", the null string at BOL.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
160
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
161 This variable is only used if the variable
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
162 `comint-use-prompt-regexp' is non-nil.
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
163
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
164 Good choices:
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
165 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
166 Lucid Common Lisp: \"^\\\\(>\\\\|\\\\(->\\\\)+\\\\) *\"
fc25d1816641 * comint.el (comint-prompt-regexp): Double the backslashes in the
Jim Blandy <jimb@redhat.com>
parents: 3591
diff changeset
167 franz: \"^\\\\(->\\\\|<[0-9]*>:\\\\) *\"
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
168 kcl: \"^>+ *\"
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
169 shell: \"^[^#$%>\\n]*[#$%>] *\"
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
170 T: \"^>+ *\"
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
171
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
172 This is a good thing to set in mode hooks.")
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
173
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
174 (defcustom comint-prompt-read-only nil
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
175 "If non-nil, the comint prompt is read only.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
176 The read only region includes the newline before the prompt.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
177 This does not affect existing prompts.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
178 Certain derived modes may override this option.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
179
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
180 If you set this option to t, then the safe way to temporarily
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
181 override the read-only-ness of comint prompts is to call
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
182 `comint-kill-whole-line' or `comint-kill-region' with no
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
183 narrowing in effect. This way you will be certain that none of
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
184 the remaining prompts will be accidentally messed up. You may
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
185 wish to put something like the following in your `.emacs' file:
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
186
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
187 \(add-hook 'comint-mode-hook
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
188 (lambda ()
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
189 (define-key comint-mode-map \"\\C-w\" 'comint-kill-region)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
190 (define-key comint-mode-map [C-S-backspace]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
191 'comint-kill-whole-line)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
192
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
193 If you sometimes use comint-mode on text-only terminals or with `emacs -nw',
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
194 you might wish to use another binding for `comint-kill-whole-line'."
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
195 :type 'boolean
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
196 :group 'comint
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
197 :version "22.1")
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
198
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
199 (defvar comint-delimiter-argument-list ()
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
200 "List of characters to recognize as separate arguments in input.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
201 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
202 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
203 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
204 Defaults to the empty list.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
205
6154
385d5fe1c95c (comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents: 6148
diff changeset
206 For shells, a good value is (?\\| ?& ?< ?> ?\\( ?\\) ?;).
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
207
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
208 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
209
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
210 (defcustom comint-input-autoexpand nil
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
211 "*If non-nil, expand input command history references on completion.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
212 This mirrors the optional behavior of tcsh (its autoexpand and histlist).
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
213
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
214 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
215 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
216 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
217 `comint-dynamic-complete'.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
218
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
219 This variable is buffer-local."
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
220 :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
221 (const input)
22569
b5923f76f35b (comint-input-autoexpand): Use `other' widget type.
Andreas Schwab <schwab@suse.de>
parents: 22272
diff changeset
222 (const history)
b5923f76f35b (comint-input-autoexpand): Use `other' widget type.
Andreas Schwab <schwab@suse.de>
parents: 22272
diff changeset
223 (other :tag "on" t))
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
224 :group 'comint)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
225
42450
c32f238e8a16 (comint-highlight-input): Use :weight, not :bold.
Richard M. Stallman <rms@gnu.org>
parents: 42341
diff changeset
226 (defface comint-highlight-input '((t (:weight bold)))
45727
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
227 "Face to use to highlight user input."
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
228 :group 'comint)
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
229
32743
fd31939b0747 (comint-highlight-input, comint-highlight-prompt):
Miles Bader <miles@gnu.org>
parents: 32635
diff changeset
230 (defface comint-highlight-prompt
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
231 '((((min-colors 88) (background dark)) (:foreground "cyan1"))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
232 (((background dark)) (:foreground "cyan"))
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
233 (t (:foreground "dark blue")))
45727
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
234 "Face to use to highlight prompts."
30325
a7f5f8fff5b2 (comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents: 29883
diff changeset
235 :group 'comint)
a7f5f8fff5b2 (comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents: 29883
diff changeset
236
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
237 (defcustom comint-input-ignoredups nil
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
238 "*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
239 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
240
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
241 This variable is buffer-local."
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
242 :type 'boolean
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
243 :group 'comint)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
244
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
245 (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
246 "*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
247 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
248
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
249 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
250 :type '(choice (const :tag "nil" nil)
a7f5f8fff5b2 (comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents: 29883
diff changeset
251 file)
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
252 :group 'comint)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
253
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
254 (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
255 "*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
256 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
257 If `this', scroll only the selected window.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
258
4939
d9ad390ef4e3 (comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents: 4928
diff changeset
259 The default is nil.
4880
a658d0e341b1 (comint-scroll-to-bottom-on-input)
Richard M. Stallman <rms@gnu.org>
parents: 4872
diff changeset
260
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
261 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
262 :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
263 (const t)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
264 (const all)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
265 (const this))
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
266 :group 'comint)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
267
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
268 (defcustom comint-move-point-for-output nil
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
269 "*Controls whether interpreter output moves point to the end of the output.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
270 If nil, then output never moves point to the output.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
271 (If the output occurs at point, it is inserted before point.)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
272 If t or `all', move point in all windows showing the buffer.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
273 If `this', move point only the selected window.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
274 If `others', move point only in other windows, not in the selected window.
4939
d9ad390ef4e3 (comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents: 4928
diff changeset
275
d9ad390ef4e3 (comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents: 4928
diff changeset
276 The default is nil.
4880
a658d0e341b1 (comint-scroll-to-bottom-on-input)
Richard M. Stallman <rms@gnu.org>
parents: 4872
diff changeset
277
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
278 See the variable `comint-scroll-show-maximum-output' and the function
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
279 `comint-postoutput-scroll-to-bottom'.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
280 This variable is buffer-local in all Comint buffers."
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
281 :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
282 (const t)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
283 (const all)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
284 (const this)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
285 (const others))
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
286 :group 'comint)
4939
d9ad390ef4e3 (comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents: 4928
diff changeset
287
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
288 (defvaralias 'comint-scroll-to-bottom-on-output 'comint-move-point-for-output)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
289
43028
5a7c132708d2 (comint-scroll-show-maximum-output): Default is t.
Richard M. Stallman <rms@gnu.org>
parents: 42887
diff changeset
290 (defcustom comint-scroll-show-maximum-output t
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
291 "*Controls how to scroll due to interpreter output.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
292 This variable applies when point is at the end of the buffer
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
293 \(either because it was originally there, or because
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
294 `comint-move-point-for-output' said to move it there)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
295 and output from the subprocess is inserted.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
296
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
297 Non-nil means scroll so that the window is full of text
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
298 and point is on the last line. A value of nil
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
299 means don't do anything special--scroll normally.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
300
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
301 See also the variable `comint-move-point-for-output' and the function
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
302 `comint-postoutput-scroll-to-bottom'.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
303 This variable is buffer-local in all Comint buffers."
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
304 :type 'boolean
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
305 :group 'comint)
4939
d9ad390ef4e3 (comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents: 4928
diff changeset
306
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
307 (defcustom comint-buffer-maximum-size 1024
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
308 "*The maximum size in lines for Comint buffers.
10833
77d7d3990300 Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents: 10830
diff changeset
309 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
310 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
311 :type 'integer
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
312 :group 'comint)
10833
77d7d3990300 Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents: 10830
diff changeset
313
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
314 (defvar comint-input-ring-size 150
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
315 "Size of input history ring.")
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
316
25443
a4be8e9452ef (comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25278
diff changeset
317 (defvar comint-input-ring-separator "\n"
a4be8e9452ef (comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25278
diff changeset
318 "Separator between commands in the history file.")
a4be8e9452ef (comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25278
diff changeset
319
34977
29a7d4d1846b (comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34834
diff changeset
320 (defvar comint-input-history-ignore "^#"
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
321 "Regexp for history entries that should be ignored when Comint initializes.")
34977
29a7d4d1846b (comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34834
diff changeset
322
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
323 (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
324 "*If non-nil, assume that the subprocess echoes any input.
2539
577c77cfd199 *** empty log message ***
Noah Friedman <friedman@splode.com>
parents: 2518
diff changeset
325 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
326 appears in the buffer.
2539
577c77cfd199 *** empty log message ***
Noah Friedman <friedman@splode.com>
parents: 2518
diff changeset
327
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
328 This variable is buffer-local."
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
329 :type 'boolean
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
330 :group 'comint)
2539
577c77cfd199 *** empty log message ***
Noah Friedman <friedman@splode.com>
parents: 2518
diff changeset
331
24471
cddc33d259d4 (comint-password-prompt-regexp): Accept "login password:"
Karl Heuer <kwzh@gnu.org>
parents: 23615
diff changeset
332 ;; 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
333 ;; 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
334 ;; 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
335 ;; 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
336 ;; 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
337 (defcustom comint-password-prompt-regexp
44531
c60e04e0eb91 (comint-password-prompt-regexp): Match" SMB password".
Francesco Potortì <pot@gnu.org>
parents: 43843
diff changeset
338 "\\(\\([Oo]ld \\|[Nn]ew \\|'s \\|login \\|\
44646
075cd9bb6051 (comint-password-prompt-regexp): Match "Repeat passphrase".
Francesco Potortì <pot@gnu.org>
parents: 44531
diff changeset
339 Kerberos \\|CVS \\|UNIX \\| SMB \\|^\\)\
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
340 \[Pp]assword\\( (again)\\)?\\|\
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
341 pass phrase\\|\\(Enter\\|Repeat\\|Bad\\) passphrase\\)\
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
342 \\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'"
8087
c22d7c5168f5 comint-password-prompt-regexp: New variable.
Noah Friedman <friedman@splode.com>
parents: 8060
diff changeset
343 "*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
344 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
345 :type 'regexp
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
346 :group 'comint)
8087
c22d7c5168f5 comint-password-prompt-regexp: New variable.
Noah Friedman <friedman@splode.com>
parents: 8060
diff changeset
347
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
348 ;; Here are the per-interpreter hooks.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
349 (defvar comint-get-old-input (function comint-get-old-input-default)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
350 "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
351 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
352 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
353 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
354 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
355 text matching `comint-prompt-regexp', depending on the value of
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
356 `comint-use-prompt-regexp'.")
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
357
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
358 (defvar comint-dynamic-complete-functions
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
359 '(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
360 "List of functions called to perform completion.
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
361 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
362 See also `comint-dynamic-complete'.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
363
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
364 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
365
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
366 (defvar comint-input-filter
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
367 (function (lambda (str) (not (string-match "\\`\\s *\\'" str))))
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
368 "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
369 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
370 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
371
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
372 (defvar comint-input-filter-functions '()
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
373 "Abnormal hook run before input is sent to the process.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
374 These functions get one argument, a string containing the text to send.")
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
375
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
376 ;;;###autoload
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
377 (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
378 "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
379 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
380 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
381 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
382 `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
383 functions have already modified the buffer.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
384
19515
a0ecbe13b54b (comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18805
diff changeset
385 See also `comint-preoutput-filter-functions'.
a0ecbe13b54b (comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18805
diff changeset
386
43579
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
387 You can use `add-hook' to add functions to this list
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
388 either globally or locally.")
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
389
42693
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
390 (defvar comint-input-sender-no-newline nil
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
391 "Non-nil directs the `comint-input-sender' function not to send a newline.")
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
392
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
393 (defvar comint-input-sender (function comint-simple-send)
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
394 "Function to actually send to PROCESS the STRING submitted by user.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
395 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
396 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
397 `comint-simple-send' just sends the string plus a newline.
42693
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
398 \(If `comint-input-sender-no-newline' is non-nil, it omits the newline.)
3386
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
399 This is called from the user command `comint-send-input'.")
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
400
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
401 (defcustom comint-eol-on-send t
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
402 "*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
403 See `comint-send-input'."
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
404 :type 'boolean
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
405 :group 'comint)
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
406
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
407 ;; 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
408 ;; 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
409 ;; places that need attention.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
410 (defcustom comint-use-prompt-regexp nil
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
411 "*If non-nil, use `comint-prompt-regexp' to recognize prompts.
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
412 If nil, then program output and user-input are given different `field'
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
413 properties, which Emacs commands can use to distinguish them (in
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
414 particular, common movement commands such as `beginning-of-line'
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
415 respect field boundaries in a natural way)."
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
416 :type 'boolean
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
417 :group 'comint)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
418
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
419 ;; Autoload is necessary for Custom to recognize old alias.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
420 ;;;###autoload
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
421 (define-obsolete-variable-alias 'comint-use-prompt-regexp-instead-of-fields
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
422 'comint-use-prompt-regexp "22.1")
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
423
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
424 (defcustom comint-mode-hook nil
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
425 "Hook run upon entry to `comint-mode'.
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
426 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
427 :type 'hook
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
428 :group 'comint)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
429
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
430 (defcustom comint-exec-hook '()
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
431 "Hook run each time a process is exec'd by `comint-exec'.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
432 This is called after the process is cranked up. It is useful for things that
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
433 must be done each time a process is executed in a Comint mode buffer (e.g.,
3386
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
434 `(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
435 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
436 :type 'hook
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
437 :group 'comint)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
438
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
439 (defvar comint-mode-map
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
440 (let ((map (make-sparse-keymap)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
441 ;; Keys:
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
442 (define-key map "\ep" 'comint-previous-input)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
443 (define-key map "\en" 'comint-next-input)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
444 (define-key map [C-up] 'comint-previous-input)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
445 (define-key map [C-down] 'comint-next-input)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
446 (define-key map "\er" 'comint-previous-matching-input)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
447 (define-key map "\es" 'comint-next-matching-input)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
448 (define-key map [?\C-c ?\M-r] 'comint-previous-matching-input-from-input)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
449 (define-key map [?\C-c ?\M-s] 'comint-next-matching-input-from-input)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
450 (define-key map "\e\C-l" 'comint-show-output)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
451 (define-key map "\C-m" 'comint-send-input)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
452 (define-key map "\C-d" 'comint-delchar-or-maybe-eof)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
453 (define-key map "\C-c " 'comint-accumulate)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
454 (define-key map "\C-c\C-x" 'comint-get-next-from-history)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
455 (define-key map "\C-c\C-a" 'comint-bol-or-process-mark)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
456 (define-key map "\C-c\C-u" 'comint-kill-input)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
457 (define-key map "\C-c\C-w" 'backward-kill-word)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
458 (define-key map "\C-c\C-c" 'comint-interrupt-subjob)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
459 (define-key map "\C-c\C-z" 'comint-stop-subjob)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
460 (define-key map "\C-c\C-\\" 'comint-quit-subjob)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
461 (define-key map "\C-c\C-m" 'comint-insert-input)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
462 (define-key map "\C-c\C-o" 'comint-delete-output)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
463 (define-key map "\C-c\C-r" 'comint-show-output)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
464 (define-key map "\C-c\C-e" 'comint-show-maximum-output)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
465 (define-key map "\C-c\C-l" 'comint-dynamic-list-input-ring)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
466 (define-key map "\C-c\C-n" 'comint-next-prompt)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
467 (define-key map "\C-c\C-p" 'comint-previous-prompt)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
468 (define-key map "\C-c\C-d" 'comint-send-eof)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
469 (define-key map "\C-c\C-s" 'comint-write-output)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
470 (define-key map "\C-c." 'comint-insert-previous-argument)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
471 ;; Mouse Buttons:
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
472 (define-key map [mouse-2] 'comint-insert-input)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
473 ;; Menu bars:
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
474 ;; completion:
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
475 (define-key map [menu-bar completion]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
476 (cons "Complete" (make-sparse-keymap "Complete")))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
477 (define-key map [menu-bar completion complete-expand]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
478 '("Expand File Name" . comint-replace-by-expanded-filename))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
479 (define-key map [menu-bar completion complete-listing]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
480 '("File Completion Listing" . comint-dynamic-list-filename-completions))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
481 (define-key map [menu-bar completion complete-file]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
482 '("Complete File Name" . comint-dynamic-complete-filename))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
483 (define-key map [menu-bar completion complete]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
484 '("Complete Before Point" . comint-dynamic-complete))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
485 ;; Input history:
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
486 (define-key map [menu-bar inout]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
487 (cons "In/Out" (make-sparse-keymap "In/Out")))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
488 (define-key map [menu-bar inout delete-output]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
489 '("Delete Current Output Group" . comint-delete-output))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
490 (define-key map [menu-bar inout append-output-to-file]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
491 '("Append Current Output Group to File" . comint-append-output-to-file))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
492 (define-key map [menu-bar inout write-output]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
493 '("Write Current Output Group to File" . comint-write-output))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
494 (define-key map [menu-bar inout next-prompt]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
495 '("Forward Output Group" . comint-next-prompt))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
496 (define-key map [menu-bar inout previous-prompt]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
497 '("Backward Output Group" . comint-previous-prompt))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
498 (define-key map [menu-bar inout show-maximum-output]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
499 '("Show Maximum Output" . comint-show-maximum-output))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
500 (define-key map [menu-bar inout show-output]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
501 '("Show Current Output Group" . comint-show-output))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
502 (define-key map [menu-bar inout kill-input]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
503 '("Kill Current Input" . comint-kill-input))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
504 (define-key map [menu-bar inout copy-input]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
505 '("Copy Old Input" . comint-insert-input))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
506 (define-key map [menu-bar inout forward-matching-history]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
507 '("Forward Matching Input..." . comint-forward-matching-input))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
508 (define-key map [menu-bar inout backward-matching-history]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
509 '("Backward Matching Input..." . comint-backward-matching-input))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
510 (define-key map [menu-bar inout next-matching-history]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
511 '("Next Matching Input..." . comint-next-matching-input))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
512 (define-key map [menu-bar inout previous-matching-history]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
513 '("Previous Matching Input..." . comint-previous-matching-input))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
514 (define-key map [menu-bar inout next-matching-history-from-input]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
515 '("Next Matching Current Input" . comint-next-matching-input-from-input))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
516 (define-key map [menu-bar inout previous-matching-history-from-input]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
517 '("Previous Matching Current Input" . comint-previous-matching-input-from-input))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
518 (define-key map [menu-bar inout next-history]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
519 '("Next Input" . comint-next-input))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
520 (define-key map [menu-bar inout previous-history]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
521 '("Previous Input" . comint-previous-input))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
522 (define-key map [menu-bar inout list-history]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
523 '("List Input History" . comint-dynamic-list-input-ring))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
524 (define-key map [menu-bar inout expand-history]
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
525 '("Expand History Before Point" . comint-replace-by-expanded-history))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
526 ;; Signals
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
527 (let ((signals-map (make-sparse-keymap "Signals")))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
528 (define-key map [menu-bar signals] (cons "Signals" signals-map))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
529 (define-key signals-map [eof] '("EOF" . comint-send-eof))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
530 (define-key signals-map [kill] '("KILL" . comint-kill-subjob))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
531 (define-key signals-map [quit] '("QUIT" . comint-quit-subjob))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
532 (define-key signals-map [cont] '("CONT" . comint-continue-subjob))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
533 (define-key signals-map [stop] '("STOP" . comint-stop-subjob))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
534 (define-key signals-map [break] '("BREAK" . comint-interrupt-subjob)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
535 ;; Put them in the menu bar:
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
536 (setq menu-bar-final-items (append '(completion inout signals)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
537 menu-bar-final-items))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
538 map))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
539
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
540 ;; Fixme: Is this still relevant?
1131
853d0d4c61fb entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 932
diff changeset
541 (defvar comint-ptyp t
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
542 "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
543 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
544
932
a93f0b1ba909 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 925
diff changeset
545 (defvar comint-input-ring nil)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
546 (defvar comint-last-input-start nil)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
547 (defvar comint-last-input-end nil)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
548 (defvar comint-last-output-start nil)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
549 (defvar comint-input-ring-index nil
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
550 "Index of last matched history element.")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
551 (defvar comint-matching-input-from-input-string ""
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
552 "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
553 (defvar comint-save-input-ring-index
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
554 "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
555 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
556
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
557 (defvar comint-accum-marker nil
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
558 "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
559 The command \\[comint-accumulate] sets this.")
6507
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
560
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
561 (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
562 (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
563 (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
564 (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
565 (put 'comint-input-autoexpand 'permanent-local t)
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
566 (put 'comint-input-filter-functions 'permanent-local t)
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
567 (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
568 (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
569 (put 'comint-scroll-to-bottom-on-input 'permanent-local t)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
570 (put 'comint-move-point-for-output 'permanent-local t)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
571 (put 'comint-scroll-show-maximum-output 'permanent-local t)
1131
853d0d4c61fb entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 932
diff changeset
572 (put 'comint-ptyp 'permanent-local t)
861
345296f94a1e *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
573
17652
0d08e67b280f (comint-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents: 17583
diff changeset
574 (put 'comint-mode 'mode-class 'special)
0d08e67b280f (comint-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents: 17583
diff changeset
575
31970
ebe991a7d6f9 (comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31581
diff changeset
576 (define-derived-mode comint-mode fundamental-mode "Comint"
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
577 "Major mode for interacting with an inferior interpreter.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
578 Interpreter name is same as buffer name, sans the asterisks.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
579 Return at end of buffer sends line as input.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
580 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
581 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
582 before submitting new input.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
583
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
584 This mode is customized to create major modes such as Inferior Lisp
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
585 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
586 `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
587 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
588 `comint-prompt-regexp' to the appropriate regular expression.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
589
3386
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
590 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
591 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
592 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
593 \\[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
594 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
595 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
596
3386
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
597 Commands with no default key bindings include `send-invisible',
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
598 `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
599 `comint-magic-space'.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
600
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
601 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
602 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
603 `comint-preoutput-filter-functions', `comint-scroll-to-bottom-on-input',
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
604 and `comint-move-point-for-output'.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
605
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
606 If you accidentally suspend your process, use \\[comint-continue-subjob]
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
607 to continue it.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
608
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
609 \\{comint-mode-map}
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
610
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
611 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
612 (setq mode-line-process '(":%s"))
41143
f1315eeb4c0b (comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40828
diff changeset
613 (set (make-local-variable 'comint-last-input-start) (point-min-marker))
f1315eeb4c0b (comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40828
diff changeset
614 (set (make-local-variable 'comint-last-input-end) (point-min-marker))
f1315eeb4c0b (comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40828
diff changeset
615 (set (make-local-variable 'comint-last-output-start) (make-marker))
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
616 (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
617 (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
618 (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
619 (make-local-variable 'comint-input-ring)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
620 (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
621 (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
622 (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
623 (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
624 (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
625 (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
626 (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
627 (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
628 (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
629 (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
630 (make-local-variable 'comint-input-autoexpand)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
631 (make-local-variable 'comint-input-ignoredups)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
632 (make-local-variable 'comint-delimiter-argument-list)
6256
3810012eb29f (comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6239
diff changeset
633 (make-local-variable 'comint-completion-fignore)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
634 (make-local-variable 'comint-get-old-input)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
635 (make-local-variable 'comint-input-filter)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
636 (make-local-variable 'comint-input-sender)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
637 (make-local-variable 'comint-eol-on-send)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
638 (make-local-variable 'comint-scroll-to-bottom-on-input)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
639 (make-local-variable 'comint-move-point-for-output)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
640 (make-local-variable 'comint-scroll-show-maximum-output)
48987
0bf251ecfd1a (comint-mode): Localy set scroll-conservatively.
Richard M. Stallman <rms@gnu.org>
parents: 47377
diff changeset
641 ;; This makes it really work to keep point at the bottom.
0bf251ecfd1a (comint-mode): Localy set scroll-conservatively.
Richard M. Stallman <rms@gnu.org>
parents: 47377
diff changeset
642 (make-local-variable 'scroll-conservatively)
0bf251ecfd1a (comint-mode): Localy set scroll-conservatively.
Richard M. Stallman <rms@gnu.org>
parents: 47377
diff changeset
643 (setq scroll-conservatively 10000)
23347
49e47671810d make pre-command-hook & comint-exec-hook local hooks.
Simon Marshall <simon@gnu.org>
parents: 23209
diff changeset
644 (add-hook 'pre-command-hook 'comint-preinput-scroll-to-bottom t t)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
645 (make-local-variable 'comint-ptyp)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
646 (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
647 (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
648 (make-local-variable 'comint-file-name-quote-list)
41143
f1315eeb4c0b (comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40828
diff changeset
649 (set (make-local-variable 'comint-accum-marker) (make-marker))
47377
5ce6684c420c (comint-mode): Add font-lock-defontify to change-major-mode-hook.
Richard M. Stallman <rms@gnu.org>
parents: 47073
diff changeset
650 (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
32892
25182c4fd302 (comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents: 32852
diff changeset
651 ;; 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
652 (set (make-local-variable 'next-line-add-newlines) nil))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
653
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
654 (defun comint-check-proc (buffer)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
655 "Return non-nil if there is a living process associated w/buffer BUFFER.
9388
c9b5541ec9f5 (comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents: 9245
diff changeset
656 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
657 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
658 (let ((proc (get-buffer-process buffer)))
9388
c9b5541ec9f5 (comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents: 9245
diff changeset
659 (and proc (memq (process-status proc) '(open run stop)))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
660
14644
325bc6726a7b (make-comint, comint-run): Fix autoload cookie.
Erik Naggum <erik@naggum.no>
parents: 14169
diff changeset
661 ;;;###autoload
32942
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
662 (defun make-comint-in-buffer (name buffer program &optional startfile &rest switches)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
663 "Make a Comint process NAME in BUFFER, running PROGRAM.
32942
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
664 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
665 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
666 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
667 connection to be opened via `open-network-stream'. If there is already a
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
668 running process in that buffer, it is not restarted. Optional fourth arg
32942
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
669 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
670
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
671 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
672 (or (fboundp 'start-process)
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
673 (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
674 (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
675 ;; 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
676 ;; 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
677 (unless (comint-check-proc buffer)
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
678 (with-current-buffer buffer
41143
f1315eeb4c0b (comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40828
diff changeset
679 (unless (derived-mode-p 'comint-mode)
f1315eeb4c0b (comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40828
diff changeset
680 (comint-mode))) ; Install local vars, mode, keymap, ...
32942
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
681 (comint-exec buffer name program startfile switches))
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
682 buffer)
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
683
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
684 ;;;###autoload
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
685 (defun make-comint (name program &optional startfile &rest switches)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
686 "Make a Comint process NAME in a buffer, running PROGRAM.
1839
e10cdcb857d2 (make-comint): Added docstring.
Roland McGrath <roland@gnu.org>
parents: 1821
diff changeset
687 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
688 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
689 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
690 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
691 running process in that buffer, it is not restarted. Optional third arg
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
692 STARTFILE is the name of a file to send the contents of the process to.
9388
c9b5541ec9f5 (comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents: 9245
diff changeset
693
c9b5541ec9f5 (comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents: 9245
diff changeset
694 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
695 (apply #'make-comint-in-buffer name nil program startfile switches))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
696
14644
325bc6726a7b (make-comint, comint-run): Fix autoload cookie.
Erik Naggum <erik@naggum.no>
parents: 14169
diff changeset
697 ;;;###autoload
6507
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
698 (defun comint-run (program)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
699 "Run PROGRAM in a Comint buffer and switch to it.
6507
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
700 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
701 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
702 hooks on this symbol are run in the buffer.
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
703 See `make-comint' and `comint-exec'."
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
704 (interactive "sRun program: ")
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
705 (let ((name (file-name-nondirectory program)))
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
706 (switch-to-buffer (make-comint name program))
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
707 (run-hooks (intern-soft (concat "comint-" name "-hook")))))
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
708
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
709 (defun comint-exec (buffer name command startfile switches)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
710 "Start up a process named NAME in buffer BUFFER for Comint modes.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
711 Runs the given COMMAND with SWITCHES with output to STARTFILE.
1839
e10cdcb857d2 (make-comint): Added docstring.
Roland McGrath <roland@gnu.org>
parents: 1821
diff changeset
712 Blasts any old process running in the buffer. Doesn't set the buffer mode.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
713 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
714 buffer. The hook `comint-exec-hook' is run after each exec."
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
715 (with-current-buffer buffer
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
716 (let ((proc (get-buffer-process buffer))) ; Blast any old process.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
717 (if proc (delete-process proc)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
718 ;; Crank up a new process
9388
c9b5541ec9f5 (comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents: 9245
diff changeset
719 (let ((proc
c9b5541ec9f5 (comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents: 9245
diff changeset
720 (if (consp command)
c9b5541ec9f5 (comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents: 9245
diff changeset
721 (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
722 (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
723 (set-process-filter proc 'comint-output-filter)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
724 (make-local-variable 'comint-ptyp)
42205
7308bbc423d5 Doc fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 42119
diff changeset
725 (setq comint-ptyp process-connection-type) ; t if pty, nil if pipe.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
726 ;; Jump to the end, and set the process mark.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
727 (goto-char (point-max))
705
c7d478752305 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 662
diff changeset
728 (set-marker (process-mark proc) (point))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
729 ;; Feed it the startfile.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
730 (cond (startfile
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
731 ;;This is guaranteed to wait long enough
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
732 ;;but has bad results if the comint does not prompt at all
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
733 ;; (while (= size (buffer-size))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
734 ;; (sleep-for 1))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
735 ;;I hope 1 second is enough!
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
736 (sleep-for 1)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
737 (goto-char (point-max))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
738 (insert-file-contents startfile)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
739 (setq startfile (buffer-substring (point) (point-max)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
740 (delete-region (point) (point-max))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
741 (comint-send-string proc startfile)))
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
742 (run-hooks 'comint-exec-hook)
705
c7d478752305 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 662
diff changeset
743 buffer)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
744
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
745 ;; 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
746 ;; the appropriate environment.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
747
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
748 (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
749 (let ((process-environment
6750
a864110c6fc7 (comint-exec-1): Handle both termcap and terminfo.
Karl Heuer <kwzh@gnu.org>
parents: 6507
diff changeset
750 (nconc
7327
1e2d4da6b5c4 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7071
diff changeset
751 ;; If using termcap, we specify `emacs' as the terminal type
1e2d4da6b5c4 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7071
diff changeset
752 ;; 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
753 ;; If using terminfo, we specify `dumb' because that is
7327
1e2d4da6b5c4 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7071
diff changeset
754 ;; a defined terminal type. `emacs' is not a defined terminal type
1e2d4da6b5c4 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7071
diff changeset
755 ;; and there is no way for us to define it here.
1e2d4da6b5c4 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7071
diff changeset
756 ;; Some programs that use terminfo get very confused
1e2d4da6b5c4 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7071
diff changeset
757 ;; if TERM is not a valid terminal type.
42341
e0faaa516289 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 42205
diff changeset
758 ;; ;; There is similar code in compile.el.
6750
a864110c6fc7 (comint-exec-1): Handle both termcap and terminfo.
Karl Heuer <kwzh@gnu.org>
parents: 6507
diff changeset
759 (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
760 (list "TERM=dumb" "TERMCAP="
36896
76fed386fc02 (comint-exec-1): Set columns of the terminal to
Gerd Moellmann <gerd@gnu.org>
parents: 36695
diff changeset
761 (format "COLUMNS=%d" (window-width)))
13271
6a084ce822e0 (comint-exec-1): Don't alter EMACS envvar if it's already defined.
Richard M. Stallman <rms@gnu.org>
parents: 13094
diff changeset
762 (list "TERM=emacs"
36896
76fed386fc02 (comint-exec-1): Set columns of the terminal to
Gerd Moellmann <gerd@gnu.org>
parents: 36695
diff changeset
763 (format "TERMCAP=emacs:co#%d:tc=unknown:" (window-width))))
13271
6a084ce822e0 (comint-exec-1): Don't alter EMACS envvar if it's already defined.
Richard M. Stallman <rms@gnu.org>
parents: 13094
diff changeset
764 (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
765 process-environment))
03f3cfdb6a11 (comint-exec-1): Make sure default-directory is a real dir.
Richard M. Stallman <rms@gnu.org>
parents: 9764
diff changeset
766 (default-directory
16944
54108c7f46e6 (comint-exec-1): Use file-accessible-directory-p.
Richard M. Stallman <rms@gnu.org>
parents: 16849
diff changeset
767 (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
768 default-directory
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
769 "/"))
22652
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
770 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
771 (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
772 ;; 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
773 ;; 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
774 (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
775 (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
776 (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
777 (setq decoding (car coding-systems)
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
778 encoding (cdr coding-systems)))
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
779 ;; 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
780 ;; 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
781 ;; 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
782 (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
783 (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
784 changed t))
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
785 ;; 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
786 ;; 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
787 ;; 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
788 ;; conversion.
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
789 (if (and decoding (not encoding))
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
790 (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
791 changed t))
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
792 (if changed
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
793 (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
794 proc))
30325
a7f5f8fff5b2 (comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents: 29883
diff changeset
795
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
796 (defun comint-insert-input (&optional event)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
797 "In a Comint buffer, set the current input to the previous input at point."
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
798 ;; This doesn't use "e" because it is supposed to work
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
799 ;; for events without parameters.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
800 (interactive (list last-input-event))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
801 (let ((pos (point)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
802 (if event (posn-set-point (event-end event)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
803 (if (not (eq (get-char-property (point) 'field) 'input))
45732
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
804 ;; No input at POS, fall back to the global definition.
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
805 (let* ((keys (this-command-keys))
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
806 (last-key (and (vectorp keys) (aref keys (1- (length keys)))))
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
807 (fun (and last-key (lookup-key global-map (vector last-key)))))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
808 (goto-char pos)
45732
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
809 (and fun (call-interactively fun)))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
810 (setq pos (point))
45732
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
811 ;; There's previous input at POS, insert it at the end of the buffer.
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
812 (goto-char (point-max))
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
813 ;; First delete any old unsent input at the end
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
814 (delete-region
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
815 (or (marker-position comint-accum-marker)
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
816 (process-mark (get-buffer-process (current-buffer))))
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
817 (point))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
818 ;; Insert the input at point
45854
875b299f29c6 (comint-insert-clicked-input): Insert clicked-on previous input without
Miles Bader <miles@gnu.org>
parents: 45836
diff changeset
819 (insert (buffer-substring-no-properties
875b299f29c6 (comint-insert-clicked-input): Insert clicked-on previous input without
Miles Bader <miles@gnu.org>
parents: 45836
diff changeset
820 (previous-single-char-property-change (1+ pos) 'field)
875b299f29c6 (comint-insert-clicked-input): Insert clicked-on previous input without
Miles Bader <miles@gnu.org>
parents: 45836
diff changeset
821 (next-single-char-property-change pos 'field))))))
45732
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
822
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
823
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
824 ;; Input history processing in a buffer
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
825 ;; ===========================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
826 ;; 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
827
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
828 ;; Eleven commands:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
829 ;; comint-dynamic-list-input-ring List history in help buffer.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
830 ;; comint-previous-input Previous input...
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
831 ;; comint-previous-matching-input ...matching a string.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
832 ;; comint-previous-matching-input-from-input ... matching the current input.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
833 ;; comint-next-input Next input...
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
834 ;; comint-next-matching-input ...matching a string.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
835 ;; comint-next-matching-input-from-input ... matching the current input.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
836 ;; comint-backward-matching-input Backwards input...
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
837 ;; comint-forward-matching-input ...matching a string.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
838 ;; comint-replace-by-expanded-history Expand history at point;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
839 ;; replace with expanded history.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
840 ;; comint-magic-space Expand history and insert space.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
841 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
842 ;; Three functions:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
843 ;; comint-read-input-ring Read into comint-input-ring...
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
844 ;; 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
845 ;; 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
846
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
847 (defun comint-read-input-ring (&optional silent)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
848 "Set the buffer's `comint-input-ring' from a history file.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
849 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
850 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
851 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
852
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
853 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
854 failure to read the history file.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
855
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
856 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
857
25443
a4be8e9452ef (comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25278
diff changeset
858 The commands stored in the history file are separated by the
34977
29a7d4d1846b (comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34834
diff changeset
859 `comint-input-ring-separator', and entries that match
29a7d4d1846b (comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34834
diff changeset
860 `comint-input-history-ignore' are ignored. The most recent command
29a7d4d1846b (comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34834
diff changeset
861 comes last.
25443
a4be8e9452ef (comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25278
diff changeset
862
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
863 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
864 (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
865 (equal comint-input-ring-file-name ""))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
866 nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
867 ((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
868 (or silent
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
869 (message "Cannot read history file %s"
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
870 comint-input-ring-file-name)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
871 (t
28880
a0115904eda4 (comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents: 28064
diff changeset
872 (let* ((history-buf (get-buffer-create " *temp*"))
a0115904eda4 (comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents: 28064
diff changeset
873 (file comint-input-ring-file-name)
a0115904eda4 (comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents: 28064
diff changeset
874 (count 0)
a0115904eda4 (comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents: 28064
diff changeset
875 (size comint-input-ring-size)
a0115904eda4 (comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents: 28064
diff changeset
876 (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
877 (unwind-protect
936532a595dd (comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents: 7846
diff changeset
878 (save-excursion
936532a595dd (comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents: 7846
diff changeset
879 (set-buffer history-buf)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
880 (widen)
8032
936532a595dd (comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents: 7846
diff changeset
881 (erase-buffer)
936532a595dd (comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents: 7846
diff changeset
882 (insert-file-contents file)
936532a595dd (comint-read-input-ring): Use ring-insert-at-beginning.
Richard M. Stallman <rms@gnu.org>
parents: 7846
diff changeset
883 ;; 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
884 ;; 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
885 (goto-char (point-max))
32623
69b2744032ce (comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents: 32613
diff changeset
886 (let (start end history)
69b2744032ce (comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents: 32613
diff changeset
887 (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
888 (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
889 (setq end (match-beginning 0)))
69b2744032ce (comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents: 32613
diff changeset
890 (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
891 (setq start (match-end 0))
69b2744032ce (comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents: 32613
diff changeset
892 (setq start (point-min)))
69b2744032ce (comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents: 32613
diff changeset
893 (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
894 (goto-char start)
34977
29a7d4d1846b (comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34834
diff changeset
895 (if (and (not (string-match comint-input-history-ignore history))
29a7d4d1846b (comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34834
diff changeset
896 (or (null comint-input-ignoredups)
29a7d4d1846b (comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34834
diff changeset
897 (ring-empty-p ring)
29a7d4d1846b (comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34834
diff changeset
898 (not (string-equal (ring-ref ring 0) history))))
32623
69b2744032ce (comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents: 32613
diff changeset
899 (progn
69b2744032ce (comint-read-input-ring): Bugfix such that the first
Gerd Moellmann <gerd@gnu.org>
parents: 32613
diff changeset
900 (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
901 (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
902 (kill-buffer history-buf))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
903 (setq comint-input-ring ring
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
904 comint-input-ring-index nil)))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
905
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
906 (defun comint-write-input-ring ()
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
907 "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
908 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
909 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
910 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
911
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
912 Useful within process sentinels.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
913
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
914 See also `comint-read-input-ring'."
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
915 (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
916 (equal comint-input-ring-file-name "")
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
917 (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
918 nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
919 ((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
920 (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
921 (t
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
922 (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
923 (ring comint-input-ring)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
924 (file comint-input-ring-file-name)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
925 (index (ring-length ring)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
926 ;; 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
927 ;; 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
928 (save-excursion
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
929 (set-buffer history-buf)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
930 (erase-buffer)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
931 (while (> index 0)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
932 (setq index (1- index))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
933 (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
934 (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
935 (kill-buffer nil))))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
936
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
937
42119
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
938 (defvar comint-dynamic-list-input-ring-window-conf)
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
939
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
940 (defun comint-dynamic-list-input-ring-select ()
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
941 "Choose the input history entry that point is in or next to."
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
942 (interactive)
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
943 (let (beg end completion (buffer completion-reference-buffer)
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
944 (base-size completion-base-size))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
945 (if (and (not (eobp)) (get-text-property (point) 'mouse-face))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
946 (setq end (point) beg (1+ (point))))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
947 (if (and (not (bobp)) (get-text-property (1- (point)) 'mouse-face))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
948 (setq end (1- (point)) beg (point)))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
949 (if (null beg)
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
950 (error "No history entry here"))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
951 (setq beg (previous-single-property-change beg 'mouse-face))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
952 (setq end (or (next-single-property-change end 'mouse-face) (point-max)))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
953 (setq completion (buffer-substring beg end))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
954 (set-window-configuration comint-dynamic-list-input-ring-window-conf)
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
955 (choose-completion-string completion buffer base-size)))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
956
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
957 (defun comint-dynamic-list-input-ring ()
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
958 "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
959 (interactive)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
960 (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
961 (ring-empty-p comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
962 (message "No history")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
963 (let ((history nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
964 (history-buffer " *Input History*")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
965 (index (1- (ring-length comint-input-ring)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
966 (conf (current-window-configuration)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
967 ;; 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
968 (while (>= index 0)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
969 (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
970 index (1- index)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
971 ;; Change "completion" to "history reference"
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
972 ;; to make the display accurate.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
973 (with-output-to-temp-buffer history-buffer
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
974 (display-completion-list history)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
975 (set-buffer history-buffer)
42119
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
976 (let ((keymap (make-sparse-keymap)))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
977 (set-keymap-parent keymap (current-local-map))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
978 (define-key keymap "\C-m" 'comint-dynamic-list-input-ring-select)
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
979 (use-local-map keymap))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
980 (forward-line 3)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
981 (while (search-backward "completion" nil 'move)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
982 (replace-match "history reference")))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
983 (sit-for 0)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
984 (message "Hit space to flush")
42119
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
985 (setq comint-dynamic-list-input-ring-window-conf conf)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
986 (let ((ch (read-event)))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
987 (if (eq ch ?\s)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
988 (set-window-configuration conf)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
989 (setq unread-command-events (list ch)))))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
990
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
991
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
992 (defun comint-regexp-arg (prompt)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
993 "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
994 (let* (;; Don't clobber this.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
995 (last-command last-command)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
996 (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
997 'minibuffer-history-search-history)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
998 (list (if (string-equal regexp "")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
999 (setcar minibuffer-history-search-history
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1000 (nth 1 minibuffer-history-search-history))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1001 regexp)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1002 (prefix-numeric-value current-prefix-arg))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1003
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1004 (defun comint-search-arg (arg)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1005 ;; 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
1006 (cond ((not (comint-after-pmark-p))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1007 (error "Not at command line"))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1008 ((or (null comint-input-ring)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1009 (ring-empty-p comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1010 (error "Empty input ring"))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1011 ((zerop arg)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1012 ;; 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
1013 (setq comint-input-ring-index nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1014 1)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1015 (t
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1016 arg)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1017
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1018 (defun comint-search-start (arg)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1019 "Index to start a directional search, starting at `comint-input-ring-index'."
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1020 (if comint-input-ring-index
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1021 ;; 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
1022 (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
1023 (ring-length comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1024 ;; 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
1025 (if (>= arg 0)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1026 0 ; First elt for forward search
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1027 (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
1028
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1029 (defun comint-previous-input-string (arg)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1030 "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
1031 Moves relative to `comint-input-ring-index'."
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1032 (ring-ref comint-input-ring (if comint-input-ring-index
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
1033 (mod (+ arg comint-input-ring-index)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1034 (ring-length comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1035 arg)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1036
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1037 (defun comint-previous-input (arg)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1038 "Cycle backwards through input history."
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1039 (interactive "*p")
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1040 (comint-previous-matching-input "." arg))
909
4c6cdb66c74c *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1041
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1042 (defun comint-next-input (arg)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1043 "Cycle forwards through input history."
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1044 (interactive "*p")
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1045 (comint-previous-input (- arg)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1046
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1047 (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
1048 "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
1049 Moves relative to `comint-input-ring-index'."
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1050 (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
1051 (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
1052
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1053 (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
1054 "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
1055 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
1056 (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
1057 (ring-empty-p comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1058 (error "No history"))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1059 (let* ((len (ring-length comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1060 (motion (if (> arg 0) 1 -1))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1061 (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
1062 (tried-each-ring-item nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1063 (prev nil))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1064 ;; 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
1065 (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
1066 ;; Step once.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1067 (setq prev n
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1068 n (mod (+ n motion) len))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1069 ;; 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
1070 (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
1071 (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
1072 (setq n (mod (+ n motion) len)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1073 ;; 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
1074 tried-each-ring-item (= n prev)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1075 (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
1076 ;; 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
1077 (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
1078 n)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1079
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1080 (defun comint-previous-matching-input (regexp n)
2673
27dd7479b158 (comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents: 2627
diff changeset
1081 "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
1082 \(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
1083 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
1084 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
1085 (interactive (comint-regexp-arg "Previous input matching (regexp): "))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1086 (setq n (comint-search-arg n))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1087 (let ((pos (comint-previous-matching-input-string-position regexp n)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1088 ;; Has a match been found?
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1089 (if (null pos)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1090 (error "Not found")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1091 (setq comint-input-ring-index pos)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1092 (message "History item: %d" (1+ pos))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
1093 (delete-region
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1094 ;; 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
1095 (or (marker-position comint-accum-marker)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
1096 (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
1097 (point))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1098 (insert (ring-ref comint-input-ring pos)))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1099
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1100 (defun comint-next-matching-input (regexp n)
2673
27dd7479b158 (comint-previous-matching-input): New command, on M-r.
Richard M. Stallman <rms@gnu.org>
parents: 2627
diff changeset
1101 "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
1102 \(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
1103 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
1104 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
1105 (interactive (comint-regexp-arg "Next input matching (regexp): "))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1106 (comint-previous-matching-input regexp (- n)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1107
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1108 (defun comint-previous-matching-input-from-input (n)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1109 "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
1110 \(Previous history elements are earlier commands.)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1111 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
1112 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
1113 (interactive "p")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1114 (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
1115 comint-next-matching-input-from-input)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1116 ;; Starting a new search
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1117 (setq comint-matching-input-from-input-string
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
1118 (buffer-substring
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
1119 (or (marker-position comint-accum-marker)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
1120 (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
1121 (point))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1122 comint-input-ring-index nil))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1123 (comint-previous-matching-input
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1124 (concat "^" (regexp-quote comint-matching-input-from-input-string))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1125 n))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1126
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1127 (defun comint-next-matching-input-from-input (n)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1128 "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
1129 \(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
1130 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
1131 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
1132 (interactive "p")
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1133 (comint-previous-matching-input-from-input (- n)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1134
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1135
21714
9c454e5e03fa (comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents: 21617
diff changeset
1136 (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
1137 "Expand input command history references before point.
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1138 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
1139
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1140 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
1141 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
1142
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1143 Assumes history syntax is like typical Un*x shells'. However, since Emacs
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1144 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
1145 it cannot expand absolute input line number references.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1146
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1147 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
1148 even if history reference seems erroneous.
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1149
21714
9c454e5e03fa (comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents: 21617
diff changeset
1150 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
1151 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
1152 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
1153
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1154 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
1155
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1156 Returns t if successful."
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1157 (interactive)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1158 (if (and comint-input-autoexpand
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1159 (if comint-use-prompt-regexp
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1160 ;; Use comint-prompt-regexp
33053
eb3d446c4a6e (comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents: 33023
diff changeset
1161 (save-excursion
eb3d446c4a6e (comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents: 33023
diff changeset
1162 (beginning-of-line)
eb3d446c4a6e (comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents: 33023
diff changeset
1163 (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
1164 ;; 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
1165 ;; 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
1166 (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
1167 (string-match "!\\|^\\^" (field-string)))))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1168 ;; 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
1169 (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
1170 (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
1171 (/= previous-modified-tick (buffer-modified-tick)))))
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1172
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1173
21714
9c454e5e03fa (comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents: 21617
diff changeset
1174 (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
1175 "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
1176 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
1177
9c454e5e03fa (comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents: 21617
diff changeset
1178 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
1179 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
1180 than the logical beginning of line."
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1181 (save-excursion
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1182 (let ((toend (- (line-end-position) (point)))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1183 (start (or start (comint-line-beginning-position))))
35514
e25ec5ecc3f5 (comint-replace-by-expanded-history-before-point): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 35236
diff changeset
1184 (goto-char start)
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1185 (while (progn
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1186 (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
1187 (< (point) (- (line-end-position) toend)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1188 ;; 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
1189 ;; !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
1190 ;; 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
1191 ;; range specifiers.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1192 ;; 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
1193 ;; 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
1194 (setq comint-input-ring-index nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1195 (cond ((or (= (preceding-char) ?\\)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1196 (comint-within-quotes start (point)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1197 ;; 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
1198 (goto-char (1+ (point))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1199 ((looking-at "![0-9]+\\($\\|[^-]\\)")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1200 ;; 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
1201 (goto-char (match-end 0))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1202 (message "Absolute reference cannot be expanded"))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1203 ((looking-at "!-\\([0-9]+\\)\\(:?[0-9^$*-]+\\)?")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1204 ;; 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
1205 (let ((number (1- (string-to-number
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1206 (buffer-substring (match-beginning 1)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1207 (match-end 1))))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1208 (if (<= number (ring-length comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1209 (progn
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1210 (replace-match
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1211 (comint-args (comint-previous-input-string number)
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1212 (match-beginning 2) (match-end 2))
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1213 t t)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1214 (setq comint-input-ring-index number)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1215 (message "History item: %d" (1+ number)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1216 (goto-char (match-end 0))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1217 (message "Relative reference exceeds input history size"))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1218 ((or (looking-at "!!?:?\\([0-9^$*-]+\\)") (looking-at "!!"))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1219 ;; 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
1220 (replace-match
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1221 (comint-args (comint-previous-input-string 0)
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1222 (match-beginning 1) (match-end 1))
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1223 t t)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1224 (message "History item: previous"))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1225 ((looking-at
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1226 "!\\??\\({\\(.+\\)}\\|\\(\\sw+\\)\\)\\(:?[0-9^$*-]+\\)?")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1227 ;; 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
1228 ;; 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
1229 (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
1230 (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
1231 (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
1232 (pref (if (save-match-data (looking-at "!\\?")) "" "^"))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1233 (pos (save-match-data
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1234 (comint-previous-matching-input-string-position
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1235 (concat pref (regexp-quote exp)) 1))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1236 (if (null pos)
6886
d4010211153e (comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents: 6847
diff changeset
1237 (progn
d4010211153e (comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents: 6847
diff changeset
1238 (goto-char (match-end 0))
d4010211153e (comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents: 6847
diff changeset
1239 (or silent
d4010211153e (comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents: 6847
diff changeset
1240 (progn (message "Not found")
d4010211153e (comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents: 6847
diff changeset
1241 (ding))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1242 (setq comint-input-ring-index pos)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1243 (replace-match
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1244 (comint-args (ring-ref comint-input-ring pos)
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1245 (match-beginning 4) (match-end 4))
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1246 t t)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1247 (message "History item: %d" (1+ pos)))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1248 ((looking-at "\\^\\([^^]+\\)\\^?\\([^^]*\\)\\^?")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1249 ;; Quick substitution on the previous input line.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1250 (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
1251 (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
1252 (pos nil))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1253 (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
1254 (setq pos (point))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1255 (goto-char (match-beginning 0))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1256 (if (not (search-forward old pos t))
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1257 (or silent
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1258 (error "Not found"))
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1259 (replace-match new t t)
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1260 (message "History item: substituted"))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1261 (t
21951
ab7fa71c0957 (comint-replace-by-expanded-history-before-point):
Richard M. Stallman <rms@gnu.org>
parents: 21714
diff changeset
1262 (forward-char 1)))))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1263
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1264
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1265 (defun comint-magic-space (arg)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1266 "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
1267 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
1268 (interactive "p")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1269 (comint-replace-by-expanded-history)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1270 (self-insert-command arg))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1271
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1272 (defun comint-within-quotes (beg end)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1273 "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
1274 Quotes are single and double."
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1275 (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
1276 (countdq (comint-how-many-region "\\(^\\|[^\\\\]\\)\"" beg end)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1277 (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
1278
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1279 (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
1280 "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
1281 (let ((count 0))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1282 (save-excursion
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1283 (save-match-data
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1284 (goto-char beg)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1285 (while (re-search-forward regexp end t)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1286 (setq count (1+ count)))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1287 count))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1288
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1289 (defun comint-args (string begin end)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1290 ;; 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
1291 ;; 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
1292 ;; 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
1293 (save-match-data
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1294 (if (null begin)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1295 (comint-arguments string 0 nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1296 (let* ((range (buffer-substring
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1297 (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
1298 (nth (cond ((string-match "^[*^]" range) 1)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1299 ((string-match "^-" range) 0)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1300 ((string-equal range "$") nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1301 (t (string-to-number range))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1302 (mth (cond ((string-match "[-*$]$" range) nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1303 ((string-match "-" range)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1304 (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
1305 (t nth))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1306 (comint-arguments string nth mth)))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1307
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1308 (defun comint-delim-arg (arg)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1309 "Return a list of arguments from ARG.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1310 Break it up at the delimiters in `comint-delimiter-argument-list'.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1311 Returned list is backwards."
6154
385d5fe1c95c (comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents: 6148
diff changeset
1312 (if (null comint-delimiter-argument-list)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1313 (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
1314 (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
1315 (pos 0)
385d5fe1c95c (comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents: 6148
diff changeset
1316 (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
1317 (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
1318 (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
1319 (start pos))
385d5fe1c95c (comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents: 6148
diff changeset
1320 (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
1321 (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
1322 (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
1323 (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
1324 (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
1325 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
1326 (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
1327 (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
1328 args)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1329
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1330 (defun comint-arguments (string nth mth)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1331 "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
1332 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
1333 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
1334 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
1335 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
1336 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
1337 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
1338 Argument 0 is the command name."
23209
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1339 ;; 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
1340 ;; (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
1341 ;; 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
1342 ;; 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
1343 ;; 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
1344 ;; This seems to fit the syntax of BASH 2.0.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1345 (let* ((first (if (if (fboundp 'w32-shell-dos-semantics)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1346 (w32-shell-dos-semantics))
23209
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1347 "[^ \n\t\"'`]+\\|"
24968
ced85898ea55 (comint-arguments): Handle \ followed by space or tab.
Karl Heuer <kwzh@gnu.org>
parents: 24893
diff changeset
1348 "[^ \n\t\"'`\\]+\\|\\\\[\"'`\\ \t]+\\|"))
23209
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1349 (argpart (concat first
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1350 "\\(\"\\([^\"\\]\\|\\\\.\\)*\"\\|\
21018
edbd4156cf68 (comint-arguments): Treat \" and such as part of one arg.
Richard M. Stallman <rms@gnu.org>
parents: 20986
diff changeset
1351 '[^']*'\\|\
23209
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1352 `[^`]*`\\)"))
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1353 (args ()) (pos 0)
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1354 (count 0)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1355 beg str quotes)
8616
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1356 ;; 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
1357 (while (and (or (null mth) (<= count mth))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1358 (string-match argpart string pos))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1359 (if (and beg (= pos (match-beginning 0)))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1360 ;; It's contiguous, part of the same arg.
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1361 (setq pos (match-end 0)
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1362 quotes (or quotes (match-beginning 1)))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1363 ;; It's a new separate arg.
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1364 (if beg
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1365 ;; 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
1366 (setq str (substring string beg pos)
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1367 args (if quotes (cons str args)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1368 (nconc (comint-delim-arg str) args))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1369 (setq count (length args))
8616
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1370 (setq quotes (match-beginning 1))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1371 (setq beg (match-beginning 0))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1372 (setq pos (match-end 0))))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1373 (if beg
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1374 (setq str (substring string beg pos)
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1375 args (if quotes (cons str args)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1376 (nconc (comint-delim-arg str) args))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1377 (setq count (length args))
8616
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1378 (let ((n (or nth (1- count)))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1379 (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
1380 (mapconcat
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1381 (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
1382
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
1383 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
1384 ;; Input processing stuff
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
1385 ;;
33138
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1386 (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
1387 "Add CMD to the input history.
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1388 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
1389 (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
1390 (or (null comint-input-ignoredups)
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1391 (not (ring-p comint-input-ring))
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1392 (ring-empty-p comint-input-ring)
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1393 (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
1394 cmd))))
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1395 (ring-insert comint-input-ring cmd)))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1396
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1397 (defun comint-send-input (&optional no-newline artificial)
1356
dcf780f7ae1b Doc fix.
Christopher Zaborsky <rogue@erratum.com>
parents: 1131
diff changeset
1398 "Send input to process.
dcf780f7ae1b Doc fix.
Christopher Zaborsky <rogue@erratum.com>
parents: 1131
diff changeset
1399 After the process output mark, sends all text from the process mark to
40828
966dca4af18e (comint-send-input): Fix description of `comint-process-echoes' in the
Miles Bader <miles@gnu.org>
parents: 40003
diff changeset
1400 point as input to the process. Before the process output mark, calls
966dca4af18e (comint-send-input): Fix description of `comint-process-echoes' in the
Miles Bader <miles@gnu.org>
parents: 40003
diff changeset
1401 value of variable `comint-get-old-input' to retrieve old input, copies
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1402 it to the process mark, and sends it.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1403
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1404 This command also sends and inserts a final newline, unless
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1405 NO-NEWLINE is non-nil.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1406
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1407 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
1408 `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
1409 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
1410 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
1411 `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
1412
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
1413 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
1414 end of line before sending the input.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1415
40828
966dca4af18e (comint-send-input): Fix description of `comint-process-echoes' in the
Miles Bader <miles@gnu.org>
parents: 40003
diff changeset
1416 After the input has been sent, if `comint-process-echoes' is non-nil,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1417 then `comint-send-input' waits to see if the process outputs a string
40828
966dca4af18e (comint-send-input): Fix description of `comint-process-echoes' in the
Miles Bader <miles@gnu.org>
parents: 40003
diff changeset
1418 matching the input, and if so, deletes that part of the output.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1419 If ARTIFICIAL is non-nil, it inhibits such deletion.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1420 Callers sending input not from the user should use ARTIFICIAL = t.
40828
966dca4af18e (comint-send-input): Fix description of `comint-process-echoes' in the
Miles Bader <miles@gnu.org>
parents: 40003
diff changeset
1421
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1422 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
1423 `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
1424 in the buffer. E.g.,
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1425
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1426 If the interpreter is the csh,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1427 `comint-get-old-input' is the default:
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1428 If `comint-use-prompt-regexp' is nil, then
38971
478f11ee1d4c (comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents: 38848
diff changeset
1429 either return the current input field, if point is on an input
478f11ee1d4c (comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents: 38848
diff changeset
1430 field, or the current line, if point is on an output field.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1431 If `comint-use-prompt-regexp' is non-nil, then
38971
478f11ee1d4c (comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents: 38848
diff changeset
1432 return the current line with any initial string matching the
478f11ee1d4c (comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents: 38848
diff changeset
1433 regexp `comint-prompt-regexp' removed.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1434 `comint-input-filter-functions' monitors input for \"cd\", \"pushd\", and
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1435 \"popd\" commands. When it sees one, it cd's the buffer.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1436 `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
1437 space.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1438
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1439 If the Comint is Lucid Common Lisp,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1440 `comint-get-old-input' snarfs the sexp ending at point.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1441 `comint-input-filter-functions' does nothing.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1442 `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
1443 which matches (1) all whitespace (2) :a, :c, etc.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1444
909
4c6cdb66c74c *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1445 Similarly for Soar, Scheme, etc."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1446 (interactive)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1447 ;; 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
1448 (let ((proc (get-buffer-process (current-buffer))))
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1449 (if (not proc) (error "Current buffer has no process")
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1450 (let* ((pmark (process-mark proc))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1451 (intxt (if (>= (point) (marker-position pmark))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1452 (progn (if comint-eol-on-send (end-of-line))
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1453 (buffer-substring pmark (point)))
705
c7d478752305 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 662
diff changeset
1454 (let ((copy (funcall comint-get-old-input)))
c7d478752305 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 662
diff changeset
1455 (goto-char pmark)
c7d478752305 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 662
diff changeset
1456 (insert copy)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1457 copy)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1458 (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
1459 ;; Just whatever's already there
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1460 intxt
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1461 ;; 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
1462 (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
1463 (buffer-substring pmark (point))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1464 (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
1465 input
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1466 ;; This is messy 'cos ultimately the original
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1467 ;; functions used do insertion, rather than return
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1468 ;; 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
1469 (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
1470 (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
1471 (start (point)))
7af8470b665a Use insert to preserve marker positions (pmark) and delete last.
Simon Marshall <simon@gnu.org>
parents: 17652
diff changeset
1472 (insert input)
7af8470b665a Use insert to preserve marker positions (pmark) and delete last.
Simon Marshall <simon@gnu.org>
parents: 17652
diff changeset
1473 (delete-region pmark start)
5166
7e66b092f331 (comint-send-input): Don't call comint-arguments
Richard M. Stallman <rms@gnu.org>
parents: 5152
diff changeset
1474 copy))))
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1475
42693
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
1476 (unless no-newline
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
1477 (insert ?\n))
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1478
33138
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1479 (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
1480
12208
d10ef5c093ce (comint-mode): Use make-local-hook.
Karl Heuer <kwzh@gnu.org>
parents: 12058
diff changeset
1481 (run-hook-with-args 'comint-input-filter-functions
42693
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
1482 (if no-newline input
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
1483 (concat input "\n")))
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1484
30325
a7f5f8fff5b2 (comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents: 29883
diff changeset
1485 (let ((beg (marker-position pmark))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1486 (end (if no-newline (point) (1- (point))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1487 (inhibit-modification-hooks t))
45770
159963013ec6 (comint-send-input): Properly handle empty and no-newline input regions.
Miles Bader <miles@gnu.org>
parents: 45732
diff changeset
1488 (when (> end beg)
45732
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1489 ;; Set text-properties for the input field
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1490 (add-text-properties
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1491 beg end
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1492 '(front-sticky t
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1493 font-lock-face comint-highlight-input
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1494 mouse-face highlight
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1495 help-echo "mouse-2: insert after prompt as new input"))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1496 (unless comint-use-prompt-regexp
45732
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1497 ;; Give old user input a field property of `input', to
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1498 ;; distinguish it from both process output and unsent
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1499 ;; input. The terminating newline is put into a special
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1500 ;; `boundary' field to make cursor movement between input
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1501 ;; and output fields smoother.
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1502 (put-text-property beg end 'field 'input)))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1503 (unless (or no-newline comint-use-prompt-regexp)
45732
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1504 ;; Cover the terminating newline
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1505 (add-text-properties end (1+ end)
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1506 '(rear-nonsticky t
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1507 field boundary
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1508 inhibit-line-move-field-capture t))))
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1509
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1510 (comint-snapshot-last-prompt)
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1511
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
1512 (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
1513 (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
1514 ;; 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
1515 ;; in case we get output amidst sending the input.
705
c7d478752305 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 662
diff changeset
1516 (set-marker comint-last-input-start pmark)
c7d478752305 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 662
diff changeset
1517 (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
1518 (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
1519 ;; clear the "accumulation" marker
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
1520 (set-marker comint-accum-marker nil)
42693
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
1521 (let ((comint-input-sender-no-newline no-newline))
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
1522 (funcall comint-input-sender proc input))
39182
ed28d0187d3c (comint-send-input): Handle comint-process-echoes
Gerd Moellmann <gerd@gnu.org>
parents: 39124
diff changeset
1523
ed28d0187d3c (comint-send-input): Handle comint-process-echoes
Gerd Moellmann <gerd@gnu.org>
parents: 39124
diff changeset
1524 ;; Optionally delete echoed input (after checking it).
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1525 (when (and comint-process-echoes (not artificial))
39240
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1526 (let ((echo-len (- comint-last-input-end
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1527 comint-last-input-start)))
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1528 ;; Wait for all input to be echoed:
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1529 (while (and (accept-process-output proc)
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1530 (> (+ comint-last-input-end echo-len)
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1531 (point-max))
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1532 (zerop
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1533 (compare-buffer-substrings
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1534 nil comint-last-input-start
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1535 (- (point-max) echo-len)
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1536 ;; Above difference is equivalent to
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1537 ;; (+ comint-last-input-start
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1538 ;; (- (point-max) comint-last-input-end))
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1539 nil comint-last-input-end (point-max)))))
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1540 (if (and
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1541 (<= (+ comint-last-input-end echo-len)
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1542 (point-max))
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1543 (zerop
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1544 (compare-buffer-substrings
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1545 nil comint-last-input-start comint-last-input-end
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1546 nil comint-last-input-end
e2d428b5bfea (comint-send-input): When waiting for echoed input, don't save the
Miles Bader <miles@gnu.org>
parents: 39182
diff changeset
1547 (+ comint-last-input-end echo-len))))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1548 ;; Certain parts of the text to be deleted may have
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1549 ;; been mistaken for prompts. We have to prevent
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1550 ;; problems when `comint-prompt-read-only' is non-nil.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1551 (let ((inhibit-read-only t))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1552 (delete-region comint-last-input-end
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1553 (+ comint-last-input-end echo-len))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1554 (when comint-prompt-read-only
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1555 (save-excursion
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1556 (goto-char comint-last-input-end)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1557 (comint-update-fence)))))))
39182
ed28d0187d3c (comint-send-input): Handle comint-process-echoes
Gerd Moellmann <gerd@gnu.org>
parents: 39124
diff changeset
1558
16546
06f92ef2857c (comint-output-filter): Run comint-output-filter-functions
Richard M. Stallman <rms@gnu.org>
parents: 16409
diff changeset
1559 ;; 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
1560 ;; 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
1561 (run-hook-with-args 'comint-output-filter-functions "")))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1562
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
1563 (defvar comint-preoutput-filter-functions nil
26616
615e184ede1b (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 26553
diff changeset
1564 "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
1565 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
1566 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
1567 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
1568 string.
615e184ede1b (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 26553
diff changeset
1569
615e184ede1b (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 26553
diff changeset
1570 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
1571 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
1572 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
1573 redirection buffer.
26616
615e184ede1b (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 26553
diff changeset
1574
43579
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1575 You can use `add-hook' to add functions to this list
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1576 either globally or locally.")
19515
a0ecbe13b54b (comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18805
diff changeset
1577
46941
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1578 (defvar comint-inhibit-carriage-motion nil
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1579 "If nil, Comint will interpret `carriage control' characters in output.
46941
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1580 See `comint-carriage-motion' for details.")
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1581
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1582 ;; 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
1583 ;; 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
1584 (defvar comint-last-prompt-overlay nil)
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1585
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1586 (defun comint-snapshot-last-prompt ()
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1587 "`snapshot' any current `comint-last-prompt-overlay'.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1588 Freeze its attributes in place, even when more input comes along
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1589 and moves the prompt overlay."
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1590 (when comint-last-prompt-overlay
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1591 (let ((inhibit-read-only t)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1592 (inhibit-modification-hooks t))
45826
ffa13f09e36d (comint-snapshot-last-prompt): Bind `inhibit-read-only' to t to support
Juanma Barranquero <lekktu@gmail.com>
parents: 45794
diff changeset
1593 (add-text-properties (overlay-start comint-last-prompt-overlay)
ffa13f09e36d (comint-snapshot-last-prompt): Bind `inhibit-read-only' to t to support
Juanma Barranquero <lekktu@gmail.com>
parents: 45794
diff changeset
1594 (overlay-end comint-last-prompt-overlay)
ffa13f09e36d (comint-snapshot-last-prompt): Bind `inhibit-read-only' to t to support
Juanma Barranquero <lekktu@gmail.com>
parents: 45794
diff changeset
1595 (overlay-properties comint-last-prompt-overlay)))))
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1596
46941
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1597 (defun comint-carriage-motion (start end)
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1598 "Interpret carriage control characters in the region from START to END.
37928
689e6d3dbdc2 (comint-carriage-motion): Doc-string tweaks.
Miles Bader <miles@gnu.org>
parents: 37921
diff changeset
1599 Translate carriage return/linefeed sequences to linefeeds.
689e6d3dbdc2 (comint-carriage-motion): Doc-string tweaks.
Miles Bader <miles@gnu.org>
parents: 37921
diff changeset
1600 Make single carriage returns delete to the beginning of the line.
46941
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1601 Make backspaces delete the previous character."
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1602 (save-excursion
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1603 ;; First do a quick check to see if there are any applicable
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1604 ;; characters, so we can avoid calling save-match-data and
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1605 ;; save-restriction if not.
47073
714225426f8e (comint-carriage-motion): Start at START.
Miles Bader <miles@gnu.org>
parents: 46941
diff changeset
1606 (goto-char start)
46941
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1607 (when (< (skip-chars-forward "^\b\r" end) (- end start))
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1608 (save-match-data
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1609 (save-restriction
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1610 (widen)
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1611 (let ((inhibit-field-text-motion t)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1612 (inhibit-read-only t))
46941
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1613 ;; CR LF -> LF
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1614 ;; Note that this won't work properly when the CR and LF
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1615 ;; are in different output chunks, but this is probably an
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1616 ;; exceedingly rare case (because they are generally
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1617 ;; written as a unit), and to delay interpretation of a
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1618 ;; trailing CR in a chunk would result in odd interactive
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1619 ;; behavior (and this case is probably far more common).
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1620 (while (re-search-forward "\r$" end t)
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1621 (delete-char -1))
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1622 ;; bare CR -> delete preceding line
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1623 (goto-char start)
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1624 (while (search-forward "\r" end t)
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1625 (delete-region (point) (line-beginning-position)))
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1626 ;; BS -> delete preceding character
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1627 (goto-char start)
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1628 (while (search-forward "\b" end t)
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1629 (delete-char -2))))))))
39182
ed28d0187d3c (comint-send-input): Handle comint-process-echoes
Gerd Moellmann <gerd@gnu.org>
parents: 39124
diff changeset
1630
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1631 ;; 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
1632 ;; 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
1633 ;; when output is inserted.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1634 (defun comint-output-filter (process string)
4939
d9ad390ef4e3 (comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents: 4928
diff changeset
1635 (let ((oprocbuf (process-buffer process)))
26174
6860bca6e233 (comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents: 25443
diff changeset
1636 ;; 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
1637 (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
1638 (with-current-buffer oprocbuf
30740
46364997df9c (comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents: 30735
diff changeset
1639 ;; Run preoutput filters
26174
6860bca6e233 (comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents: 25443
diff changeset
1640 (let ((functions comint-preoutput-filter-functions))
6860bca6e233 (comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents: 25443
diff changeset
1641 (while (and functions string)
43579
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1642 (if (eq (car functions) t)
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1643 (let ((functions (default-value 'comint-preoutput-filter-functions)))
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1644 (while (and functions string)
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1645 (setq string (funcall (car functions) string))
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1646 (setq functions (cdr functions))))
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1647 (setq string (funcall (car functions) string)))
26174
6860bca6e233 (comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents: 25443
diff changeset
1648 (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
1649
30958
ec347dd209e8 (comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents: 30782
diff changeset
1650 ;; Insert STRING
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1651 (let ((inhibit-read-only t)
30958
ec347dd209e8 (comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents: 30782
diff changeset
1652 ;; 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
1653 ;; fiddle with the point
30964
c6ebff75e052 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 30958
diff changeset
1654 (saved-point (point-marker)))
30740
46364997df9c (comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents: 30735
diff changeset
1655
31038
9e1d7707876b (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 30964
diff changeset
1656 ;; The point should float after any insertion we do
9e1d7707876b (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 30964
diff changeset
1657 (set-marker-insertion-type saved-point t)
9e1d7707876b (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 30964
diff changeset
1658
30958
ec347dd209e8 (comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents: 30782
diff changeset
1659 ;; 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
1660 ;; 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
1661 (save-restriction
ec347dd209e8 (comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents: 30782
diff changeset
1662 (widen)
30740
46364997df9c (comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents: 30735
diff changeset
1663
30958
ec347dd209e8 (comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents: 30782
diff changeset
1664 (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
1665 (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
1666
31581
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1667 ;; insert-before-markers is a bad thing. XXX
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1668 ;;
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1669 ;; It is used here to force window-point markers (used to
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1670 ;; store the value of point in non-selected windows) to
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1671 ;; advance, but it also screws up any other markers that we
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1672 ;; 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
1673 ;; of the overlays we create.
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1674 ;;
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1675 ;; We work around the problem with the overlays by
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1676 ;; explicitly adjusting them after we do the insertion, but
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1677 ;; in the future this problem should be solved correctly, by
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1678 ;; using `insert', and making the insertion-type of
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1679 ;; window-point markers settable (via a buffer-local
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1680 ;; variable). In comint buffers, this variable would be set
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1681 ;; to `t', to cause point in non-select windows to advance.
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1682 (insert-before-markers string)
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1683 ;; Fixup markers and overlays that got screwed up because we
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1684 ;; used `insert-before-markers'.
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1685 (let ((old-point (- (point) (length string))))
32598
b7462e534fdc (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 32326
diff changeset
1686 ;; comint-last-output-start
31581
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1687 (set-marker comint-last-output-start old-point)
32598
b7462e534fdc (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 32326
diff changeset
1688 ;; comint-last-input-end
b7462e534fdc (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 32326
diff changeset
1689 (when (and comint-last-input-end
b7462e534fdc (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 32326
diff changeset
1690 (equal (marker-position comint-last-input-end)
b7462e534fdc (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 32326
diff changeset
1691 (point)))
b7462e534fdc (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 32326
diff changeset
1692 (set-marker comint-last-input-end old-point))
31581
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1693 ;; No overlays we create are set to advance upon insertion
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1694 ;; (at the start/end), so we assume that any overlay which
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1695 ;; is at the current point was incorrectly advanced by
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1696 ;; insert-before-markers. First fixup overlays that might
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1697 ;; start at point:
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1698 (dolist (over (overlays-at (point)))
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1699 (when (= (overlay-start over) (point))
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1700 (let ((end (overlay-end over)))
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1701 (move-overlay over
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1702 old-point
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1703 (if (= end (point)) old-point end)))))
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1704 ;; Then do overlays that might end at point:
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1705 (dolist (over (overlays-at (1- (point))))
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1706 (when (= (overlay-end over) (point))
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1707 (move-overlay over
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1708 (min (overlay-start over) old-point)
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1709 old-point))))
30958
ec347dd209e8 (comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents: 30782
diff changeset
1710
31581
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1711 ;; 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
1712 (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
1713
46941
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1714 (unless comint-inhibit-carriage-motion
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1715 ;; Interpret any carriage motion characters (newline, backspace)
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1716 (comint-carriage-motion comint-last-output-start (point)))
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1717
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1718 ;; Run these hooks with point where the user had it.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1719 (goto-char saved-point)
45916
e8271a03c1eb (comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents: 45898
diff changeset
1720 (run-hook-with-args 'comint-output-filter-functions string)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1721 (set-marker saved-point (point))
46941
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1722
45916
e8271a03c1eb (comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents: 45898
diff changeset
1723 (goto-char (process-mark process)) ; in case a filter moved it
e8271a03c1eb (comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents: 45898
diff changeset
1724
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1725 (unless comint-use-prompt-regexp
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1726 (let ((inhibit-read-only t)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1727 (inhibit-modification-hooks t))
45826
ffa13f09e36d (comint-snapshot-last-prompt): Bind `inhibit-read-only' to t to support
Juanma Barranquero <lekktu@gmail.com>
parents: 45794
diff changeset
1728 (add-text-properties comint-last-output-start (point)
ffa13f09e36d (comint-snapshot-last-prompt): Bind `inhibit-read-only' to t to support
Juanma Barranquero <lekktu@gmail.com>
parents: 45794
diff changeset
1729 '(rear-nonsticky t
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1730 field output
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1731 inhibit-line-move-field-capture t))))
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1732
45727
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
1733 ;; Highlight the prompt, where we define `prompt' to mean
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
1734 ;; the most recent output that doesn't end with a newline.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1735 (let ((prompt-start (save-excursion (forward-line 0) (point)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1736 (inhibit-read-only t)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1737 (inhibit-modification-hooks t))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1738 (when comint-prompt-read-only
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1739 (or (= (point-min) prompt-start)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1740 (get-text-property (1- prompt-start) 'read-only)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1741 (put-text-property
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1742 (1- prompt-start) prompt-start 'read-only 'fence))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1743 (add-text-properties
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1744 prompt-start (point)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1745 '(read-only t rear-nonsticky t front-sticky (read-only))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1746 (unless (and (bolp) (null comint-last-prompt-overlay))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1747 ;; Need to create or move the prompt overlay (in the case
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1748 ;; where there is no prompt ((bolp) == t), we still do
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1749 ;; this if there's already an existing overlay).
45727
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
1750 (if comint-last-prompt-overlay
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
1751 ;; Just move an existing overlay
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
1752 (move-overlay comint-last-prompt-overlay
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
1753 prompt-start (point))
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
1754 ;; Need to create the overlay
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
1755 (setq comint-last-prompt-overlay
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
1756 (make-overlay prompt-start (point)))
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
1757 (overlay-put comint-last-prompt-overlay
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
1758 'font-lock-face 'comint-highlight-prompt))))
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1759
45916
e8271a03c1eb (comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents: 45898
diff changeset
1760 (goto-char saved-point)))))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1761
4890
dab300dfe449 (comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 4880
diff changeset
1762 (defun comint-preinput-scroll-to-bottom ()
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1763 "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
1764 Movement occurs if point in the selected window is not after the process mark,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1765 and `this-command' is an insertion command. Insertion commands recognized
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1766 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
1767 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
1768
4890
dab300dfe449 (comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 4880
diff changeset
1769 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
1770 (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
1771 (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
1772 hilit-yank)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1773 (let* ((selected (selected-window))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1774 (current (current-buffer))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1775 (process (get-buffer-process current))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1776 (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
1777 (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
1778 (if (eq scroll 'this)
23f6d57ced16 (comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents: 5058
diff changeset
1779 (goto-char (point-max))
23f6d57ced16 (comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents: 5058
diff changeset
1780 (walk-windows
23f6d57ced16 (comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents: 5058
diff changeset
1781 (function (lambda (window)
23f6d57ced16 (comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents: 5058
diff changeset
1782 (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
1783 (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
1784 (progn
23f6d57ced16 (comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents: 5058
diff changeset
1785 (select-window window)
23f6d57ced16 (comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents: 5058
diff changeset
1786 (goto-char (point-max))
23f6d57ced16 (comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents: 5058
diff changeset
1787 (select-window selected)))))
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1788 nil t))))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1789
4890
dab300dfe449 (comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 4880
diff changeset
1790 (defun comint-postoutput-scroll-to-bottom (string)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1791 "Go to the end of buffer in some or all windows showing it.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1792 Does not scroll if the current line is the last line in the buffer.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1793 Depends on the value of `comint-move-point-for-output' and
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1794 `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
1795
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1796 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
1797 (let* ((selected (selected-window))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1798 (current (current-buffer))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1799 (process (get-buffer-process current))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1800 (scroll comint-move-point-for-output))
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1801 (unwind-protect
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1802 (if process
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1803 (walk-windows
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1804 (function (lambda (window)
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1805 (if (eq (window-buffer window) current)
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1806 (progn
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1807 (select-window window)
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1808 (if (and (< (point) (process-mark process))
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1809 (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
1810 ;; 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
1811 (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
1812 (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
1813 ;; If point was at the end, keep it at end.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
1814 (and (marker-position comint-last-output-start)
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
1815 (>= (point) comint-last-output-start))))
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1816 (goto-char (process-mark process)))
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1817 ;; Optionally scroll so that the text
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1818 ;; 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
1819 (if (and comint-scroll-show-maximum-output
48987
0bf251ecfd1a (comint-mode): Localy set scroll-conservatively.
Richard M. Stallman <rms@gnu.org>
parents: 47377
diff changeset
1820 (= (point) (point-max)))
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1821 (save-excursion
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1822 (goto-char (point-max))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1823 (recenter (- -1 scroll-margin))))
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1824 (select-window selected)))))
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1825 nil t))
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1826 (set-buffer current))))
2683
21ab70613c42 (comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2680
diff changeset
1827
10833
77d7d3990300 Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents: 10830
diff changeset
1828 (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
1829 "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
1830 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
1831 (interactive)
77d7d3990300 Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents: 10830
diff changeset
1832 (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
1833 (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
1834 (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
1835 (beginning-of-line)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1836 (let ((inhibit-read-only t))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1837 (delete-region (point-min) (point)))))
10833
77d7d3990300 Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents: 10830
diff changeset
1838
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
1839 (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
1840 "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
1841 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
1842 (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
1843 (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
1844 (save-excursion
20458
ad0d2c5040a0 (comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents: 20020
diff changeset
1845 (condition-case nil
ad0d2c5040a0 (comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents: 20020
diff changeset
1846 (goto-char
ad0d2c5040a0 (comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents: 20020
diff changeset
1847 (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
1848 (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
1849 (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
1850 (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
1851 (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
1852
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1853 (defun comint-show-maximum-output ()
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1854 "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
1855 (interactive)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1856 (goto-char (point-max))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1857 (recenter (- -1 scroll-margin)))
2683
21ab70613c42 (comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2680
diff changeset
1858
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1859 (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
1860 "Default for `comint-get-old-input'.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1861 If `comint-use-prompt-regexp' is nil, then either
38971
478f11ee1d4c (comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents: 38848
diff changeset
1862 return the current input field, if point is on an input field, or the
478f11ee1d4c (comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents: 38848
diff changeset
1863 current line, if point is on an output field.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1864 If `comint-use-prompt-regexp' is non-nil, then return
38971
478f11ee1d4c (comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents: 38848
diff changeset
1865 the current line with any initial string matching the regexp
478f11ee1d4c (comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents: 38848
diff changeset
1866 `comint-prompt-regexp' removed."
478f11ee1d4c (comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents: 38848
diff changeset
1867 (let ((bof (field-beginning)))
478f11ee1d4c (comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents: 38848
diff changeset
1868 (if (eq (get-char-property bof 'field) 'input)
45916
e8271a03c1eb (comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents: 45898
diff changeset
1869 (field-string-no-properties bof)
38971
478f11ee1d4c (comint-get-old-input-default): Don't signal an error if point is not on
Miles Bader <miles@gnu.org>
parents: 38848
diff changeset
1870 (comint-bol)
45732
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
1871 (buffer-substring-no-properties (point) (line-end-position)))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1872
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1873 (defun comint-skip-prompt ()
3386
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
1874 "Skip past the text matching regexp `comint-prompt-regexp'.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1875 If this takes us past the end of the current line, don't skip at all."
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1876 (if (and (looking-at comint-prompt-regexp)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1877 (<= (match-end 0) (line-end-position)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1878 (goto-char (match-end 0))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1879
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1880 (defun comint-after-pmark-p ()
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1881 "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
1882 (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
1883 (<= (marker-position pmark) (point))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1884
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1885 (defun comint-simple-send (proc string)
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1886 "Default function for sending to PROC input STRING.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1887 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
1888 set the hook `comint-input-sender'."
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1889 (comint-send-string proc string)
42693
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
1890 (if comint-input-sender-no-newline
42803
aeec841a65cf (comint-simple-send): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 42706
diff changeset
1891 (if (not (string-equal string ""))
42693
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
1892 (process-send-eof))
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
1893 (comint-send-string proc "\n")))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1894
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1895 (defun comint-line-beginning-position ()
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1896 "Return the buffer position of the beginning of the line, after any prompt.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1897 If `comint-use-prompt-regexp' is non-nil, then the prompt skip is done by
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1898 skipping text matching the regular expression `comint-prompt-regexp',
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1899 a buffer local variable."
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1900 (if comint-use-prompt-regexp
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1901 ;; Use comint-prompt-regexp
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1902 (save-excursion
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1903 (beginning-of-line)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1904 (comint-skip-prompt)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1905 (point))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1906 ;; 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
1907 ;; `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
1908 ;; 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
1909 ;; 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
1910 ;; 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
1911 ;; 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
1912 ;; (as input fields should be).
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1913 (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
1914
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1915 (defun comint-bol (&optional arg)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1916 "Go to the beginning of line, then skip past the prompt, if any.
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1917 If prefix argument is given (\\[universal-argument]) the prompt is not skipped.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1918 If `comint-use-prompt-regexp' is non-nil, then the prompt skip is done
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1919 by skipping text matching the regular expression `comint-prompt-regexp',
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1920 a buffer local variable."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1921 (interactive "P")
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1922 (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
1923 ;; 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
1924 (forward-line 0)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1925 (goto-char (comint-line-beginning-position))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1926
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1927 ;; For compatibility.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1928 (defun comint-read-noecho (prompt &optional ignore)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1929 (read-passwd prompt))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1930
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
1931 ;; 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
1932 ;; saved -- typically passwords to ftp, telnet, or somesuch.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1933 ;; Just enter m-x send-invisible and type in your line.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1934
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1935 (defun send-invisible (&optional prompt)
1356
dcf780f7ae1b Doc fix.
Christopher Zaborsky <rogue@erratum.com>
parents: 1131
diff changeset
1936 "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
1937 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
1938 The string is sent using `comint-input-sender'.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1939 Security bug: your string can still be temporarily recovered with
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1940 \\[view-lossage]; `clear-this-command-keys' can fix that."
17159
6f1e715cbd58 minor bug fixes/enhancements to comint-delchar-or-maybe-eof, send-invisible, comint-exec-1.
Simon Marshall <simon@gnu.org>
parents: 16944
diff changeset
1941 (interactive "P") ; Defeat snooping via C-x ESC ESC
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1942 (let ((proc (get-buffer-process (current-buffer)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1943 (prefix
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1944 (if (eq (window-buffer (selected-window)) (current-buffer))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1945 ""
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1946 (format "(In buffer %s) "
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1947 (current-buffer)))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1948 (if proc
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1949 (let ((str (read-passwd (concat prefix
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1950 (or prompt "Non-echoed text: ")))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1951 (if (stringp str)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1952 (progn
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1953 (comint-snapshot-last-prompt)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1954 (funcall comint-input-sender proc str))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1955 (message "Warning: text will be echoed")))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1956 (error "Buffer %s has no process" (current-buffer)))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1957
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
1958 (defun comint-watch-for-password-prompt (string)
6507
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
1959 "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
1960 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
1961 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
1962 `comint-password-prompt-regexp'.
6507
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
1963
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
1964 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
1965 (when (string-match comint-password-prompt-regexp string)
44663
0dc61586b801 (comint-watch-for-password-prompt): Remove whitespace
Francesco Potortì <pot@gnu.org>
parents: 44646
diff changeset
1966 (when (string-match "^[ \n\r\t\v\f\b\a]+" string)
0dc61586b801 (comint-watch-for-password-prompt): Remove whitespace
Francesco Potortì <pot@gnu.org>
parents: 44646
diff changeset
1967 (setq string (replace-match "" t t string)))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1968 (send-invisible string)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1969
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
1970 ;; Low-level process communication
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1971
30766
dacf4830a9a0 (comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents: 30740
diff changeset
1972 (defun comint-send-string (process string)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1973 "Like `process-send-string', but also does extra bookkeeping for Comint mode."
34606
52fc3d972e9c (comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents: 33182
diff changeset
1974 (if process
52fc3d972e9c (comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents: 33182
diff changeset
1975 (with-current-buffer (if (processp process)
52fc3d972e9c (comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents: 33182
diff changeset
1976 (process-buffer process)
52fc3d972e9c (comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents: 33182
diff changeset
1977 (get-buffer process))
52fc3d972e9c (comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents: 33182
diff changeset
1978 (comint-snapshot-last-prompt))
30766
dacf4830a9a0 (comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents: 30740
diff changeset
1979 (comint-snapshot-last-prompt))
dacf4830a9a0 (comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents: 30740
diff changeset
1980 (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
1981
dacf4830a9a0 (comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents: 30740
diff changeset
1982 (defun comint-send-region (process start end)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
1983 "Like `process-send-region', but also does extra bookkeeping for Comint mode."
34606
52fc3d972e9c (comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents: 33182
diff changeset
1984 (if process
52fc3d972e9c (comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents: 33182
diff changeset
1985 (with-current-buffer (if (processp process)
52fc3d972e9c (comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents: 33182
diff changeset
1986 (process-buffer process)
52fc3d972e9c (comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents: 33182
diff changeset
1987 (get-buffer process))
52fc3d972e9c (comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents: 33182
diff changeset
1988 (comint-snapshot-last-prompt))
30766
dacf4830a9a0 (comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents: 30740
diff changeset
1989 (comint-snapshot-last-prompt))
dacf4830a9a0 (comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents: 30740
diff changeset
1990 (process-send-region process start end))
39713
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
1991
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1992
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
1993 ;; Random input hackage
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1994
32613
6aece997f0f9 (comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents: 32598
diff changeset
1995 (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
1996 "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
1997 Does not delete the prompt."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1998 (interactive)
6998
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
1999 (let ((proc (get-buffer-process (current-buffer)))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2000 (replacement nil)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2001 (inhibit-read-only t))
6998
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2002 (save-excursion
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2003 (let ((pmark (progn (goto-char (process-mark proc))
32598
b7462e534fdc (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 32326
diff changeset
2004 (forward-line 0)
6998
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2005 (point-marker))))
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2006 (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
2007 (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
2008 (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
2009 (buffer-substring pmark (point))))
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2010 (delete-region pmark (point))))
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2011 ;; 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
2012 (comint-output-filter proc replacement)))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2013 (define-obsolete-function-alias 'comint-kill-output
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2014 'comint-delete-output "21.1")
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2015
32635
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2016 (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
2017 "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
2018 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
2019
32635
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2020 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
2021 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
2022
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2023 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
2024 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
2025 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
2026 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
2027 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
2028 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
2029 otherwise."
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2030 (interactive
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2031 (list (read-file-name
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2032 (if current-prefix-arg
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2033 "Append output to file: "
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2034 "Write output to file: "))
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2035 current-prefix-arg
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2036 (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
2037 (save-excursion
ba88cc6434f3 (comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents: 32623
diff changeset
2038 (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
2039 (forward-line 0)
32635
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2040 (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
2041 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
2042
32892
25182c4fd302 (comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents: 32852
diff changeset
2043 ;; 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
2044 ;; 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
2045 (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
2046 "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
2047 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
2048 (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
2049 (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
2050
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2051 (defun comint-show-output ()
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2052 "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
2053 Sets mark to the value of point when this command is run."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2054 (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
2055 (push-mark)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2056 (let ((pos (or (marker-position comint-last-input-end) (point-max))))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2057 (cond (comint-use-prompt-regexp
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2058 (goto-char pos)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2059 (beginning-of-line 0)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2060 (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
2061 (comint-skip-prompt))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2062 (t
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2063 (let* ((beg (field-beginning pos))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2064 (pt (if (= (point-min) beg)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2065 (point-min)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2066 (1+ beg))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2067 (goto-char pt))
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2068 (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
2069
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2070
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2071 (defun comint-interrupt-subjob ()
20894
962d8c41cfa2 (comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents: 20458
diff changeset
2072 "Interrupt the current subjob.
962d8c41cfa2 (comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents: 20458
diff changeset
2073 This command also kills the pending input
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2074 between the process mark and point."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2075 (interactive)
45836
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2076 (comint-skip-input)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2077 (interrupt-process nil comint-ptyp)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2078 ;; (process-send-string nil "\n")
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2079 )
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2080
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2081 (defun comint-kill-subjob ()
20894
962d8c41cfa2 (comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents: 20458
diff changeset
2082 "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
2083 This command also kills the pending input
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2084 between the process mark and point."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2085 (interactive)
45836
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2086 (comint-skip-input)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2087 (kill-process nil comint-ptyp))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2088
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2089 (defun comint-quit-subjob ()
20894
962d8c41cfa2 (comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents: 20458
diff changeset
2090 "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
2091 This command also kills the pending input
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2092 between the process mark and point."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2093 (interactive)
45836
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2094 (comint-skip-input)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2095 (quit-process nil comint-ptyp))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2096
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2097 (defun comint-stop-subjob ()
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2098 "Stop the current subjob.
20894
962d8c41cfa2 (comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents: 20458
diff changeset
2099 This command also kills the pending input
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2100 between the process mark and point.
20894
962d8c41cfa2 (comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents: 20458
diff changeset
2101
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2102 WARNING: if there is no current subjob, you can end up suspending
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2103 the top-level process running in the buffer. If you accidentally do
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2104 this, use \\[comint-continue-subjob] to resume the process. (This
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2105 is not a problem with most shells, since they ignore this signal.)"
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2106 (interactive)
45836
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2107 (comint-skip-input)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2108 (stop-process nil comint-ptyp))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2109
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2110 (defun comint-continue-subjob ()
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2111 "Send CONT signal to process buffer's process group.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2112 Useful if you accidentally suspend the top-level process."
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2113 (interactive)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2114 (continue-process nil comint-ptyp))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2115
45836
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2116 (defun comint-skip-input ()
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2117 "Skip all pending input, from last stuff output by interpreter to point.
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2118 This means mark it as if it had been sent as input, without sending it."
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2119 (let ((comint-input-sender 'ignore)
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2120 (comint-input-filter-functions nil))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2121 (comint-send-input t t))
45836
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2122 (end-of-line)
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2123 (let ((pos (point))
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2124 (marker (process-mark (get-buffer-process (current-buffer)))))
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2125 (insert " " (key-description (this-command-keys)))
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2126 (if (= marker pos)
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2127 (set-marker marker (point)))))
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2128
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2129 (defun comint-kill-input ()
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2130 "Kill all text from last stuff output by interpreter to point."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2131 (interactive)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2132 (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
2133 (if (> (point) (marker-position pmark))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2134 (kill-region pmark (point)))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2135
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2136 (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
2137 "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
2138 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
2139 (interactive "p")
17269
b177ee3c4f0e (comint-delchar-or-maybe-eof): Check for null proc.
Karl Heuer <kwzh@gnu.org>
parents: 17159
diff changeset
2140 (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
2141 (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
2142 (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
2143 (delete-char arg))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2144
4112
ab7dee78e335 (comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents: 3985
diff changeset
2145 (defun comint-send-eof ()
ab7dee78e335 (comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents: 3985
diff changeset
2146 "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
2147 (interactive)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2148 (comint-send-input t t)
4112
ab7dee78e335 (comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents: 3985
diff changeset
2149 (process-send-eof))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2150
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2151
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2152 (defun comint-backward-matching-input (regexp n)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2153 "Search backward through buffer for input fields that match REGEXP.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2154 If `comint-use-prompt-regexp' is non-nil, then input fields are identified
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2155 by lines that match `comint-prompt-regexp'.
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2156
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2157 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
2158 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
2159 (interactive (comint-regexp-arg "Backward input matching (regexp): "))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2160 (if comint-use-prompt-regexp
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2161 ;; Use comint-prompt-regexp
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2162 (let* ((re (concat comint-prompt-regexp ".*" regexp))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2163 (pos (save-excursion (end-of-line (if (> n 0) 0 1))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2164 (if (re-search-backward re nil t n)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2165 (point)))))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2166 (if (null pos)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2167 (progn (message "Not found")
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2168 (ding))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2169 (goto-char pos)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2170 (comint-bol nil)))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2171 ;; Use input fields
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2172 (let* ((dir (if (< n 0) -1 1))
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2173 (pos
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2174 (save-excursion
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2175 (while (/= n 0)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2176 (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
2177 (error "Not found"))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2178 (when (eq (get-char-property (point) 'field) 'input)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2179 (setq n (- n dir))))
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2180 (field-beginning))))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2181 (goto-char pos))))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2182
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2183
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2184 (defun comint-forward-matching-input (regexp n)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2185 "Search forward through buffer for input fields that match REGEXP.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2186 If `comint-use-prompt-regexp' is non-nil, then input fields are identified
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2187 by lines that match `comint-prompt-regexp'.
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2188
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2189 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
2190 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
2191 (interactive (comint-regexp-arg "Forward input matching (regexp): "))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2192 (comint-backward-matching-input regexp (- n)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2193
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2194
4112
ab7dee78e335 (comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents: 3985
diff changeset
2195 (defun comint-next-prompt (n)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2196 "Move to end of Nth next prompt in the buffer.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2197 If `comint-use-prompt-regexp' is nil, then this means the beginning of
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2198 the Nth next `input' field, otherwise, it means the Nth occurrence of
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2199 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
2200 (interactive "p")
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2201 (if comint-use-prompt-regexp
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2202 ;; Use comint-prompt-regexp
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2203 (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
2204 (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
2205 (forward-paragraph n)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2206 (comint-skip-prompt))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2207 ;; Use input fields
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2208 (let ((pos (point))
38977
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2209 (input-pos nil)
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2210 prev-pos)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2211 (while (/= n 0)
38977
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2212 (setq prev-pos pos)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2213 (setq pos
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2214 (if (> n 0)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2215 (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
2216 (previous-single-char-property-change pos 'field)))
38977
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2217 (cond ((or (null pos) (= pos prev-pos))
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2218 ;; Ran off the end of the buffer.
38977
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2219 (when (> n 0)
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2220 ;; There's always an input field at the end of the
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2221 ;; buffer, but it has a `field' property of nil.
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2222 (setq input-pos (point-max)))
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2223 ;; stop iterating
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2224 (setq n 0))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2225 ((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
2226 (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
2227 (setq input-pos pos))))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2228 (when input-pos
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2229 (goto-char input-pos)))))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2230
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2231
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2232 (defun comint-previous-prompt (n)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2233 "Move to end of Nth previous prompt in the buffer.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2234 If `comint-use-prompt-regexp' is nil, then this means the beginning of
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2235 the Nth previous `input' field, otherwise, it means the Nth occurrence of
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2236 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
2237 (interactive "p")
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2238 (comint-next-prompt (- n)))
39713
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2239
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2240 ;; State used by `comint-insert-previous-argument' when cycling.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2241 (defvar comint-insert-previous-argument-last-start-pos nil)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2242 (make-variable-buffer-local 'comint-insert-previous-argument-last-start-pos)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2243 (defvar comint-insert-previous-argument-last-index nil)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2244 (make-variable-buffer-local 'comint-insert-previous-argument-last-index)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2245
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2246 ;; Needs fixing:
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2247 ;; make comint-arguments understand negative indices as bash does
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2248 (defun comint-insert-previous-argument (index)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2249 "Insert the INDEXth argument from the previous Comint command-line at point.
39713
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2250 Spaces are added at beginning and/or end of the inserted string if
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2251 necessary to ensure that it's separated from adjacent arguments.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2252 Interactively, if no prefix argument is given, the last argument is inserted.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2253 Repeated interactive invocations will cycle through the same argument
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2254 from progressively earlier commands (using the value of INDEX specified
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2255 with the first command).
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2256 This command is like `M-.' in bash."
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2257 (interactive "P")
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2258 (unless (null index)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2259 (setq index (prefix-numeric-value index)))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2260 (cond ((eq last-command this-command)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2261 ;; Delete last input inserted by this command.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2262 (delete-region comint-insert-previous-argument-last-start-pos (point))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2263 (setq index comint-insert-previous-argument-last-index))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2264 (t
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2265 ;; This is a non-repeat invocation, so initialize state.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2266 (setq comint-input-ring-index nil)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2267 (setq comint-insert-previous-argument-last-index index)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2268 (when (null comint-insert-previous-argument-last-start-pos)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2269 ;; First usage; initialize to a marker
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2270 (setq comint-insert-previous-argument-last-start-pos
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2271 (make-marker)))))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2272 ;; Make sure we're not in the prompt, and add a beginning space if necess.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2273 (if (<= (point) (comint-line-beginning-position))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2274 (comint-bol)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2275 (just-one-space))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2276 ;; Remember the beginning of what we insert, so we can delete it if
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2277 ;; the command is repeated.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2278 (set-marker comint-insert-previous-argument-last-start-pos (point))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2279 ;; Insert the argument.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2280 (let ((input-string (comint-previous-input-string 0)))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2281 (when (string-match "[ \t\n]*&" input-string)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2282 ;; strip terminating '&'
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2283 (setq input-string (substring input-string 0 (match-beginning 0))))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2284 (insert (comint-arguments input-string index index)))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2285 ;; Make next invocation return arg from previous input
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2286 (setq comint-input-ring-index (1+ (or comint-input-ring-index 0)))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2287 ;; Add a terminating space if necessary.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2288 (unless (eolp)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2289 (just-one-space)))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2290
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2291
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2292 ;; Support editing with `comint-prompt-read-only' set to t.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2293
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2294 (defun comint-update-fence ()
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2295 "Update read-only status of newline before point.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2296 The `fence' read-only property is used to indicate that a newline
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2297 is read-only for no other reason than to \"fence off\" a
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2298 following front-sticky read-only region. This is used to
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2299 implement comint read-only prompts. If the text after a newline
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2300 changes, the read-only status of that newline may need updating.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2301 That is what this function does.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2302
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2303 This function does nothing if point is not at the beginning of a
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2304 line, or is at the beginning of the accessible portion of the buffer.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2305 Otherwise, if the character after point has a front-sticky
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2306 read-only property, then the preceding newline is given a
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2307 read-only property of `fence', unless it already is read-only.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2308 If the character after point does not have a front-sticky
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2309 read-only property, any read-only property of `fence' on the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2310 preceding newline is removed."
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2311 (let* ((pt (point)) (lst (get-text-property pt 'front-sticky))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2312 (inhibit-modification-hooks t))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2313 (and (bolp)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2314 (not (bobp))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2315 (if (and (get-text-property pt 'read-only)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2316 (if (listp lst) (memq 'read-only lst) t))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2317 (unless (get-text-property (1- pt) 'read-only)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2318 (put-text-property (1- pt) pt 'read-only 'fence))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2319 (when (eq (get-text-property (1- pt) 'read-only) 'fence)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2320 (remove-list-of-text-properties (1- pt) pt '(read-only)))))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2321
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2322 (defun comint-kill-whole-line (&optional arg)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2323 "Kill current line, ignoring read-only and field properties.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2324 With prefix arg, kill that many lines starting from the current line.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2325 If arg is negative, kill backward. Also kill the preceding newline,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2326 instead of the trailing one. \(This is meant to make \\[repeat] work well
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2327 with negative arguments.)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2328 If arg is zero, kill current line but exclude the trailing newline.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2329 The read-only status of newlines is updated with `comint-update-fence',
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2330 if necessary."
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2331 (interactive "p")
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2332 (let ((inhibit-read-only t) (inhibit-field-text-motion t))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2333 (kill-whole-line arg)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2334 (when (>= arg 0) (comint-update-fence))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2335
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2336 (defun comint-kill-region (beg end &optional yank-handler)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2337 "Like `kill-region', but ignores read-only properties, if safe.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2338 This command assumes that the buffer contains read-only
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2339 \"prompts\" which are regions with front-sticky read-only
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2340 properties at the beginning of a line, with the preceding newline
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2341 being read-only to protect the prompt. This is true of the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2342 comint prompts if `comint-prompt-read-only' is non-nil. This
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2343 command will not delete the region if this would create mutilated
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2344 or out of place prompts. That is, if any part of a prompt is
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2345 deleted, the entire prompt must be deleted and all remaining
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2346 prompts should stay at the beginning of a line. If this is not
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2347 the case, this command just calls `kill-region' with all
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2348 read-only properties intact. The read-only status of newlines is
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2349 updated using `comint-update-fence', if necessary."
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2350 (interactive "r")
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2351 (save-excursion
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2352 (let* ((true-beg (min beg end))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2353 (true-end (max beg end))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2354 (beg-bolp (progn (goto-char true-beg) (bolp)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2355 (beg-lst (get-text-property true-beg 'front-sticky))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2356 (beg-bad (and (get-text-property true-beg 'read-only)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2357 (if (listp beg-lst) (memq 'read-only beg-lst) t)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2358 (end-bolp (progn (goto-char true-end) (bolp)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2359 (end-lst (get-text-property true-end 'front-sticky))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2360 (end-bad (and (get-text-property true-end 'read-only)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2361 (if (listp end-lst) (memq 'read-only end-lst) t))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2362 (if (or (and (not beg-bolp) (or beg-bad end-bad))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2363 (and (not end-bolp) end-bad))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2364 (kill-region beg end yank-handler)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2365 (let ((inhibit-read-only t))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2366 (kill-region beg end yank-handler)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2367 (comint-update-fence))))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2368
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2369
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2370 ;; Support for source-file processing commands.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2371 ;;============================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2372 ;; Many command-interpreters (e.g., Lisp, Scheme, Soar) have
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2373 ;; commands that process files of source text (e.g. loading or compiling
42205
7308bbc423d5 Doc fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 42119
diff changeset
2374 ;; files). So the corresponding process-in-a-buffer modes have commands
7308bbc423d5 Doc fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 42119
diff changeset
2375 ;; for doing this (e.g., lisp-load-file). The functions below are useful
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2376 ;; for defining these commands.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2377 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2378 ;; 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
2379 ;; 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
2380 ;; So the compile/load interface gets the wrong default occasionally.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2381 ;; 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
2382 ;; doesn't know about the relationship between filename extensions and
42205
7308bbc423d5 Doc fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 42119
diff changeset
2383 ;; whether the file is source or executable. If you compile foo.lisp
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2384 ;; with compile-file, then the next load-file should use foo.bin for
42205
7308bbc423d5 Doc fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 42119
diff changeset
2385 ;; the default, not foo.lisp. This is tricky to do right, particularly
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2386 ;; 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
2387 ;; .lbin, .mo, .vo, .ao, ...).
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2388
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2389
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2390 ;; COMINT-SOURCE-DEFAULT -- determines defaults for source-file processing
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2391 ;; commands.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2392 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2393 ;; 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
2394 ;; 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
2395 ;; interpreter.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2396 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2397 ;; 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
2398 ;; for the file to process.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2399
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2400 (defun comint-source-default (previous-dir/file source-modes)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2401 "Compute the defaults for `load-file' and `compile-file' commands.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2402
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2403 PREVIOUS-DIR/FILE is a pair (DIRECTORY . FILENAME) from the last
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2404 source-file processing command, or nil if there hasn't been one yet.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2405 SOURCE-MODES is a list used to determine what buffers contain source
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2406 files: if the major mode of the buffer is in SOURCE-MODES, it's source.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2407 Typically, (lisp-mode) or (scheme-mode).
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2408
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2409 If the command is given while the cursor is inside a string, *and*
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2410 the string is an existing filename, *and* the filename is not a directory,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2411 then the string is taken as default. This allows you to just position
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2412 your cursor over a string that's a filename and have it taken as default.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2413
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2414 If the command is given in a file buffer whose major mode is in
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2415 SOURCE-MODES, then the filename is the default file, and the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2416 file's directory is the default directory.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2417
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2418 If the buffer isn't a source file buffer (e.g., it's the process buffer),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2419 then the default directory & file are what was used in the last source-file
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2420 processing command (i.e., PREVIOUS-DIR/FILE). If this is the first time
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2421 the command has been run (PREVIOUS-DIR/FILE is nil), the default directory
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2422 is the cwd, with no default file. (\"no default file\" = nil)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2423
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2424 SOURCE-MODES is typically going to be something like (tea-mode)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2425 for T programs, (lisp-mode) for Lisp programs, (soar-mode lisp-mode)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2426 for Soar programs, etc.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2427
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2428 The function returns a pair: (default-directory . default-file)."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2429 (cond ((and buffer-file-name (memq major-mode source-modes))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2430 (cons (file-name-directory buffer-file-name)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2431 (file-name-nondirectory buffer-file-name)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2432 (previous-dir/file)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2433 (t
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2434 (cons default-directory nil))))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2435
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2436
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2437 (defun comint-check-source (fname)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2438 "Check whether to save buffers visiting file FNAME.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2439 Prior to loading or compiling (or otherwise processing) a file (in the CMU
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2440 process-in-a-buffer modes), this function can be called on the filename.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2441 If the file is loaded into a buffer, and the buffer is modified, the user
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2442 is queried to see if he wants to save the buffer before proceeding with
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2443 the load or compile."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2444 (let ((buff (get-file-buffer fname)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2445 (if (and buff
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2446 (buffer-modified-p buff)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2447 (y-or-n-p (format "Save buffer %s first? " (buffer-name buff))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2448 ;; save BUFF.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2449 (let ((old-buffer (current-buffer)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2450 (set-buffer buff)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2451 (save-buffer)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2452 (set-buffer old-buffer)))))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2453
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2454 (defun comint-extract-string ()
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2455 "Return string around point, or nil."
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2456 (let ((syntax (syntax-ppss)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2457 (when (nth 3 syntax)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2458 (condition-case ()
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2459 (buffer-substring-no-properties (1+ (nth 8 syntax))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2460 (progn (goto-char (nth 8 syntax))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2461 (forward-sexp)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2462 (1- (point))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2463 (error nil)))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2464
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2465 (defun comint-get-source (prompt prev-dir/file source-modes mustmatch-p)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2466 "Prompt for filenames in commands that process source files,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2467 e.g. loading or compiling a file.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2468 Provides a default, if there is one, and returns the result filename.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2469
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2470 See `comint-source-default' for more on determining defaults.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2471
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2472 PROMPT is the prompt string. PREV-DIR/FILE is the (DIRECTORY . FILE) pair
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2473 from the last source processing command. SOURCE-MODES is a list of major
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2474 modes used to determine what file buffers contain source files. (These
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2475 two arguments are used for determining defaults.) If MUSTMATCH-P is true,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2476 then the filename reader will only accept a file that exists.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2477
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2478 A typical use:
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2479 (interactive (comint-get-source \"Compile file: \" prev-lisp-dir/file
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2480 '(lisp-mode) t))"
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2481 (let* ((def (comint-source-default prev-dir/file source-modes))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2482 (stringfile (comint-extract-string))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2483 (sfile-p (and stringfile
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2484 (condition-case ()
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2485 (file-exists-p stringfile)
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2486 (error nil))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2487 (not (file-directory-p stringfile))))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2488 (defdir (if sfile-p (file-name-directory stringfile)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2489 (car def)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2490 (deffile (if sfile-p (file-name-nondirectory stringfile)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2491 (cdr def)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2492 (ans (read-file-name (if deffile (format "%s(default %s) "
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2493 prompt deffile)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2494 prompt)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2495 defdir
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2496 (concat defdir deffile)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2497 mustmatch-p)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2498 (list (expand-file-name (substitute-in-file-name ans)))))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2499
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2500 ;; 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
2501 ;; 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
2502 ;; 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
2503 ;; 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
2504 ;; 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
2505 ;; on this.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2506 ;; -Olin
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2507
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2508
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2509 ;; Simple process query facility.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2510 ;; ===========================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2511 ;; 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
2512 ;; 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
2513 ;; 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
2514 ;; to an inferior Common Lisp process.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2515 ;;
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2516 ;; 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
2517 ;; 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
2518 ;; 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
2519 ;; 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
2520 ;; line. We just display the buffer. Low tech. Simple. Works good.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2521
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2522 (defun comint-proc-query (proc str)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2523 "Send to the inferior process PROC the string STR.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2524 Pop-up but do not select a window for the inferior process so that
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2525 its response can be seen."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2526 (let* ((proc-buf (process-buffer proc))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2527 (proc-mark (process-mark proc)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2528 (display-buffer proc-buf)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2529 (set-buffer proc-buf) ; but it's not the selected *window*
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2530 (let ((proc-win (get-buffer-window proc-buf))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2531 (proc-pt (marker-position proc-mark)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2532 (comint-send-string proc str) ; send the query
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2533 (accept-process-output proc) ; wait for some output
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2534 ;; Try to position the proc window so you can see the answer.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2535 ;; This is bogus code. If you delete the (sit-for 0), it breaks.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2536 ;; 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
2537 (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
2538 (let ((opoint (window-point proc-win)))
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2539 (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
2540 (sit-for 0)
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2541 (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
2542 (push-mark opoint)
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2543 (set-window-point proc-win opoint)))))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2544
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2545
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2546 ;; Filename/command/history completion in a buffer
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2547 ;; ===========================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2548 ;; Useful completion functions, courtesy of the Ergo group.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2549
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2550 ;; Six commands:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2551 ;; comint-dynamic-complete Complete or expand command, filename,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2552 ;; history at point.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2553 ;; comint-dynamic-complete-filename Complete filename at point.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2554 ;; comint-dynamic-list-filename-completions List completions in help buffer.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2555 ;; 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
2556 ;; replace with expanded/completed name.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2557 ;; 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
2558
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2559 ;; 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
2560 ;; available for people who want them. Shell-mode installs them:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2561 ;; (define-key shell-mode-map "\t" 'comint-dynamic-complete)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2562 ;; (define-key shell-mode-map "\M-?"
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2563 ;; 'comint-dynamic-list-filename-completions)))
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2564 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2565 ;; 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
2566 ;; want them present in specific modes.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2567
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2568 (defcustom comint-completion-autolist nil
13971
49207f2e2130 (comint-ptyp, comint-completion-autolist): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 13702
diff changeset
2569 "*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
2570 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
2571 :type 'boolean
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2572 :group 'comint-completion)
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2573
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2574 (defcustom comint-completion-addsuffix t
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2575 "*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
2576 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
2577 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
2578 This mirrors the optional behavior of tcsh."
33166
61e62bc5bd7f (comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents: 33138
diff changeset
2579 :type '(choice (const :tag "None" nil)
33167
e821d3197110 Capital in last change.
Dave Love <fx@gnu.org>
parents: 33166
diff changeset
2580 (const :tag "Add /" t)
33166
61e62bc5bd7f (comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents: 33138
diff changeset
2581 (cons :tag "Suffix pair"
61e62bc5bd7f (comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents: 33138
diff changeset
2582 (string :tag "Directory suffix")
61e62bc5bd7f (comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents: 33138
diff changeset
2583 (string :tag "File suffix")))
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2584 :group 'comint-completion)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2585
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2586 (defcustom comint-completion-recexact nil
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2587 "*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
2588 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
2589
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2590 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
2591 :type 'boolean
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2592 :group 'comint-completion)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2593
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2594 (defcustom comint-completion-fignore nil
6256
3810012eb29f (comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6239
diff changeset
2595 "*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
2596 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
2597
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2598 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
2599 :type '(repeat (string :tag "Suffix"))
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2600 :group 'comint-completion)
6256
3810012eb29f (comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6239
diff changeset
2601
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2602 ;;;###autoload
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2603 (defvar comint-file-name-prefix ""
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2604 "Prefix prepended to absolute file names taken from process input.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2605 This is used by Comint's and shell's completion functions, and by shell's
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2606 directory tracking functions.")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2607
15817
9e94b5fdaab1 (comint-file-name-chars): Was comint-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 15727
diff changeset
2608 (defvar comint-file-name-chars
49549
99be3a1e2589 Cygwin support patch.
Juanma Barranquero <lekktu@gmail.com>
parents: 48987
diff changeset
2609 (if (memq system-type '(ms-dos windows-nt cygwin))
21617
c944e3c8ebe2 (comint-filename-chars): Combine DOS and Windows strings.
Geoff Voelker <voelker@cs.washington.edu>
parents: 21243
diff changeset
2610 "~/A-Za-z0-9_^$!#%&{}@`'.,:()-"
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2611 "[]~/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
2612 "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
2613 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
2614 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
2615
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
2616 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
2617
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2618 (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
2619 "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
2620
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2621 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
2622
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2623
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2624 (defun comint-directory (directory)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2625 "Return expanded DIRECTORY, with `comint-file-name-prefix' if absolute."
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2626 (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
2627 (concat comint-file-name-prefix directory)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2628 directory)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2629
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2630
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2631 (defun comint-word (word-chars)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2632 "Return the word of WORD-CHARS at point, or nil if none is found.
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2633 Word constituents are considered to be those in WORD-CHARS, which is like the
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2634 inside of a \"[...]\" (see `skip-chars-forward'), plus all non-ASCII characters."
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2635 (save-excursion
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2636 (let ((here (point))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2637 giveup)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2638 (while (not giveup)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2639 (let ((startpoint (point)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2640 (skip-chars-backward (concat "\\\\" word-chars))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2641 ;; Fixme: This isn't consistent with Bash, at least -- not
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2642 ;; all non-ASCII chars should be word constituents.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2643 (if (and (> (- (point) 2) (point-min))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2644 (= (char-after (- (point) 2)) ?\\))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2645 (forward-char -2))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2646 (if (and (> (- (point) 1) (point-min))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2647 (>= (char-after (- (point) 1)) 128))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2648 (forward-char -1))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2649 (if (= (point) startpoint)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2650 (setq giveup t))))
12058
24c19691068e Don't go forward over a word-char if we're at bob, and set match-data.
Simon Marshall <simon@gnu.org>
parents: 11310
diff changeset
2651 ;; 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
2652 (when (< (point) here)
21152
8197c659e85c (comint-word): store-match-data => set-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 21018
diff changeset
2653 (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
2654 (match-string 0)))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2655
15369
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2656 (defun comint-substitute-in-file-name (filename)
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2657 "Return FILENAME with environment variables substituted.
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2658 Supports additional environment variable syntax of the command
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2659 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
2660 (let ((name (substitute-in-file-name filename)))
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2661 (if (memq system-type '(ms-dos windows-nt))
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2662 (let (env-var-name
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2663 env-var-val)
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2664 (save-match-data
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2665 (while (string-match "%\\([^\\\\/]*\\)%" name)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2666 (setq env-var-name
15369
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2667 (substring name (match-beginning 1) (match-end 1)))
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2668 (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
2669 (getenv env-var-name)
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2670 ""))
29883
53bc9bb1f0b8 (comint-substitute-in-file-name): Call replace-match
Gerd Moellmann <gerd@gnu.org>
parents: 29078
diff changeset
2671 (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
2672 name))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2673
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2674 (defun comint-match-partial-filename ()
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2675 "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
2676 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
2677 (let ((filename (comint-word comint-file-name-chars)))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2678 (and filename (comint-substitute-in-file-name
15369
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2679 (comint-unquote-filename filename)))))
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2680
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2681
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2682 (defun comint-quote-filename (filename)
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2683 "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
2684 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
2685 (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
2686 filename
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2687 (let ((regexp
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2688 (format "[%s]"
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2689 (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
2690 (save-match-data
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2691 (let ((i 0))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2692 (while (string-match regexp filename i)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2693 (setq filename (replace-match "\\\\\\&" nil nil filename))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2694 (setq i (1+ (match-end 0)))))
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2695 filename))))
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2696
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2697 (defun comint-unquote-filename (filename)
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2698 "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
2699 (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
2700 filename
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2701 (save-match-data
15337
cf1e6f4dd2b0 (comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents: 14814
diff changeset
2702 (let ((i 0))
cf1e6f4dd2b0 (comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents: 14814
diff changeset
2703 (while (string-match "\\\\\\(.\\)" filename i)
cf1e6f4dd2b0 (comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents: 14814
diff changeset
2704 (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
2705 (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
2706 filename)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2707
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2708
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2709 (defun comint-dynamic-complete ()
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2710 "Dynamically perform completion at point.
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2711 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
2712 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
2713 assumed to have occurred."
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2714 (interactive)
12208
d10ef5c093ce (comint-mode): Use make-local-hook.
Karl Heuer <kwzh@gnu.org>
parents: 12058
diff changeset
2715 (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
2716
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2717
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2718 (defun comint-dynamic-complete-filename ()
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2719 "Dynamically complete the filename at point.
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2720 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
2721 `comint-dynamic-complete-as-filename'.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2722 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
2723 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
2724 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
2725 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
2726
6256
3810012eb29f (comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6239
diff changeset
2727 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
2728 `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
2729 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
2730
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2731 Returns t if successful."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2732 (interactive)
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2733 (when (comint-match-partial-filename)
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2734 (unless (window-minibuffer-p (selected-window))
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2735 (message "Completing file name..."))
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2736 (comint-dynamic-complete-as-filename)))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2737
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2738 (defun comint-dynamic-complete-as-filename ()
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2739 "Dynamically complete at point as a filename.
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2740 See `comint-dynamic-complete-filename'. Returns t if successful."
49549
99be3a1e2589 Cygwin support patch.
Juanma Barranquero <lekktu@gmail.com>
parents: 48987
diff changeset
2741 (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt cygwin)))
6256
3810012eb29f (comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6239
diff changeset
2742 (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
2743 ;; 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
2744 ;; 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
2745 ;; 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
2746 ;;(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
2747 (minibuffer-p (window-minibuffer-p (selected-window)))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2748 (success t)
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2749 (dirsuffix (cond ((not comint-completion-addsuffix)
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2750 "")
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2751 ((not (consp comint-completion-addsuffix))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2752 "/")
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2753 (t
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2754 (car comint-completion-addsuffix))))
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2755 (filesuffix (cond ((not comint-completion-addsuffix)
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2756 "")
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2757 ((not (consp comint-completion-addsuffix))
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2758 " ")
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2759 (t
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2760 (cdr comint-completion-addsuffix))))
6847
9481abcaa7de (comint-dynamic-complete-as-filename): Simplify.
Karl Heuer <kwzh@gnu.org>
parents: 6797
diff changeset
2761 (filename (or (comint-match-partial-filename) ""))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2762 (filedir (file-name-directory filename))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2763 (filenondir (file-name-nondirectory filename))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2764 (directory (if filedir (comint-directory filedir) default-directory))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2765 (completion (file-name-completion filenondir directory)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2766 (cond ((null completion)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2767 (message "No completions of %s" filename)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2768 (setq success nil))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2769 ((eq completion t) ; Means already completed "file".
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2770 (insert filesuffix)
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2771 (unless minibuffer-p
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2772 (message "Sole completion")))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2773 ((string-equal completion "") ; Means completion on "directory/".
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2774 (comint-dynamic-list-filename-completions))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2775 (t ; Completion string returned.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2776 (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
2777 (insert (comint-quote-filename
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2778 (substring (directory-file-name completion)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2779 (length filenondir))))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2780 (cond ((symbolp (file-name-completion completion directory))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2781 ;; 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
2782 (insert (if (file-directory-p file) dirsuffix filesuffix))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2783 (unless minibuffer-p
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2784 (message "Completed")))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2785 ((and comint-completion-recexact comint-completion-addsuffix
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2786 (string-equal filenondir completion)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2787 (file-exists-p file))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2788 ;; It's not unique, but user wants shortest match.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2789 (insert (if (file-directory-p file) dirsuffix filesuffix))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2790 (unless minibuffer-p
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2791 (message "Completed shortest")))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2792 ((or comint-completion-autolist
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2793 (string-equal filenondir completion))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2794 ;; It's not unique, list possible completions.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2795 (comint-dynamic-list-filename-completions))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2796 (t
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2797 (unless minibuffer-p
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2798 (message "Partially completed")))))))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2799 success))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2800
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2801
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2802 (defun comint-replace-by-expanded-filename ()
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2803 "Dynamically expand and complete the filename at point.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2804 Replace the filename with an expanded, canonicalized and completed replacement.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2805 \"Expanded\" means environment variables (e.g., $HOME) and `~'s are replaced
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2806 with the corresponding directories. \"Canonicalized\" means `..' and `.' are
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2807 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
2808 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
2809 `comint-dynamic-complete-filename'."
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2810 (interactive)
43530
aee3db99fcca (comint-replace-by-expanded-filename): Do nothing if
Kim F. Storm <storm@cua.dk>
parents: 43492
diff changeset
2811 (let ((filename (comint-match-partial-filename)))
aee3db99fcca (comint-replace-by-expanded-filename): Do nothing if
Kim F. Storm <storm@cua.dk>
parents: 43492
diff changeset
2812 (when filename
aee3db99fcca (comint-replace-by-expanded-filename): Do nothing if
Kim F. Storm <storm@cua.dk>
parents: 43492
diff changeset
2813 (replace-match (expand-file-name filename) t t)
aee3db99fcca (comint-replace-by-expanded-filename): Do nothing if
Kim F. Storm <storm@cua.dk>
parents: 43492
diff changeset
2814 (comint-dynamic-complete-filename))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2815
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2816
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2817 (defun comint-dynamic-simple-complete (stub candidates)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2818 "Dynamically complete STUB from CANDIDATES list.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2819 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
2820 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
2821 if completion is ambiguous.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2822
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2823 Returns nil if no completion was inserted.
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2824 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
2825 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
2826 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
2827 Returns `listed' if a completion listing was shown.
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2828
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2829 See also `comint-dynamic-complete-filename'."
49549
99be3a1e2589 Cygwin support patch.
Juanma Barranquero <lekktu@gmail.com>
parents: 48987
diff changeset
2830 (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt cygwin)))
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2831 (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
2832 ((not (consp comint-completion-addsuffix)) " ")
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2833 (t (cdr comint-completion-addsuffix))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2834 (completions (all-completions stub candidates)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2835 (cond ((null completions)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2836 (message "No completions of %s" stub)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2837 nil)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2838 ((= 1 (length completions)) ; Gotcha!
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2839 (let ((completion (car completions)))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2840 (if (string-equal completion stub)
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2841 (message "Sole completion")
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2842 (insert (substring completion (length stub)))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2843 (message "Completed"))
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2844 (insert suffix)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2845 'sole))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2846 (t ; There's no unique completion.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2847 (let ((completion (try-completion stub candidates)))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2848 ;; Insert the longest substring.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2849 (insert (substring completion (length stub)))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2850 (cond ((and comint-completion-recexact comint-completion-addsuffix
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2851 (string-equal stub completion)
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2852 (member completion completions))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2853 ;; It's not unique, but user wants shortest match.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2854 (insert suffix)
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2855 (message "Completed shortest")
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2856 'shortest)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2857 ((or comint-completion-autolist
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2858 (string-equal stub completion))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2859 ;; It's not unique, list possible completions.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2860 (comint-dynamic-list-completions completions)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2861 'listed)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2862 (t
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2863 (message "Partially completed")
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2864 'partial)))))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2865
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2866
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2867 (defun comint-dynamic-list-filename-completions ()
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2868 "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
2869 (interactive)
49549
99be3a1e2589 Cygwin support patch.
Juanma Barranquero <lekktu@gmail.com>
parents: 48987
diff changeset
2870 (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt cygwin)))
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
2871 ;; 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
2872 ;; 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
2873 ;; 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
2874 ;;(file-name-handler-alist nil)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2875 (filename (or (comint-match-partial-filename) ""))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2876 (filedir (file-name-directory filename))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2877 (filenondir (file-name-nondirectory filename))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2878 (directory (if filedir (comint-directory filedir) default-directory))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2879 (completions (file-name-all-completions filenondir directory)))
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2880 (if (not completions)
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2881 (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
2882 (comint-dynamic-list-completions
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2883 (mapcar 'comint-quote-filename completions)))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2884
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2885
46171
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2886 ;; This is bound locally in a *Completions* buffer to the list of
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2887 ;; completions displayed, and is used to detect the case where the same
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2888 ;; command is repeatedly used without the set of completions changing.
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2889 (defvar comint-displayed-dynamic-completions nil)
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2890
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2891 (defvar comint-dynamic-list-completions-config nil)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2892
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2893 (defun comint-dynamic-list-completions (completions)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2894 "List in help buffer sorted COMPLETIONS.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2895 Typing SPC flushes the help buffer."
42669
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2896 (let ((window (get-buffer-window "*Completions*")))
46250
2c383709a149 (comint-dynamic-list-completions): Sort COMPLETIONS before first use.
Miles Bader <miles@gnu.org>
parents: 46171
diff changeset
2897 (setq completions (sort completions 'string-lessp))
42669
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2898 (if (and (eq last-command this-command)
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2899 window (window-live-p window) (window-buffer window)
46171
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2900 (buffer-name (window-buffer window))
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2901 ;; The above tests are not sufficient to detect the case where we
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2902 ;; should scroll, because the top-level interactive command may
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2903 ;; not have displayed a completions window the last time it was
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2904 ;; invoked, and there may be such a window left over from a
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2905 ;; previous completion command with a different set of
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2906 ;; completions. To detect that case, we also test that the set
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2907 ;; of displayed completions is in fact the same as the previously
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2908 ;; displayed set.
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2909 (equal completions
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2910 (buffer-local-value 'comint-displayed-dynamic-completions
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
2911 (window-buffer window))))
42669
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2912 ;; If this command was repeated, and
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2913 ;; there's a fresh completion window with a live buffer,
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2914 ;; and this command is repeated, scroll that window.
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2915 (with-current-buffer (window-buffer window)
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2916 (if (pos-visible-in-window-p (point-max) window)
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2917 (set-window-start window (point-min))
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2918 (save-selected-window
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2919 (select-window window)
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2920 (scroll-up))))
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
2921
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2922 ;; Display a completion list for the first time.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2923 (setq comint-dynamic-list-completions-config
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2924 (current-window-configuration))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2925 (with-output-to-temp-buffer "*Completions*"
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2926 (display-completion-list completions))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2927 (message "Type space to flush; repeat completion command to scroll"))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2928
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2929 ;; Read the next key, to process SPC.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2930 (let (key first)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2931 (if (with-current-buffer (get-buffer "*Completions*")
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2932 (set (make-local-variable 'comint-displayed-dynamic-completions)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2933 completions)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2934 (setq key (read-key-sequence nil)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2935 first (aref key 0))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2936 (and (consp first) (consp (event-start first))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2937 (eq (window-buffer (posn-window (event-start first)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2938 (get-buffer "*Completions*"))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2939 (eq (key-binding key) 'mouse-choose-completion)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2940 ;; If the user does mouse-choose-completion with the mouse,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2941 ;; execute the command, then delete the completion window.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2942 (progn
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2943 (mouse-choose-completion first)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2944 (set-window-configuration comint-dynamic-list-completions-config))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2945 (unless (eq first ?\s)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2946 (setq unread-command-events (listify-key-sequence key)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2947 (unless (eq first ?\t)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
2948 (set-window-configuration comint-dynamic-list-completions-config))))))
39713
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2949
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2950
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2951 (defun comint-get-next-from-history ()
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2952 "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
2953 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
2954 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
2955 (interactive)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2956 (if comint-save-input-ring-index
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2957 (progn
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2958 (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
2959 (comint-next-input 1))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2960 (message "No previous history command")))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2961
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2962 (defun comint-accumulate ()
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2963 "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
2964 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
2965 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
2966 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
2967 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
2968 when you send it."
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2969 (interactive)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2970 (insert "\n")
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2971 (set-marker comint-accum-marker (point))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2972 (if comint-input-ring-index
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2973 (setq comint-save-input-ring-index
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2974 (- comint-input-ring-index 1))))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2975
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2976 (defun comint-goto-process-mark ()
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2977 "Move point to the process mark.
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2978 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
2979 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
2980 (interactive)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2981 (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
2982 (error "Current buffer has no process"))))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2983 (goto-char (process-mark proc))
35236
ebc45a028f0f (comint-goto-process-mark): Don't print a message
Gerd Moellmann <gerd@gnu.org>
parents: 34977
diff changeset
2984 (when (interactive-p)
ebc45a028f0f (comint-goto-process-mark): Don't print a message
Gerd Moellmann <gerd@gnu.org>
parents: 34977
diff changeset
2985 (message "Point is now at the process mark"))))
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2986
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2987 (defun comint-bol-or-process-mark ()
24765
6c69a507d9bd (comint-bol-or-process-mark): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 24719
diff changeset
2988 "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
2989 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
2990 \(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
2991 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
2992
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
2993 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
2994 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
2995 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
2996 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
2997 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
2998 (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
2999 (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
3000 (comint-bol nil)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3001 (comint-goto-process-mark)))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3002
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3003 (defun comint-set-process-mark ()
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3004 "Set the process mark at point."
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3005 (interactive)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3006 (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
3007 (error "Current buffer has no process"))))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3008 (set-marker (process-mark proc) (point))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3009 (message "Process mark set")))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3010
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3011
42887
466c8a363992 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 42831
diff changeset
3012 ;; Author: Peter Breton <pbreton@cs.umb.edu>
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3013
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3014 ;; 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
3015 ;; 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
3016 ;; or buffers, and then go back to using the comint shell.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3017 ;;
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3018 ;; 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
3019 ;; query using the process associated with a comint-buffer, and save that
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3020 ;; somewhere else. Because the process might have state (for example, it
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3021 ;; 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
3022 ;; process and having it execute the query and then finish, would not
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3023 ;; work. I'm sure there are other uses as well, although in many cases
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3024 ;; starting a new process is the simpler, and thus preferable, approach.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3025 ;;
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3026 ;; The basic implementation is as follows: comint-redirect changes the
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3027 ;; preoutput filter functions (`comint-preoutput-filter-functions') to use
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3028 ;; its own filter. The filter puts the output into the designated buffer,
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3029 ;; or buffers, until it sees a regexp that tells it to stop (by default,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3030 ;; this is the prompt for the interpreter, `comint-prompt-regexp'). When it
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3031 ;; sees the stop regexp, it restores the old filter functions, and runs
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3032 ;; `comint-redirect-hook'.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3033 ;;
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3034 ;; 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
3035 ;; 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
3036 ;;
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3037 ;; 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
3038 ;; correct prompt for your interpreter, or that you supply a regexp that says
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3039 ;; when the redirection is finished. Otherwise, redirection will continue
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3040 ;; indefinitely. The code now does a sanity check to ensure that it can find
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3041 ;; 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
3042 ;; this prompt is set correctly.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3043 ;;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3044 ;; XXX: This doesn't work so well unless `comint-prompt-regexp' is set;
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
3045 ;; 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
3046 ;; 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
3047 ;;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3048 ;; Fixme: look for appropriate fields, rather than regexp, if
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3049 ;; `comint-use-prompt-regexp' is true.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3050
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3051 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3052 ;; Variables
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3053 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3054
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3055 (defcustom comint-redirect-verbose nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3056 "*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
3057 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
3058 :group 'comint
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3059 :type 'boolean)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3060
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3061 ;; Directly analagous to comint-preoutput-filter-functions
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3062 (defvar comint-redirect-filter-functions nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3063 "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
3064 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
3065 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
3066 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
3067 string.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3068
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3069 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
3070 the string returned by the previous one. The string returned by the
43579
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3071 last function is the text that is actually inserted in the redirection buffer.
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3072
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3073 You can use `add-hook' to add functions to this list
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3074 either globally or locally.")
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3075
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3076 ;; Internal variables
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3077
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3078 (defvar comint-redirect-output-buffer nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3079 "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
3080
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3081 (defvar comint-redirect-finished-regexp nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3082 "Regular expression that determines when to stop redirection in Comint.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3083 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
3084 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
3085
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3086 (defvar comint-redirect-insert-matching-regexp nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3087 "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
3088 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
3089 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
3090 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
3091
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3092 (defvar comint-redirect-echo-input nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3093 "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
3094
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3095 (defvar comint-redirect-completed nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3096 "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
3097
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3098 (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
3099 "Original mode line for redirected process.")
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3100
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3101 (defvar comint-redirect-perform-sanity-check t
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3102 "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
3103 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
3104 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
3105 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
3106 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
3107 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
3108 in the process buffer already.")
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3109
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3110 (defvar comint-redirect-original-filter-function nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3111 "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
3112 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
3113 this value.")
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3114
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3115 (defvar comint-redirect-subvert-readonly nil
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3116 "Non-nil means `comint-redirect' can insert into read-only buffers.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3117 This works by binding `inhibit-read-only' around the insertion.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3118 This is useful, for instance, for insertion into Help mode buffers.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3119 You probably want to set it locally to the output buffer.")
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3120
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3121 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3122 ;; Functions
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3123 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3124
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3125 (defun comint-redirect-setup (output-buffer
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3126 comint-buffer
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3127 finished-regexp
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3128 &optional echo-input)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3129 "Set up for output redirection.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3130 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
3131 to perform redirection.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3132
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3133 Output from COMINT-BUFFER is redirected to OUTPUT-BUFFER, until something
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3134 in the output matches FINISHED-REGEXP.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3135
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3136 If optional argument ECHO-INPUT is non-nil, output is echoed to the
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3137 original Comint buffer.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3138
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3139 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
3140 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
3141 (with-current-buffer comint-buffer
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3142
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3143 (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
3144 (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
3145
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3146 (make-local-variable 'comint-redirect-output-buffer)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3147 (setq comint-redirect-output-buffer output-buffer)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3148
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3149 (make-local-variable 'comint-redirect-finished-regexp)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3150 (setq comint-redirect-finished-regexp finished-regexp)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3151
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3152 (make-local-variable 'comint-redirect-echo-input)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3153 (setq comint-redirect-echo-input echo-input)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3154
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3155 (make-local-variable 'comint-redirect-completed)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3156 (setq comint-redirect-completed nil)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3157
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3158 (setq mode-line-process
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3159 (if mode-line-process
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3160 (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
3161 (list ":%s Redirection")))))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3162
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3163 (defun comint-redirect-cleanup ()
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3164 "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
3165 (interactive)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3166 ;; Restore the process filter
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3167 (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
3168 comint-redirect-original-filter-function)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3169 ;; Restore the mode line
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3170 (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
3171 ;; Set the completed flag
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3172 (setq comint-redirect-completed t))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3173
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3174 ;; 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
3175 ;; that it really occurs.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3176 (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
3177
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3178 (defun comint-redirect-filter (process input-string)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3179 "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
3180 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
3181 place output in.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3182
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3183 INPUT-STRING is the input from the Comint process.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3184
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3185 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
3186 end user."
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3187 (and process
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3188 (with-current-buffer (process-buffer process)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3189 (comint-redirect-preoutput-filter input-string)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3190 ;; 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
3191 (and comint-redirect-echo-input
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3192 comint-redirect-original-filter-function
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3193 (funcall comint-redirect-original-filter-function
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3194 process input-string)))))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3195
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3196
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3197 (defun comint-redirect-preoutput-filter (input-string)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3198 "Comint filter function which redirects Comint output to a buffer or buffers.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3199 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
3200 place output in.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3201
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3202 INPUT-STRING is the input from the Comint process.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3203
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3204 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
3205 (let ((output-buffer-list
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3206 (if (listp comint-redirect-output-buffer)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3207 comint-redirect-output-buffer
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3208 (list comint-redirect-output-buffer)))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3209 (filtered-input-string input-string))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3210
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3211 ;; 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
3212 (let ((functions comint-redirect-filter-functions))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3213 (while (and functions filtered-input-string)
43579
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3214 (if (eq (car functions) t)
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3215 ;; If a local value says "use the default value too",
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3216 ;; do that.
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3217 (let ((functions (default-value 'comint-redirect-filter-functions)))
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3218 (while (and functions filtered-input-string)
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3219 (setq filtered-input-string
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3220 (funcall (car functions) filtered-input-string))
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3221 (setq functions (cdr functions))))
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3222 (setq filtered-input-string
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3223 (funcall (car functions) filtered-input-string)))
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3224 (setq functions (cdr functions))))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3225
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3226 ;; Clobber `comint-redirect-finished-regexp'
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3227 (or comint-redirect-insert-matching-regexp
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3228 (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
3229 (setq filtered-input-string
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3230 (replace-match "" nil nil filtered-input-string))))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3231
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3232 ;; Send output to all registered buffers
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3233 (save-excursion
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3234 (dolist (buf output-buffer-list)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3235 ;; Set this buffer to the output buffer
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3236 (set-buffer (get-buffer-create buf))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3237 ;; Go to the end of the buffer
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3238 (goto-char (point-max))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3239 ;; Insert the output
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3240 (let ((inhibit-read-only comint-redirect-subvert-readonly))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3241 (insert filtered-input-string))))
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3242
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3243 ;; Message
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3244 (and comint-redirect-verbose
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3245 (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
3246 (mapconcat 'identity output-buffer-list " ")))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3247
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3248 ;; If we see the prompt, tidy up
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3249 ;; 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
3250 ;; clobber it
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3251 (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
3252 (progn
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3253 (and comint-redirect-verbose
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3254 (message "Redirection completed"))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3255 (comint-redirect-cleanup)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3256 (run-hooks 'comint-redirect-hook)))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3257 ;; Echo input?
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3258 (if comint-redirect-echo-input
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3259 filtered-input-string
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3260 "")))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3261
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3262 ;;;###autoload
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3263 (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
3264 "Send COMMAND to process in current buffer, with output to OUTPUT-BUFFER.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3265 With prefix arg ECHO, echo output in process buffer.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3266
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3267 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
3268 (interactive "sCommand: \nBOutput Buffer: \nP")
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3269 (let ((process (get-buffer-process (current-buffer))))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3270 (if process
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3271 (comint-redirect-send-command-to-process
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3272 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
3273 (error "No process for current buffer"))))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3274
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3275 ;;;###autoload
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3276 (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
3277 (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
3278 "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
3279 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
3280
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3281 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
3282 (interactive "sCommand: \nBOutput Buffer: \nbProcess Buffer: \nP")
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3283 (let* (;; The process buffer
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3284 (process-buffer (if (processp process)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3285 (process-buffer process)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3286 process))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3287 (proc (get-buffer-process process-buffer)))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3288 ;; Change to the process buffer
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3289 (with-current-buffer process-buffer
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3290
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3291 ;; Make sure there's a prompt in the current process buffer
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3292 (and comint-redirect-perform-sanity-check
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3293 (save-excursion
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3294 (goto-char (point-max))
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3295 (or (re-search-backward comint-prompt-regexp nil t)
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3296 (error "No prompt found or `comint-prompt-regexp' not set properly"))))
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3297
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3298 ;;;;;;;;;;;;;;;;;;;;;
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3299 ;; Set up for redirection
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3300 ;;;;;;;;;;;;;;;;;;;;;
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3301 (comint-redirect-setup
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3302 ;; Output Buffer
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3303 output-buffer
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3304 ;; Comint Buffer
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3305 (current-buffer)
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3306 ;; Finished Regexp
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3307 comint-prompt-regexp
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3308 ;; Echo input
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3309 echo)
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3310
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3311 ;;;;;;;;;;;;;;;;;;;;;
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3312 ;; Set the filter
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3313 ;;;;;;;;;;;;;;;;;;;;;
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3314 ;; Save the old filter
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3315 (setq comint-redirect-original-filter-function
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3316 (process-filter proc))
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3317 (set-process-filter proc 'comint-redirect-filter)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3318
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3319 ;;;;;;;;;;;;;;;;;;;;;
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3320 ;; Send the command
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3321 ;;;;;;;;;;;;;;;;;;;;;
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3322 (process-send-string
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3323 (current-buffer)
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3324 (concat command "\n"))
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3325
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3326 ;;;;;;;;;;;;;;;;;;;;;
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3327 ;; Show the output
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3328 ;;;;;;;;;;;;;;;;;;;;;
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3329 (or no-display
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3330 (display-buffer
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3331 (get-buffer-create
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3332 (if (listp output-buffer)
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3333 (car output-buffer)
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3334 output-buffer)))))))
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3335
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3336 ;;;###autoload
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3337 (defun comint-redirect-results-list (command regexp regexp-group)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3338 "Send COMMAND to current process.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3339 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
3340 REGEXP-GROUP is the regular expression group in REGEXP to use."
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3341 (comint-redirect-results-list-from-process
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3342 (get-buffer-process (current-buffer))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3343 command regexp regexp-group))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3344
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3345 ;;;###autoload
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3346 (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
3347 "Send COMMAND to PROCESS.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3348 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
3349 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
3350 (let ((output-buffer " *Comint Redirect Work Buffer*")
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3351 results)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3352 (save-excursion
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3353 (set-buffer (get-buffer-create output-buffer))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3354 (erase-buffer)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3355 (comint-redirect-send-command-to-process command
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3356 output-buffer process nil t)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3357 ;; Wait for the process to complete
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3358 (set-buffer (process-buffer process))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3359 (while (null comint-redirect-completed)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3360 (accept-process-output nil 1))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3361 ;; Collect the output
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3362 (set-buffer output-buffer)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3363 (goto-char (point-min))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3364 ;; 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
3365 (and (looking-at command)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3366 (forward-line))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3367 (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
3368 (setq results
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3369 (cons (buffer-substring-no-properties
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3370 (match-beginning regexp-group)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3371 (match-end regexp-group))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3372 results)))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3373 results)))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3374
29078
2e20146198ce Add to debug-ignored-errors.
Dave Love <fx@gnu.org>
parents: 28880
diff changeset
3375 (mapc (lambda (x)
2e20146198ce Add to debug-ignored-errors.
Dave Love <fx@gnu.org>
parents: 28880
diff changeset
3376 (add-to-list 'debug-ignored-errors x))
2e20146198ce Add to debug-ignored-errors.
Dave Love <fx@gnu.org>
parents: 28880
diff changeset
3377 '("^Not at command line$"
2e20146198ce Add to debug-ignored-errors.
Dave Love <fx@gnu.org>
parents: 28880
diff changeset
3378 "^Empty input ring$"
2e20146198ce Add to debug-ignored-errors.
Dave Love <fx@gnu.org>
parents: 28880
diff changeset
3379 "^No history$"
2e20146198ce Add to debug-ignored-errors.
Dave Love <fx@gnu.org>
parents: 28880
diff changeset
3380 "^Not found$" ; Too common?
2e20146198ce Add to debug-ignored-errors.
Dave Love <fx@gnu.org>
parents: 28880
diff changeset
3381 "^Current buffer has no process$"))
39713
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
3382
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3383
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3384 ;; Converting process modes to use comint mode
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3385 ;; ===========================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3386 ;; 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
3387 ;; 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
3388 ;; 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
3389 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3390 ;; Renaming variables
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3391 ;; 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
3392 ;; ones:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3393 ;; Local variables:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3394 ;; last-input-start comint-last-input-start
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3395 ;; last-input-end comint-last-input-end
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3396 ;; shell-prompt-pattern comint-prompt-regexp
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3397 ;; shell-set-directory-error-hook <no equivalent>
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3398 ;; Miscellaneous:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3399 ;; shell-set-directory <unnecessary>
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3400 ;; shell-mode-map comint-mode-map
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3401 ;; Commands:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3402 ;; shell-send-input comint-send-input
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3403 ;; shell-send-eof comint-delchar-or-maybe-eof
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3404 ;; kill-shell-input comint-kill-input
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3405 ;; interrupt-shell-subjob comint-interrupt-subjob
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3406 ;; stop-shell-subjob comint-stop-subjob
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3407 ;; quit-shell-subjob comint-quit-subjob
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3408 ;; 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
3409 ;; kill-output-from-shell comint-delete-output
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3410 ;; show-output-from-shell comint-show-output
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3411 ;; 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
3412 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3413 ;; SHELL-SET-DIRECTORY is gone, its functionality taken over by
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3414 ;; 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
3415 ;; Comint mode does not provide functionality equivalent to
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3416 ;; shell-set-directory-error-hook; it is gone.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3417 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3418 ;; 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
3419 ;; the buffer after input is sent, perhaps because the inferior
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3420 ;; 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
3421 ;; 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
3422 ;; 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
3423 ;; for this; the input history ring often does the job better.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3424 ;;
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3425 ;; 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
3426 ;; *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
3427 ;; 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
3428 ;; necessary comint-specific local variables. Then create the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3429 ;; 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
3430 ;; 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
3431 ;; (comint-{prompt-regexp, input-filter, input-filter-functions,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3432 ;; 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
3433 ;; 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
3434 ;; 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
3435 ;; is typical:
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3436 ;;
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3437 ;; (defvar shell-mode-map '())
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3438 ;; (cond ((not shell-mode-map)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3439 ;; (setq shell-mode-map (copy-keymap comint-mode-map))
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3440 ;; (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
3441 ;; (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
3442 ;; (define-key shell-mode-map "\t" 'comint-dynamic-complete)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3443 ;; (define-key shell-mode-map "\M-?"
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3444 ;; 'comint-dynamic-list-filename-completions)))
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3445 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3446 ;; (defun shell-mode ()
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3447 ;; (interactive)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3448 ;; (comint-mode)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3449 ;; (setq comint-prompt-regexp shell-prompt-pattern)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3450 ;; (setq major-mode 'shell-mode)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3451 ;; (setq mode-name "Shell")
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3452 ;; (use-local-map shell-mode-map)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3453 ;; (make-local-variable 'shell-directory-stack)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3454 ;; (setq shell-directory-stack nil)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3455 ;; (add-hook 'comint-input-filter-functions 'shell-directory-tracker)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3456 ;; (run-mode-hooks 'shell-mode-hook))
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3457 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3458 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3459 ;; Completion for comint-mode users
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3460 ;;
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3461 ;; 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
3462 ;; 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
3463 ;; 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
3464 ;; 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
3465 ;; completion job.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
3466
39713
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
3467
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
3468 (provide 'comint)
662
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 638
diff changeset
3469
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49549
diff changeset
3470 ;; arch-tag: 1793314c-09db-40be-9549-9aeae3e75164
38409
153f1b1f2efd Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 38073
diff changeset
3471 ;;; comint.el ends here