annotate lisp/comint.el @ 112453:06719a229a46 default tip

* calc/calc.el (calc-default-power-reference-level) (calc-default-field-reference-level): New variables. * calc/calc-units.el (math-standard-units): Add dB and Np. (math-logunits): New variable. (math-extract-logunits, math-logcombine, calcFunc-luplus) (calcFunc-luminus, calc-luplus, calc-luminus, math-logunit-level) (calcFunc-fieldlevel, calcFunc-powerlevel, calc-level): New functions. (math-find-base-units-rec): Add entry for ln(10). * calc/calc-help.el (calc-u-prefix-help): Add logarithmic help. (calc-ul-prefix-help): New function. * calc/calc-ext.el (calc-init-extensions): Autoload new units functions. Add keybindings for new units functions.
author Jay Belanger <jay.p.belanger@gmail.com>
date Sun, 23 Jan 2011 23:08:04 -0600
parents 9f7614f1a892
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
112284
61f7601898b1 Refill some copyright headers.
Glenn Morris <rgm@gnu.org>
parents: 112228
diff changeset
3 ;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
61f7601898b1 Refill some copyright headers.
Glenn Morris <rgm@gnu.org>
parents: 112228
diff changeset
4 ;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
61f7601898b1 Refill some copyright headers.
Glenn Morris <rgm@gnu.org>
parents: 112228
diff changeset
5 ;; 2010, 2011 Free Software Foundation, Inc.
662
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 638
diff changeset
6
38409
153f1b1f2efd Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 38073
diff changeset
7 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
25278
cbe304a26771 Fix maintainer address.
Karl Heuer <kwzh@gnu.org>
parents: 24968
diff changeset
8 ;; Simon Marshall <simon@gnu.org>
18805
b4b9772f0877 change maintainer.
Simon Marshall <simon@gnu.org>
parents: 17970
diff changeset
9 ;; Maintainer: FSF
2247
2c7997f249eb Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2025
diff changeset
10 ;; Keywords: processes
110015
280c8ae2476d Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents: 109658
diff changeset
11 ;; Package: emacs
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 811
diff changeset
12
909
4c6cdb66c74c *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
13 ;; This file is part of GNU Emacs.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
14
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93134
diff changeset
15 ;; GNU Emacs is free software: you can redistribute it and/or modify
909
4c6cdb66c74c *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
16 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93134
diff changeset
17 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93134
diff changeset
18 ;; (at your option) any later version.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
19
909
4c6cdb66c74c *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
20 ;; GNU Emacs is distributed in the hope that it will be useful,
4c6cdb66c74c *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
21 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
4c6cdb66c74c *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4c6cdb66c74c *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
23 ;; GNU General Public License for more details.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
24
909
4c6cdb66c74c *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
25 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93134
diff changeset
26 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
114
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
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
31 ;; (comint mode). The idea is that you can build specific process-in-a-buffer
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
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.
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
43 ;; - The file soar.el tunes Lisp and inferior-lisp modes for Soar.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
44 ;; - cmutex.el defines TeX and LaTeX modes that invoke TeX, LaTeX, BibTeX,
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
45 ;; previewers, and printers from within Emacs.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
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
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
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 ;;
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
64 ;; M-p comint-previous-input Cycle backwards in input history
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
65 ;; M-n comint-next-input Cycle forwards
106326
b7dca98d92a9 (comint-mode-map): Rebind `M-r' from
Juri Linkov <juri@jurta.org>
parents: 106206
diff changeset
66 ;; M-r comint-history-isearch-backward-regexp Isearch input regexp backward
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
67 ;; M-C-l comint-show-output Show last batch of process output
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
68 ;; RET comint-send-input
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
69 ;; C-d comint-delchar-or-maybe-eof Delete char unless at end of buff
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
70 ;; C-c C-a comint-bol-or-process-mark First time, move point to bol;
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
71 ;; second time, move to process-mark.
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
72 ;; C-c C-u comint-kill-input ^u
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
73 ;; C-c C-w backward-kill-word ^w
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
74 ;; C-c C-c comint-interrupt-subjob ^c
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
75 ;; C-c C-z comint-stop-subjob ^z
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
76 ;; C-c C-\ comint-quit-subjob ^\
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
77 ;; C-c C-o comint-delete-output Delete last batch of process output
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
78 ;; C-c C-r comint-show-output Show last batch of process output
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
79 ;; 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
80 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
81 ;; 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
82 ;; comint-run Run a program under comint-mode
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
83 ;; 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
84 ;; comint-dynamic-complete-filename Complete filename at point.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
85 ;; comint-dynamic-list-filename-completions List completions in help buffer.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
86 ;; 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
87 ;; replace with expanded/completed name.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
88 ;; comint-replace-by-expanded-history Expand history at point;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
89 ;; replace with expanded name.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
90 ;; comint-magic-space Expand history and add (a) space(s).
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
91 ;; comint-kill-subjob No mercy.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
92 ;; comint-show-maximum-output Show as much output as possible.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
93 ;; comint-continue-subjob Send CONT signal to buffer's process
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
94 ;; group. Useful if you accidentally
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
95 ;; suspend your process (with C-c C-z).
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
96 ;; comint-get-next-from-history Fetch successive input history lines
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
97 ;; comint-accumulate Combine lines to send them together
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
98 ;; as input.
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
99 ;; comint-goto-process-mark Move point to where process-mark is.
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
100 ;; comint-set-process-mark Set process-mark to point.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
101
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
102 ;; 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
103
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 793
diff changeset
104 ;;; Code:
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 793
diff changeset
105
1131
853d0d4c61fb entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 932
diff changeset
106 (require 'ring)
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
107
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
108 ;; Buffer Local Variables:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
109 ;;============================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
110 ;; Comint mode buffer local variables:
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
111 ;; comint-prompt-regexp string comint-bol uses to match prompt
15654
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
112 ;; comint-delimiter-argument-list list For delimiters and arguments
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
113 ;; comint-last-input-start marker Handy if inferior always echoes
32613
6aece997f0f9 (comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents: 32598
diff changeset
114 ;; comint-last-input-end marker For comint-delete-output command
15654
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
115 ;; comint-input-ring-size integer For the input history
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
116 ;; comint-input-ring ring mechanism
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
117 ;; comint-input-ring-index number ...
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
118 ;; comint-save-input-ring-index number ...
15654
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
119 ;; comint-input-autoexpand symbol ...
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
120 ;; comint-input-ignoredups boolean ...
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
121 ;; comint-dynamic-complete-functions hook For the completion mechanism
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
122 ;; comint-completion-fignore list ...
15817
9e94b5fdaab1 (comint-file-name-chars): Was comint-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 15727
diff changeset
123 ;; comint-file-name-chars string ...
15654
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
124 ;; comint-file-name-quote-list list ...
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
125 ;; comint-get-old-input function Hooks for specific
15654
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
126 ;; comint-input-filter-functions hook process-in-a-buffer
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
127 ;; comint-output-filter-functions hook function modes.
19515
a0ecbe13b54b (comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18805
diff changeset
128 ;; comint-preoutput-filter-functions hook
15654
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
129 ;; comint-input-filter function ...
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
130 ;; comint-input-sender function ...
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
131 ;; comint-eol-on-send boolean ...
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
132 ;; comint-process-echoes boolean ...
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
133 ;; comint-scroll-to-bottom-on-input symbol For scroll behavior
74693
901d51ff105a Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 74522
diff changeset
134 ;; comint-move-point-for-output symbol ...
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
135 ;; comint-scroll-show-maximum-output boolean ...
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
136 ;; comint-accum-marker maker For comint-accumulate
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
137 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
138 ;; Comint mode non-buffer local variables:
15654
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
139 ;; comint-completion-addsuffix boolean/cons For file name
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
140 ;; comint-completion-autolist boolean completion behavior
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
141 ;; comint-completion-recexact boolean ...
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
142
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
143 (defgroup comint nil
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
144 "General command interpreter in a window stuff."
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
145 :group 'processes)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
146
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
147 (defgroup comint-completion nil
64000
e1ccb8b46dea (comint-completion, comint-source): Finsh `degroup' descriptions with period.
Juanma Barranquero <lekktu@gmail.com>
parents: 63813
diff changeset
148 "Completion facilities in comint."
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
149 :group 'comint)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
150
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
151 (defgroup comint-source nil
64000
e1ccb8b46dea (comint-completion, comint-source): Finsh `degroup' descriptions with period.
Juanma Barranquero <lekktu@gmail.com>
parents: 63813
diff changeset
152 "Source finding facilities in comint."
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
153 :prefix "comint-"
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
154 :group 'comint)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
155
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
156 (defvar comint-prompt-regexp "^"
63502
f0f76b7d0f74 (comint-replace-by-expanded-filename, comint-prompt-regexp,
Juanma Barranquero <lekktu@gmail.com>
parents: 63175
diff changeset
157 "Regexp to recognize prompts in the inferior process.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
158 Defaults to \"^\", the null string at BOL.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
159
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
160 This variable is only used if the variable
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
161 `comint-use-prompt-regexp' is non-nil.
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
162
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
163 Good choices:
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
164 Canonical Lisp: \"^[^> \\n]*>+:? *\" (Lucid, franz, kcl, T, cscheme, oaklisp)
3985
fc25d1816641 * comint.el (comint-prompt-regexp): Double the backslashes in the
Jim Blandy <jimb@redhat.com>
parents: 3591
diff changeset
165 Lucid Common Lisp: \"^\\\\(>\\\\|\\\\(->\\\\)+\\\\) *\"
fc25d1816641 * comint.el (comint-prompt-regexp): Double the backslashes in the
Jim Blandy <jimb@redhat.com>
parents: 3591
diff changeset
166 franz: \"^\\\\(->\\\\|<[0-9]*>:\\\\) *\"
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
167 kcl: \"^>+ *\"
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
168 shell: \"^[^#$%>\\n]*[#$%>] *\"
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
169 T: \"^>+ *\"
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
170
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
171 This is a good thing to set in mode hooks.")
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
172
55223
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
173 (defcustom comint-prompt-read-only nil
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
174 "If non-nil, the comint prompt is read only.
55295
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
175 The read only region includes the newline before the prompt.
55223
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
176 This does not affect existing prompts.
55295
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
177 Certain derived modes may override this option.
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
178
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
179 If you set this option to t, then the safe way to temporarily
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
180 override the read-only-ness of comint prompts is to call
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
181 `comint-kill-whole-line' or `comint-kill-region' with no
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
182 narrowing in effect. This way you will be certain that none of
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
183 the remaining prompts will be accidentally messed up. You may
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
184 wish to put something like the following in your `.emacs' file:
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
185
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
186 \(add-hook 'comint-mode-hook
57419
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
187 (lambda ()
61302
aedce81482bf (comint-prompt-read-only): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 60898
diff changeset
188 (define-key comint-mode-map \"\\C-w\" 'comint-kill-region)
57419
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
189 (define-key comint-mode-map [C-S-backspace]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
190 'comint-kill-whole-line)))
55295
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
191
61368
015e8d66f6a0 (comint-prompt-read-only): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 61302
diff changeset
192 If you sometimes use comint-mode on text-only terminals or with `emacs -nw',
55295
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
193 you might wish to use another binding for `comint-kill-whole-line'."
55223
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
194 :type 'boolean
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
195 :group 'comint
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59776
diff changeset
196 :version "22.1")
55223
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
197
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
198 (defvar comint-delimiter-argument-list ()
63502
f0f76b7d0f74 (comint-replace-by-expanded-filename, comint-prompt-regexp,
Juanma Barranquero <lekktu@gmail.com>
parents: 63175
diff changeset
199 "List of characters to recognize as separate arguments in input.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
200 Strings comprising a character in this list will separate the arguments
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
201 surrounding them, and also be regarded as arguments in their own right (unlike
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
202 whitespace). See `comint-arguments'.
6154
385d5fe1c95c (comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents: 6148
diff changeset
203 Defaults to the empty list.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
204
6154
385d5fe1c95c (comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents: 6148
diff changeset
205 For shells, a good value is (?\\| ?& ?< ?> ?\\( ?\\) ?;).
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
206
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
207 This is a good thing to set in mode hooks.")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
208
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
209 (defcustom comint-input-autoexpand nil
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
210 "If non-nil, expand input command history references on completion.
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
211 This mirrors the optional behavior of tcsh (its autoexpand and histlist).
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
212
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
213 If the value is `input', then the expansion is seen on input.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
214 If the value is `history', then the expansion is only when inserting
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
215 into the buffer's input ring. See also `comint-magic-space' and
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
216 `comint-dynamic-complete'.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
217
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
218 This variable is buffer-local."
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
219 :type '(choice (const :tag "off" nil)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
220 (const input)
22569
b5923f76f35b (comint-input-autoexpand): Use `other' widget type.
Andreas Schwab <schwab@suse.de>
parents: 22272
diff changeset
221 (const history)
b5923f76f35b (comint-input-autoexpand): Use `other' widget type.
Andreas Schwab <schwab@suse.de>
parents: 22272
diff changeset
222 (other :tag "on" t))
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
223 :group 'comint)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
224
42450
c32f238e8a16 (comint-highlight-input): Use :weight, not :bold.
Richard M. Stallman <rms@gnu.org>
parents: 42341
diff changeset
225 (defface comint-highlight-input '((t (:weight bold)))
45727
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
226 "Face to use to highlight user input."
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
227 :group 'comint)
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
228
32743
fd31939b0747 (comint-highlight-input, comint-highlight-prompt):
Miles Bader <miles@gnu.org>
parents: 32635
diff changeset
229 (defface comint-highlight-prompt
112176
60bee8db359c * lisp/comint.el (comint-highlight-prompt): Inherit from minibuffer-prompt.
Chong Yidong <cyd@stupidchicken.com>
parents: 111945
diff changeset
230 '((t :inherit minibuffer-prompt))
45727
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
231 "Face to use to highlight prompts."
30325
a7f5f8fff5b2 (comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents: 29883
diff changeset
232 :group 'comint)
a7f5f8fff5b2 (comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents: 29883
diff changeset
233
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
234 (defcustom comint-input-ignoredups nil
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
235 "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
236 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
237
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
238 This variable is buffer-local."
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
239 :type 'boolean
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
240 :group 'comint)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
241
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
242 (defcustom comint-input-ring-file-name nil
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
243 "If non-nil, name of the file to read/write input history.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
244 See also `comint-read-input-ring' and `comint-write-input-ring'.
111864
cc4e58bd25f1 * lisp/comint.el (comint-input-ring-file-name): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 111626
diff changeset
245 `comint-mode' makes this a buffer-local variable. You probably want
cc4e58bd25f1 * lisp/comint.el (comint-input-ring-file-name): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 111626
diff changeset
246 to set this in a mode hook, rather than customize the default value."
30325
a7f5f8fff5b2 (comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents: 29883
diff changeset
247 :type '(choice (const :tag "nil" nil)
a7f5f8fff5b2 (comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents: 29883
diff changeset
248 file)
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
249 :group 'comint)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
250
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
251 (defcustom comint-scroll-to-bottom-on-input nil
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
252 "Controls whether input to interpreter causes window to scroll.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
253 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
254 If `this', scroll only the selected window.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
255
4939
d9ad390ef4e3 (comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents: 4928
diff changeset
256 The default is nil.
4880
a658d0e341b1 (comint-scroll-to-bottom-on-input)
Richard M. Stallman <rms@gnu.org>
parents: 4872
diff changeset
257
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
258 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
259 :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
260 (const t)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
261 (const all)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
262 (const this))
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
263 :group 'comint)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
264
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
265 (defcustom comint-move-point-for-output nil
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
266 "Controls whether interpreter output moves point to the end of the output.
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
267 If nil, then output never moves point to the output.
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
268 (If the output occurs at point, it is inserted before point.)
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
269 If t or `all', move point in all windows showing the buffer.
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
270 If `this', move point only the selected window.
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
271 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
272
d9ad390ef4e3 (comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents: 4928
diff changeset
273 The default is nil.
4880
a658d0e341b1 (comint-scroll-to-bottom-on-input)
Richard M. Stallman <rms@gnu.org>
parents: 4872
diff changeset
274
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
275 See the variable `comint-scroll-show-maximum-output' and the function
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
276 `comint-postoutput-scroll-to-bottom'.
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
277 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
278 :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
279 (const t)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
280 (const all)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
281 (const this)
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
282 (const others))
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
283 :group 'comint)
4939
d9ad390ef4e3 (comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents: 4928
diff changeset
284
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
285 (defvaralias 'comint-scroll-to-bottom-on-output 'comint-move-point-for-output)
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
286
43028
5a7c132708d2 (comint-scroll-show-maximum-output): Default is t.
Richard M. Stallman <rms@gnu.org>
parents: 42887
diff changeset
287 (defcustom comint-scroll-show-maximum-output t
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
288 "Controls how to scroll due to interpreter output.
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
289 This variable applies when point is at the end of the buffer
52081
5468f0e299c4 (comint-read-noecho): Use `clear-string' instead of `fillarray'.
Juanma Barranquero <lekktu@gmail.com>
parents: 51421
diff changeset
290 \(either because it was originally there, or because
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
291 `comint-move-point-for-output' said to move it there)
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
292 and output from the subprocess is inserted.
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
293
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
294 Non-nil means scroll so that the window is full of text
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
295 and point is on the last line. A value of nil
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
296 means don't do anything special--scroll normally.
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
297
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
298 See also the variable `comint-move-point-for-output' and the function
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
299 `comint-postoutput-scroll-to-bottom'.
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
300 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
301 :type 'boolean
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
302 :group 'comint)
4939
d9ad390ef4e3 (comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents: 4928
diff changeset
303
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
304 (defcustom comint-buffer-maximum-size 1024
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
305 "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
306 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
307 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
308 :type 'integer
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
309 :group 'comint)
10833
77d7d3990300 Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents: 10830
diff changeset
310
106690
4d6afab8b7cb * comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents: 106485
diff changeset
311 (defcustom comint-input-ring-size 500
4d6afab8b7cb * comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents: 106485
diff changeset
312 "Size of the input history ring in `comint-mode'."
4d6afab8b7cb * comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents: 106485
diff changeset
313 :type 'integer
4d6afab8b7cb * comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents: 106485
diff changeset
314 :group 'comint
4d6afab8b7cb * comint.el (comint-input-ring-size): Make it a defcustom and
Chong Yidong <cyd@stupidchicken.com>
parents: 106485
diff changeset
315 :version "23.2")
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 "^#"
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
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
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
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: '.
78193
b088dcbbe69a (comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents: 76897
diff changeset
336 ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '.
79178
4577723dbc65 Chris Moore <christopher.ian.moore at gmail.com>
Glenn Morris <rgm@gnu.org>
parents: 79062
diff changeset
337 ;; Ubuntu's sudo prompts like `[sudo] password for user:'
24893
c74f4b5eb657 (comint-password-prompt-regexp): Allow "(again)".
Karl Heuer <kwzh@gnu.org>
parents: 24765
diff changeset
338 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt.
79591
c5f06cb9fa56 (comint-password-prompt-regexp): Match `Enter Password'.
Richard M. Stallman <rms@gnu.org>
parents: 79178
diff changeset
339 ;; Something called "perforce" uses "Enter password:".
111119
80b566568995 * lisp/comint.el (comint-password-prompt-regexp): Make it less vague.
Glenn Morris <rgm@gnu.org>
parents: 110695
diff changeset
340 ;; See M-x comint-testsuite--test-comint-password-prompt-regexp.
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
341 (defcustom comint-password-prompt-regexp
107824
ffe32691e3ab Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
342 (concat
111119
80b566568995 * lisp/comint.el (comint-password-prompt-regexp): Make it less vague.
Glenn Morris <rgm@gnu.org>
parents: 110695
diff changeset
343 "\\(^ *\\|"
107824
ffe32691e3ab Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
344 (regexp-opt
111119
80b566568995 * lisp/comint.el (comint-password-prompt-regexp): Make it less vague.
Glenn Morris <rgm@gnu.org>
parents: 110695
diff changeset
345 '("Enter" "enter" "Enter same" "enter same" "Enter the" "enter the"
80b566568995 * lisp/comint.el (comint-password-prompt-regexp): Make it less vague.
Glenn Morris <rgm@gnu.org>
parents: 110695
diff changeset
346 "Old" "old" "New" "new" "'s" "login"
80b566568995 * lisp/comint.el (comint-password-prompt-regexp): Make it less vague.
Glenn Morris <rgm@gnu.org>
parents: 110695
diff changeset
347 "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad") t)
80b566568995 * lisp/comint.el (comint-password-prompt-regexp): Make it less vague.
Glenn Morris <rgm@gnu.org>
parents: 110695
diff changeset
348 " +\\)"
107824
ffe32691e3ab Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
349 (regexp-opt
ffe32691e3ab Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
350 '("password" "Password" "passphrase" "Passphrase"
ffe32691e3ab Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
351 "pass phrase" "Pass phrase"))
ffe32691e3ab Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
352 "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\
ffe32691e3ab Update comint-password-prompt-regexp (Bug#2817).
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
353 \\(?: for [^:]+\\)?:\\s *\\'")
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
354 "Regexp matching prompts for passwords in the inferior process.
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
355 This is used by `comint-watch-for-password-prompt'."
111119
80b566568995 * lisp/comint.el (comint-password-prompt-regexp): Make it less vague.
Glenn Morris <rgm@gnu.org>
parents: 110695
diff changeset
356 :version "24.1"
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
357 :type 'regexp
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
358 :group 'comint)
8087
c22d7c5168f5 comint-password-prompt-regexp: New variable.
Noah Friedman <friedman@splode.com>
parents: 8060
diff changeset
359
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
360 ;; Here are the per-interpreter hooks.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
361 (defvar comint-get-old-input (function comint-get-old-input-default)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
362 "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
363 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
364 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
365 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
366 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
367 text matching `comint-prompt-regexp', depending on the value of
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
368 `comint-use-prompt-regexp'.")
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
369
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
370 (defvar comint-dynamic-complete-functions
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
371 '(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
372 "List of functions called to perform completion.
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
373 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
374 See also `comint-dynamic-complete'.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
375
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
376 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
377
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
378 (defvar comint-input-filter
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
379 (function (lambda (str) (not (string-match "\\`\\s *\\'" str))))
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
380 "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
381 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
382 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
383
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
384 (defvar comint-input-filter-functions '()
57603
bdfa227d18a8 (comint-insert-input): Use @ in `interactive'.
Richard M. Stallman <rms@gnu.org>
parents: 57539
diff changeset
385 "Abnormal hook run before input is sent to the process.
57419
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
386 These functions get one argument, a string containing the text to send.")
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
387
61922
073c1d646ae1 (comint-output-filter-functions): Add autoload cookie.
Luc Teirlinck <teirllm@auburn.edu>
parents: 61873
diff changeset
388 ;;;###autoload
57539
8c6fc4afae74 (comint-output-filter-functions): Add comint-watch-for-password-prompt.
Richard M. Stallman <rms@gnu.org>
parents: 57420
diff changeset
389 (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
390 "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
391 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
392 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
393 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
394 `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
395 functions have already modified the buffer.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
396
19515
a0ecbe13b54b (comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18805
diff changeset
397 See also `comint-preoutput-filter-functions'.
a0ecbe13b54b (comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18805
diff changeset
398
43579
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
399 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
400 either globally or locally.")
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
401
42693
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
402 (defvar comint-input-sender-no-newline nil
13a21b2786c0 (comint-input-sender): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42669
diff changeset
403 "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
404
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
405 (defvar comint-input-sender (function comint-simple-send)
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
406 "Function to actually send to PROCESS the STRING submitted by user.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
407 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
408 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
409 `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
410 \(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
411 This is called from the user command `comint-send-input'.")
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
412
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
413 (defcustom comint-eol-on-send t
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
414 "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
415 See `comint-send-input'."
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
416 :type 'boolean
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
417 :group 'comint)
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
418
110496
2c341056a7ec Tiny comint.el change.
Glenn Morris <rgm@gnu.org>
parents: 110015
diff changeset
419 (define-obsolete-variable-alias 'comint-use-prompt-regexp-instead-of-fields
2c341056a7ec Tiny comint.el change.
Glenn Morris <rgm@gnu.org>
parents: 110015
diff changeset
420 'comint-use-prompt-regexp "22.1")
2c341056a7ec Tiny comint.el change.
Glenn Morris <rgm@gnu.org>
parents: 110015
diff changeset
421
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
422 ;; 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
423 ;; 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
424 ;; places that need attention.
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
425 (defcustom comint-use-prompt-regexp nil
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
426 "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
427 If nil, then program output and user-input are given different `field'
57419
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
428 properties, which Emacs commands can use to distinguish them (in
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
429 particular, common movement commands such as `beginning-of-line'
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
430 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
431 :type 'boolean
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
432 :group 'comint)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
433
63172
14e29b4d395f (comint-mode-hook): Do not enable Font Lock by default.
Luc Teirlinck <teirllm@auburn.edu>
parents: 63170
diff changeset
434 (defcustom comint-mode-hook nil
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
435 "Hook run upon entry to `comint-mode'.
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
436 This is run before the process is cranked up."
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
437 :type 'hook
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
438 :group 'comint)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
439
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
440 (defcustom comint-exec-hook '()
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
441 "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
442 This is called after the process is cranked up. It is useful for things that
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
443 must be done each time a process is executed in a Comint mode buffer (e.g.,
3386
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
444 `(process-kill-without-query)'). In contrast, the `comint-mode-hook' is only
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
445 executed once when the buffer is created."
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
446 :type 'hook
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
447 :group 'comint)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
448
57419
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
449 (defvar comint-mode-map
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
450 (let ((map (make-sparse-keymap)))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
451 ;; Keys:
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
452 (define-key map "\ep" 'comint-previous-input)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
453 (define-key map "\en" 'comint-next-input)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
454 (define-key map [C-up] 'comint-previous-input)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
455 (define-key map [C-down] 'comint-next-input)
106326
b7dca98d92a9 (comint-mode-map): Rebind `M-r' from
Juri Linkov <juri@jurta.org>
parents: 106206
diff changeset
456 (define-key map "\er" 'comint-history-isearch-backward-regexp)
57419
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
457 (define-key map [?\C-c ?\M-r] 'comint-previous-matching-input-from-input)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
458 (define-key map [?\C-c ?\M-s] 'comint-next-matching-input-from-input)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
459 (define-key map "\e\C-l" 'comint-show-output)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
460 (define-key map "\C-m" 'comint-send-input)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
461 (define-key map "\C-d" 'comint-delchar-or-maybe-eof)
79623
4a3bc3d3d492 (comint-mode-map): Explicitly bind `delete' and `kp-delete'
Richard M. Stallman <rms@gnu.org>
parents: 79591
diff changeset
462 ;; The following two are standardly aliased to C-d,
4a3bc3d3d492 (comint-mode-map): Explicitly bind `delete' and `kp-delete'
Richard M. Stallman <rms@gnu.org>
parents: 79591
diff changeset
463 ;; but they should never do EOF, just delete.
4a3bc3d3d492 (comint-mode-map): Explicitly bind `delete' and `kp-delete'
Richard M. Stallman <rms@gnu.org>
parents: 79591
diff changeset
464 (define-key map [delete] 'delete-char)
4a3bc3d3d492 (comint-mode-map): Explicitly bind `delete' and `kp-delete'
Richard M. Stallman <rms@gnu.org>
parents: 79591
diff changeset
465 (define-key map [kp-delete] 'delete-char)
57419
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
466 (define-key map "\C-c " 'comint-accumulate)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
467 (define-key map "\C-c\C-x" 'comint-get-next-from-history)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
468 (define-key map "\C-c\C-a" 'comint-bol-or-process-mark)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
469 (define-key map "\C-c\C-u" 'comint-kill-input)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
470 (define-key map "\C-c\C-w" 'backward-kill-word)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
471 (define-key map "\C-c\C-c" 'comint-interrupt-subjob)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
472 (define-key map "\C-c\C-z" 'comint-stop-subjob)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
473 (define-key map "\C-c\C-\\" 'comint-quit-subjob)
70575
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
474 (define-key map "\C-c\C-m" 'comint-copy-old-input)
57419
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
475 (define-key map "\C-c\C-o" 'comint-delete-output)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
476 (define-key map "\C-c\C-r" 'comint-show-output)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
477 (define-key map "\C-c\C-e" 'comint-show-maximum-output)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
478 (define-key map "\C-c\C-l" 'comint-dynamic-list-input-ring)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
479 (define-key map "\C-c\C-n" 'comint-next-prompt)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
480 (define-key map "\C-c\C-p" 'comint-previous-prompt)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
481 (define-key map "\C-c\C-d" 'comint-send-eof)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
482 (define-key map "\C-c\C-s" 'comint-write-output)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
483 (define-key map "\C-c." 'comint-insert-previous-argument)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
484 ;; Mouse Buttons:
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
485 (define-key map [mouse-2] 'comint-insert-input)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
486 ;; Menu bars:
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
487 ;; completion:
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
488 (define-key map [menu-bar completion]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
489 (cons "Complete" (make-sparse-keymap "Complete")))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
490 (define-key map [menu-bar completion complete-expand]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
491 '("Expand File Name" . comint-replace-by-expanded-filename))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
492 (define-key map [menu-bar completion complete-listing]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
493 '("File Completion Listing" . comint-dynamic-list-filename-completions))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
494 (define-key map [menu-bar completion complete-file]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
495 '("Complete File Name" . comint-dynamic-complete-filename))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
496 (define-key map [menu-bar completion complete]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
497 '("Complete Before Point" . comint-dynamic-complete))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
498 ;; Input history:
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
499 (define-key map [menu-bar inout]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
500 (cons "In/Out" (make-sparse-keymap "In/Out")))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
501 (define-key map [menu-bar inout delete-output]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
502 '("Delete Current Output Group" . comint-delete-output))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
503 (define-key map [menu-bar inout append-output-to-file]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
504 '("Append Current Output Group to File" . comint-append-output-to-file))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
505 (define-key map [menu-bar inout write-output]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
506 '("Write Current Output Group to File" . comint-write-output))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
507 (define-key map [menu-bar inout next-prompt]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
508 '("Forward Output Group" . comint-next-prompt))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
509 (define-key map [menu-bar inout previous-prompt]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
510 '("Backward Output Group" . comint-previous-prompt))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
511 (define-key map [menu-bar inout show-maximum-output]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
512 '("Show Maximum Output" . comint-show-maximum-output))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
513 (define-key map [menu-bar inout show-output]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
514 '("Show Current Output Group" . comint-show-output))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
515 (define-key map [menu-bar inout kill-input]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
516 '("Kill Current Input" . comint-kill-input))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
517 (define-key map [menu-bar inout copy-input]
70575
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
518 '("Copy Old Input" . comint-copy-old-input))
106326
b7dca98d92a9 (comint-mode-map): Rebind `M-r' from
Juri Linkov <juri@jurta.org>
parents: 106206
diff changeset
519 (define-key map [menu-bar inout history-isearch-backward-regexp]
b7dca98d92a9 (comint-mode-map): Rebind `M-r' from
Juri Linkov <juri@jurta.org>
parents: 106206
diff changeset
520 '("Isearch Input Regexp Backward..." . comint-history-isearch-backward-regexp))
b7dca98d92a9 (comint-mode-map): Rebind `M-r' from
Juri Linkov <juri@jurta.org>
parents: 106206
diff changeset
521 (define-key map [menu-bar inout history-isearch-backward]
b7dca98d92a9 (comint-mode-map): Rebind `M-r' from
Juri Linkov <juri@jurta.org>
parents: 106206
diff changeset
522 '("Isearch Input String Backward..." . comint-history-isearch-backward))
57419
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
523 (define-key map [menu-bar inout forward-matching-history]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
524 '("Forward Matching Input..." . comint-forward-matching-input))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
525 (define-key map [menu-bar inout backward-matching-history]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
526 '("Backward Matching Input..." . comint-backward-matching-input))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
527 (define-key map [menu-bar inout next-matching-history]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
528 '("Next Matching Input..." . comint-next-matching-input))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
529 (define-key map [menu-bar inout previous-matching-history]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
530 '("Previous Matching Input..." . comint-previous-matching-input))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
531 (define-key map [menu-bar inout next-matching-history-from-input]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
532 '("Next Matching Current Input" . comint-next-matching-input-from-input))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
533 (define-key map [menu-bar inout previous-matching-history-from-input]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
534 '("Previous Matching Current Input" . comint-previous-matching-input-from-input))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
535 (define-key map [menu-bar inout next-history]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
536 '("Next Input" . comint-next-input))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
537 (define-key map [menu-bar inout previous-history]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
538 '("Previous Input" . comint-previous-input))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
539 (define-key map [menu-bar inout list-history]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
540 '("List Input History" . comint-dynamic-list-input-ring))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
541 (define-key map [menu-bar inout expand-history]
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
542 '("Expand History Before Point" . comint-replace-by-expanded-history))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
543 ;; Signals
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
544 (let ((signals-map (make-sparse-keymap "Signals")))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
545 (define-key map [menu-bar signals] (cons "Signals" signals-map))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
546 (define-key signals-map [eof] '("EOF" . comint-send-eof))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
547 (define-key signals-map [kill] '("KILL" . comint-kill-subjob))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
548 (define-key signals-map [quit] '("QUIT" . comint-quit-subjob))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
549 (define-key signals-map [cont] '("CONT" . comint-continue-subjob))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
550 (define-key signals-map [stop] '("STOP" . comint-stop-subjob))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
551 (define-key signals-map [break] '("BREAK" . comint-interrupt-subjob)))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
552 ;; Put them in the menu bar:
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
553 (setq menu-bar-final-items (append '(completion inout signals)
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
554 menu-bar-final-items))
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
555 map))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
556
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
557 ;; Fixme: Is this still relevant?
1131
853d0d4c61fb entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 932
diff changeset
558 (defvar comint-ptyp t
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
559 "Non-nil if communications via pty; false if by pipe. Buffer local.
13971
49207f2e2130 (comint-ptyp, comint-completion-autolist): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 13702
diff changeset
560 This is to work around a bug in Emacs process signaling.")
1131
853d0d4c61fb entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 932
diff changeset
561
932
a93f0b1ba909 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 925
diff changeset
562 (defvar comint-input-ring nil)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
563 (defvar comint-last-input-start nil)
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
564 (defvar comint-last-input-end nil)
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
565 (defvar comint-last-output-start nil)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
566 (defvar comint-input-ring-index nil
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
567 "Index of last matched history element.")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
568 (defvar comint-matching-input-from-input-string ""
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
569 "Input previously used to match input history.")
100577
0e2212f6d1b0 (comint-save-input-ring-index): Add missing initial value.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
570 (defvar comint-save-input-ring-index nil
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
571 "Last input ring index which you copied.
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
572 This is to support the command \\[comint-get-next-from-history].")
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
573
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
574 (defvar comint-accum-marker nil
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
575 "Non-nil if you are accumulating input lines to send as input together.
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
576 The command \\[comint-accumulate] sets this.")
6507
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
577
70108
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
578 (defvar comint-stored-incomplete-input nil
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
579 "Stored input for history cycling.")
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
580
6507
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
581 (put 'comint-replace-by-expanded-history 'menu-enable 'comint-input-autoexpand)
1131
853d0d4c61fb entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 932
diff changeset
582 (put 'comint-input-ring 'permanent-local t)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
583 (put 'comint-input-ring-index 'permanent-local t)
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
584 (put 'comint-save-input-ring-index 'permanent-local t)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
585 (put 'comint-input-autoexpand 'permanent-local t)
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
586 (put 'comint-input-filter-functions 'permanent-local t)
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
587 (put 'comint-output-filter-functions 'permanent-local t)
19515
a0ecbe13b54b (comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18805
diff changeset
588 (put 'comint-preoutput-filter-functions 'permanent-local t)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
589 (put 'comint-scroll-to-bottom-on-input 'permanent-local t)
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
590 (put 'comint-move-point-for-output 'permanent-local t)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
591 (put 'comint-scroll-show-maximum-output 'permanent-local t)
1131
853d0d4c61fb entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 932
diff changeset
592 (put 'comint-ptyp 'permanent-local t)
861
345296f94a1e *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
593
17652
0d08e67b280f (comint-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents: 17583
diff changeset
594 (put 'comint-mode 'mode-class 'special)
0d08e67b280f (comint-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents: 17583
diff changeset
595
31970
ebe991a7d6f9 (comint-mode-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31581
diff changeset
596 (define-derived-mode comint-mode fundamental-mode "Comint"
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
597 "Major mode for interacting with an inferior interpreter.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
598 Interpreter name is same as buffer name, sans the asterisks.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
599 Return at end of buffer sends line as input.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
600 Return not at end copies rest of line to end and sends it.
3386
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
601 Setting variable `comint-eol-on-send' means jump to the end of the line
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
602 before submitting new input.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
603
63175
b09a11c8c73e (comint-check-proc, make-comint-in-buffer, comint-source-default): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 63172
diff changeset
604 This mode is customized to create major modes such as Inferior Lisp
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
605 mode, Shell mode, etc. This can be done by setting the hooks
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
606 `comint-input-filter-functions', `comint-input-filter', `comint-input-sender'
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
607 and `comint-get-old-input' to appropriate functions, and the variable
3386
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
608 `comint-prompt-regexp' to the appropriate regular expression.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
609
3386
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
610 An input history is maintained of size `comint-input-ring-size', and
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
611 can be accessed with the commands \\[comint-next-input], \\[comint-previous-input], and \\[comint-dynamic-list-input-ring].
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
612 Input ring history expansion can be achieved with the commands
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
613 \\[comint-replace-by-expanded-history] or \\[comint-magic-space].
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
614 Input ring expansion is controlled by the variable `comint-input-autoexpand',
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
615 and addition is controlled by the variable `comint-input-ignoredups'.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
616
3386
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
617 Commands with no default key bindings include `send-invisible',
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
618 `comint-dynamic-complete', `comint-dynamic-list-filename-completions', and
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
619 `comint-magic-space'.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
620
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
621 Input to, and output from, the subprocess can cause the window to scroll to
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
622 the end of the buffer. See variables `comint-output-filter-functions',
19515
a0ecbe13b54b (comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18805
diff changeset
623 `comint-preoutput-filter-functions', `comint-scroll-to-bottom-on-input',
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
624 and `comint-move-point-for-output'.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
625
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
626 If you accidentally suspend your process, use \\[comint-continue-subjob]
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
627 to continue it.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
628
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
629 \\{comint-mode-map}
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
630
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
631 Entry to this mode runs the hooks on `comint-mode-hook'."
7071
058f19d36c07 (comint-mode): Remove space after `:' in mode-line-process.
Richard M. Stallman <rms@gnu.org>
parents: 7048
diff changeset
632 (setq mode-line-process '(":%s"))
95777
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
633 (set (make-local-variable 'window-point-insertion-type) t)
41143
f1315eeb4c0b (comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40828
diff changeset
634 (set (make-local-variable 'comint-last-input-start) (point-min-marker))
f1315eeb4c0b (comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40828
diff changeset
635 (set (make-local-variable 'comint-last-input-end) (point-min-marker))
f1315eeb4c0b (comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40828
diff changeset
636 (set (make-local-variable 'comint-last-output-start) (make-marker))
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
637 (make-local-variable 'comint-last-prompt-overlay)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
638 (make-local-variable 'comint-prompt-regexp) ; Don't set; default
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
639 (make-local-variable 'comint-input-ring-size) ; ...to global val.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
640 (make-local-variable 'comint-input-ring)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
641 (make-local-variable 'comint-input-ring-file-name)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
642 (or (and (boundp 'comint-input-ring) comint-input-ring)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
643 (setq comint-input-ring (make-ring comint-input-ring-size)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
644 (make-local-variable 'comint-input-ring-index)
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
645 (make-local-variable 'comint-save-input-ring-index)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
646 (or (and (boundp 'comint-input-ring-index) comint-input-ring-index)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
647 (setq comint-input-ring-index nil))
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
648 (or (and (boundp 'comint-save-input-ring-index) comint-save-input-ring-index)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
649 (setq comint-save-input-ring-index nil))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
650 (make-local-variable 'comint-matching-input-from-input-string)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
651 (make-local-variable 'comint-input-autoexpand)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
652 (make-local-variable 'comint-input-ignoredups)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
653 (make-local-variable 'comint-delimiter-argument-list)
6256
3810012eb29f (comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6239
diff changeset
654 (make-local-variable 'comint-completion-fignore)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
655 (make-local-variable 'comint-get-old-input)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
656 (make-local-variable 'comint-input-filter)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
657 (make-local-variable 'comint-input-sender)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
658 (make-local-variable 'comint-eol-on-send)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
659 (make-local-variable 'comint-scroll-to-bottom-on-input)
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
660 (make-local-variable 'comint-move-point-for-output)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
661 (make-local-variable 'comint-scroll-show-maximum-output)
70108
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
662 (make-local-variable 'comint-stored-incomplete-input)
78717
2f4f1185baf4 (comint-mode): Don't set scroll-conservatively.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
663 ;; Following disabled because it seems to break the case when
2f4f1185baf4 (comint-mode): Don't set scroll-conservatively.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
664 ;; comint-scroll-show-maximum-output is nil, and no-one can remember
2f4f1185baf4 (comint-mode): Don't set scroll-conservatively.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
665 ;; what the original problem was. If there are problems with point
2f4f1185baf4 (comint-mode): Don't set scroll-conservatively.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
666 ;; not going to the end, consider re-enabling this.
2f4f1185baf4 (comint-mode): Don't set scroll-conservatively.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
667 ;; http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00827.html
2f4f1185baf4 (comint-mode): Don't set scroll-conservatively.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
668 ;;
48987
0bf251ecfd1a (comint-mode): Localy set scroll-conservatively.
Richard M. Stallman <rms@gnu.org>
parents: 47377
diff changeset
669 ;; This makes it really work to keep point at the bottom.
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
670 ;; (make-local-variable 'scroll-conservatively)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
671 ;; (setq scroll-conservatively 10000)
23347
49e47671810d make pre-command-hook & comint-exec-hook local hooks.
Simon Marshall <simon@gnu.org>
parents: 23209
diff changeset
672 (add-hook 'pre-command-hook 'comint-preinput-scroll-to-bottom t t)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
673 (make-local-variable 'comint-ptyp)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
674 (make-local-variable 'comint-process-echoes)
15817
9e94b5fdaab1 (comint-file-name-chars): Was comint-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 15727
diff changeset
675 (make-local-variable 'comint-file-name-chars)
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
676 (make-local-variable 'comint-file-name-quote-list)
109658
8865dff431b0 * comint.el (comint-mode): Make directory tracking functions
Michael Albinus <michael.albinus@gmx.de>
parents: 109302
diff changeset
677 ;; dir tracking on remote files
8865dff431b0 * comint.el (comint-mode): Make directory tracking functions
Michael Albinus <michael.albinus@gmx.de>
parents: 109302
diff changeset
678 (set (make-local-variable 'comint-file-name-prefix)
8865dff431b0 * comint.el (comint-mode): Make directory tracking functions
Michael Albinus <michael.albinus@gmx.de>
parents: 109302
diff changeset
679 (or (file-remote-p default-directory) ""))
73154
7efd5d5388ea (comint-mode): Bind font-lock-defaults non-nil.
Richard M. Stallman <rms@gnu.org>
parents: 72833
diff changeset
680 (make-local-variable 'comint-accum-marker)
7efd5d5388ea (comint-mode): Bind font-lock-defaults non-nil.
Richard M. Stallman <rms@gnu.org>
parents: 72833
diff changeset
681 (setq comint-accum-marker (make-marker))
7efd5d5388ea (comint-mode): Bind font-lock-defaults non-nil.
Richard M. Stallman <rms@gnu.org>
parents: 72833
diff changeset
682 (make-local-variable 'font-lock-defaults)
75562
44a852ca2266 - Prevent non-keyword fontification by default.
J.D. Smith <jdsmith@as.arizona.edu>
parents: 75491
diff changeset
683 (setq font-lock-defaults '(nil t))
47377
5ce6684c420c (comint-mode): Add font-lock-defontify to change-major-mode-hook.
Richard M. Stallman <rms@gnu.org>
parents: 47073
diff changeset
684 (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
106206
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
685 (add-hook 'isearch-mode-hook 'comint-history-isearch-setup nil t)
32892
25182c4fd302 (comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents: 32852
diff changeset
686 ;; 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
687 (set (make-local-variable 'next-line-add-newlines) nil))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
688
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
689 (defun comint-check-proc (buffer)
63175
b09a11c8c73e (comint-check-proc, make-comint-in-buffer, comint-source-default): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 63172
diff changeset
690 "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
691 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
692 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
693 (let ((proc (get-buffer-process buffer)))
9388
c9b5541ec9f5 (comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents: 9245
diff changeset
694 (and proc (memq (process-status proc) '(open run stop)))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
695
14644
325bc6726a7b (make-comint, comint-run): Fix autoload cookie.
Erik Naggum <erik@naggum.no>
parents: 14169
diff changeset
696 ;;;###autoload
32942
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
697 (defun make-comint-in-buffer (name buffer program &optional startfile &rest switches)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
698 "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
699 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
700 PROGRAM should be either a string denoting an executable program to create
81801
2e8d5916d236 * comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents: 76897
diff changeset
701 via `start-file-process', or a cons pair of the form (HOST . SERVICE) denoting
2e8d5916d236 * comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents: 76897
diff changeset
702 a TCP connection to be opened via `open-network-stream'. If there is already
2e8d5916d236 * comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents: 76897
diff changeset
703 a running process in that buffer, it is not restarted. Optional fourth arg
105195
5b4bbf79ac2a * comint.el (comint-exec, comint-run, make-comint): Doc
Chong Yidong <cyd@stupidchicken.com>
parents: 104740
diff changeset
704 STARTFILE is the name of a file, whose contents are sent to the
5b4bbf79ac2a * comint.el (comint-exec, comint-run, make-comint): Doc
Chong Yidong <cyd@stupidchicken.com>
parents: 104740
diff changeset
705 process as its initial input.
32942
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
706
109273
15e91f601933 Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 106815
diff changeset
707 If PROGRAM is a string, any more args are arguments to PROGRAM.
15e91f601933 Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 106815
diff changeset
708
15e91f601933 Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 106815
diff changeset
709 Returns the (possibly newly created) process buffer."
81801
2e8d5916d236 * comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents: 76897
diff changeset
710 (or (fboundp 'start-file-process)
32942
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
711 (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
712 (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
713 ;; 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
714 ;; 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
715 (unless (comint-check-proc buffer)
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
716 (with-current-buffer buffer
41143
f1315eeb4c0b (comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40828
diff changeset
717 (unless (derived-mode-p 'comint-mode)
f1315eeb4c0b (comint-mode): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40828
diff changeset
718 (comint-mode))) ; Install local vars, mode, keymap, ...
32942
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
719 (comint-exec buffer name program startfile switches))
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
720 buffer)
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
721
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
722 ;;;###autoload
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
723 (defun make-comint (name program &optional startfile &rest switches)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
724 "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
725 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
726 PROGRAM should be either a string denoting an executable program to create
81801
2e8d5916d236 * comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents: 76897
diff changeset
727 via `start-file-process', or a cons pair of the form (HOST . SERVICE) denoting
2e8d5916d236 * comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents: 76897
diff changeset
728 a TCP connection to be opened via `open-network-stream'. If there is already
2e8d5916d236 * comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents: 76897
diff changeset
729 a running process in that buffer, it is not restarted. Optional third arg
105195
5b4bbf79ac2a * comint.el (comint-exec, comint-run, make-comint): Doc
Chong Yidong <cyd@stupidchicken.com>
parents: 104740
diff changeset
730 STARTFILE is the name of a file, whose contents are sent to the
5b4bbf79ac2a * comint.el (comint-exec, comint-run, make-comint): Doc
Chong Yidong <cyd@stupidchicken.com>
parents: 104740
diff changeset
731 process as its initial input.
9388
c9b5541ec9f5 (comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents: 9245
diff changeset
732
109273
15e91f601933 Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 106815
diff changeset
733 If PROGRAM is a string, any more args are arguments to PROGRAM.
15e91f601933 Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 106815
diff changeset
734
15e91f601933 Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 106815
diff changeset
735 Returns the (possibly newly created) process buffer."
32942
395a1cdfb022 (make-comint-in-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32892
diff changeset
736 (apply #'make-comint-in-buffer name nil program startfile switches))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
737
14644
325bc6726a7b (make-comint, comint-run): Fix autoload cookie.
Erik Naggum <erik@naggum.no>
parents: 14169
diff changeset
738 ;;;###autoload
6507
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
739 (defun comint-run (program)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
740 "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
741 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
742 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
743 hooks on this symbol are run in the buffer.
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
744 See `make-comint' and `comint-exec'."
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
745 (interactive "sRun program: ")
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
746 (let ((name (file-name-nondirectory program)))
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
747 (switch-to-buffer (make-comint name program))
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
748 (run-hooks (intern-soft (concat "comint-" name "-hook")))))
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
749
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
750 (defun comint-exec (buffer name command startfile switches)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
751 "Start up a process named NAME in buffer BUFFER for Comint modes.
105195
5b4bbf79ac2a * comint.el (comint-exec, comint-run, make-comint): Doc
Chong Yidong <cyd@stupidchicken.com>
parents: 104740
diff changeset
752 Runs the given COMMAND with SWITCHES, and initial input from STARTFILE.
1839
e10cdcb857d2 (make-comint): Added docstring.
Roland McGrath <roland@gnu.org>
parents: 1821
diff changeset
753 Blasts any old process running in the buffer. Doesn't set the buffer mode.
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
754 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
755 buffer. The hook `comint-exec-hook' is run after each exec."
50966
379cf00d7016 (comint-carriage-motion, comint-output-filter):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49549
diff changeset
756 (with-current-buffer buffer
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
757 (let ((proc (get-buffer-process buffer))) ; Blast any old process.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
758 (if proc (delete-process proc)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
759 ;; Crank up a new process
9388
c9b5541ec9f5 (comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents: 9245
diff changeset
760 (let ((proc
c9b5541ec9f5 (comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents: 9245
diff changeset
761 (if (consp command)
c9b5541ec9f5 (comint-check-proc): Recognise `open'.
Richard M. Stallman <rms@gnu.org>
parents: 9245
diff changeset
762 (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
763 (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
764 (set-process-filter proc 'comint-output-filter)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
765 (make-local-variable 'comint-ptyp)
42205
7308bbc423d5 Doc fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 42119
diff changeset
766 (setq comint-ptyp process-connection-type) ; t if pty, nil if pipe.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
767 ;; Jump to the end, and set the process mark.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
768 (goto-char (point-max))
705
c7d478752305 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 662
diff changeset
769 (set-marker (process-mark proc) (point))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
770 ;; Feed it the startfile.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
771 (cond (startfile
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
772 ;;This is guaranteed to wait long enough
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
773 ;;but has bad results if the comint does not prompt at all
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
774 ;; (while (= size (buffer-size))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
775 ;; (sleep-for 1))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
776 ;;I hope 1 second is enough!
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
777 (sleep-for 1)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
778 (goto-char (point-max))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
779 (insert-file-contents startfile)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
780 (setq startfile (buffer-substring (point) (point-max)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
781 (delete-region (point) (point-max))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
782 (comint-send-string proc startfile)))
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
783 (run-hooks 'comint-exec-hook)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
784 buffer)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
785
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
786 ;; 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
787 ;; the appropriate environment.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
788
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
789 (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
790 (let ((process-environment
6750
a864110c6fc7 (comint-exec-1): Handle both termcap and terminfo.
Karl Heuer <kwzh@gnu.org>
parents: 6507
diff changeset
791 (nconc
7327
1e2d4da6b5c4 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7071
diff changeset
792 ;; If using termcap, we specify `emacs' as the terminal type
1e2d4da6b5c4 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7071
diff changeset
793 ;; 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
794 ;; If using terminfo, we specify `dumb' because that is
7327
1e2d4da6b5c4 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7071
diff changeset
795 ;; a defined terminal type. `emacs' is not a defined terminal type
1e2d4da6b5c4 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7071
diff changeset
796 ;; and there is no way for us to define it here.
1e2d4da6b5c4 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7071
diff changeset
797 ;; Some programs that use terminfo get very confused
1e2d4da6b5c4 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7071
diff changeset
798 ;; if TERM is not a valid terminal type.
42341
e0faaa516289 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 42205
diff changeset
799 ;; ;; 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
800 (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
801 (list "TERM=dumb" "TERMCAP="
36896
76fed386fc02 (comint-exec-1): Set columns of the terminal to
Gerd Moellmann <gerd@gnu.org>
parents: 36695
diff changeset
802 (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
803 (list "TERM=emacs"
36896
76fed386fc02 (comint-exec-1): Set columns of the terminal to
Gerd Moellmann <gerd@gnu.org>
parents: 36695
diff changeset
804 (format "TERMCAP=emacs:co#%d:tc=unknown:" (window-width))))
72833
81a55a7dc3c3 * etc/NEWS: In terminal-oriented subshells, the EMACS environment
Paul Eggert <eggert@twinsun.com>
parents: 71142
diff changeset
805 (unless (getenv "EMACS")
74058
05d799bc0cda (comint-exec-1): Set EMACS and INSIDE_EMACS to t.
Chong Yidong <cyd@stupidchicken.com>
parents: 73154
diff changeset
806 (list "EMACS=t"))
74280
548fcfa53e5e (comint-exec-1): Provide Emacs version and `comint' in INSIDE_EMACS.
Richard M. Stallman <rms@gnu.org>
parents: 74058
diff changeset
807 (list (format "INSIDE_EMACS=%s,comint" emacs-version))
9873
03f3cfdb6a11 (comint-exec-1): Make sure default-directory is a real dir.
Richard M. Stallman <rms@gnu.org>
parents: 9764
diff changeset
808 process-environment))
03f3cfdb6a11 (comint-exec-1): Make sure default-directory is a real dir.
Richard M. Stallman <rms@gnu.org>
parents: 9764
diff changeset
809 (default-directory
16944
54108c7f46e6 (comint-exec-1): Use file-accessible-directory-p.
Richard M. Stallman <rms@gnu.org>
parents: 16849
diff changeset
810 (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
811 default-directory
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
812 "/"))
22652
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
813 proc decoding encoding changed)
104740
dc5b8d58abfe (comint-exec-1): Check command is non-null first.
Nick Roberts <nickrob@snap.net.nz>
parents: 104725
diff changeset
814 (let ((exec-path (if (and command (file-name-directory command))
28064
34cb92c8c3e4 (comint-exec-1): Add the current-dir to the exec-path when
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26734
diff changeset
815 ;; 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
816 ;; 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
817 (cons default-directory exec-path) exec-path)))
81801
2e8d5916d236 * comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents: 76897
diff changeset
818 (setq proc (apply 'start-file-process name buffer command switches)))
82765
a8c46cf3e7aa * comint.el (comint-exec-1): Raise an error if
Michael Albinus <michael.albinus@gmx.de>
parents: 82140
diff changeset
819 ;; Some file name handler cannot start a process, fe ange-ftp.
a8c46cf3e7aa * comint.el (comint-exec-1): Raise an error if
Michael Albinus <michael.albinus@gmx.de>
parents: 82140
diff changeset
820 (unless (processp proc) (error "No process started"))
22652
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
821 (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
822 (setq decoding (car coding-systems)
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
823 encoding (cdr coding-systems)))
81801
2e8d5916d236 * comint.el (make-comint, make-comint-in-buffer)
Michael Albinus <michael.albinus@gmx.de>
parents: 76897
diff changeset
824 ;; Even if start-file-process left the coding system for encoding data
22652
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
825 ;; 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
826 ;; 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
827 ;; conversion.
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
828 (if (and decoding (not encoding))
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
829 (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
830 changed t))
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
831 (if changed
a453ed3fb89f (comint-exec-1): Setup coding systems appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 22569
diff changeset
832 (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
833 proc))
30325
a7f5f8fff5b2 (comint-highlight-input, comint-highlight-face):
Gerd Moellmann <gerd@gnu.org>
parents: 29883
diff changeset
834
70575
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
835 (defun comint-insert-input (event)
75491
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
836 "In a Comint buffer, set the current input to the previous input at point.
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
837 If there is no previous input at point, run the command specified
103560
10c7d2fa1e40 (comint-insert-input): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
838 by the global keymap (usually `mouse-yank-at-click')."
70575
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
839 (interactive "e")
104725
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
840 ;; Don't set the mouse here, since it may otherwise change the behavior
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
841 ;; of the command on which we fallback if there's no field at point.
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
842 ;; (mouse-set-point event)
75491
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
843 (let ((pos (posn-point (event-end event)))
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
844 field input)
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
845 (with-selected-window (posn-window (event-end event))
106362
d19d1b12196e (comint-insert-input): Ignore clicks to the right of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106326
diff changeset
846 ;; If pos is at the very end of a field, the mouse-click was
d19d1b12196e (comint-insert-input): Ignore clicks to the right of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106326
diff changeset
847 ;; probably outside (to the right) of the field.
d19d1b12196e (comint-insert-input): Ignore clicks to the right of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106326
diff changeset
848 (and (< pos (field-end pos))
d19d1b12196e (comint-insert-input): Ignore clicks to the right of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106326
diff changeset
849 (setq field (field-at-pos pos))
75491
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
850 (setq input (field-string-no-properties pos))))
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
851 (if (or (null comint-accum-marker)
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
852 (not (eq field 'input)))
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
853 ;; Fall back to the global definition if (i) the selected
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
854 ;; buffer is not a comint buffer (which can happen if a
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
855 ;; non-comint window was selected and we clicked in a comint
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
856 ;; window), or (ii) there is no input at POS.
70575
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
857 (let* ((keys (this-command-keys))
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
858 (last-key (and (vectorp keys) (aref keys (1- (length keys)))))
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
859 (fun (and last-key (lookup-key global-map (vector last-key)))))
75491
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
860 (and fun (not (eq fun 'comint-insert-input))
1fa2c9c50f03 (comint-insert-input): Handle situation where the selected buffer is
Chong Yidong <cyd@stupidchicken.com>
parents: 75347
diff changeset
861 (call-interactively fun)))
104725
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
862 (with-selected-window (posn-window (event-end event))
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
863 ;; Otherwise, insert the previous input.
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
864 (goto-char (point-max))
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
865 ;; First delete any old unsent input at the end
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
866 (delete-region
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
867 (or (marker-position comint-accum-marker)
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
868 (process-mark (get-buffer-process (current-buffer))))
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
869 (point))
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
870 ;; Insert the input at point
f1f277c6c9fe (comint-insert-input): Be careful to only set point if we
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103560
diff changeset
871 (insert input)))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
872
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
873 ;; Input history processing in a buffer
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
874 ;; ===========================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
875 ;; 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
876
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
877 ;; Eleven commands:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
878 ;; comint-dynamic-list-input-ring List history in help buffer.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
879 ;; comint-previous-input Previous input...
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
880 ;; comint-previous-matching-input ...matching a string.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
881 ;; comint-previous-matching-input-from-input ... matching the current input.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
882 ;; comint-next-input Next input...
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
883 ;; comint-next-matching-input ...matching a string.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
884 ;; comint-next-matching-input-from-input ... matching the current input.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
885 ;; comint-backward-matching-input Backwards input...
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
886 ;; comint-forward-matching-input ...matching a string.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
887 ;; comint-replace-by-expanded-history Expand history at point;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
888 ;; replace with expanded history.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
889 ;; comint-magic-space Expand history and insert space.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
890 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
891 ;; Three functions:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
892 ;; comint-read-input-ring Read into comint-input-ring...
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
893 ;; 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
894 ;; 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
895
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
896 (defun comint-read-input-ring (&optional silent)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
897 "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
898 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
899 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
900 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
901
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
902 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
903 failure to read the history file.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
904
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
905 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
906
25443
a4be8e9452ef (comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25278
diff changeset
907 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
908 `comint-input-ring-separator', and entries that match
29a7d4d1846b (comint-input-history-ignore): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34834
diff changeset
909 `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
910 comes last.
25443
a4be8e9452ef (comint-input-ring-separator): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25278
diff changeset
911
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
912 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
913 (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
914 (equal comint-input-ring-file-name ""))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
915 nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
916 ((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
917 (or silent
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
918 (message "Cannot read history file %s"
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
919 comint-input-ring-file-name)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
920 (t
112389
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
921 (let* ((file comint-input-ring-file-name)
28880
a0115904eda4 (comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents: 28064
diff changeset
922 (count 0)
a0115904eda4 (comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents: 28064
diff changeset
923 (size comint-input-ring-size)
a0115904eda4 (comint-read-input-ring): Move reference to
Gerd Moellmann <gerd@gnu.org>
parents: 28064
diff changeset
924 (ring (make-ring size)))
112389
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
925 (with-temp-buffer
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
926 (insert-file-contents file)
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
927 ;; Save restriction in case file is already visited...
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
928 ;; Watch for those date stamps in history files!
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
929 (goto-char (point-max))
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
930 (let (start end history)
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
931 (while (and (< count size)
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
932 (re-search-backward comint-input-ring-separator
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
933 nil t)
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
934 (setq end (match-beginning 0)))
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
935 (setq start
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
936 (if (re-search-backward comint-input-ring-separator
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
937 nil t)
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
938 (match-end 0)
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
939 (point-min)))
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
940 (setq history (buffer-substring start end))
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
941 (goto-char start)
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
942 (if (and (not (string-match comint-input-history-ignore
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
943 history))
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
944 (or (null comint-input-ignoredups)
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
945 (ring-empty-p ring)
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
946 (not (string-equal (ring-ref ring 0)
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
947 history))))
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
948 (progn
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
949 (ring-insert-at-beginning ring history)
75fb060ecbc3 Don't mess with *temp*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112284
diff changeset
950 (setq count (1+ count)))))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
951 (setq comint-input-ring ring
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
952 comint-input-ring-index nil)))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
953
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
954 (defun comint-write-input-ring ()
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
955 "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
956 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
957 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
958 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
959
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
960 Useful within process sentinels.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
961
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
962 See also `comint-read-input-ring'."
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
963 (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
964 (equal comint-input-ring-file-name "")
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
965 (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
966 nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
967 ((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
968 (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
969 (t
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
970 (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
971 (ring comint-input-ring)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
972 (file comint-input-ring-file-name)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
973 (index (ring-length ring)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
974 ;; 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
975 ;; than writing it one line at a time.
105703
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
976 (with-current-buffer history-buf
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
977 (erase-buffer)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
978 (while (> index 0)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
979 (setq index (1- index))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
980 (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
981 (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
982 (kill-buffer nil))))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
983
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
984
42119
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
985 (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
986
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
987 (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
988 "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
989 (interactive)
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
990 (let ((buffer completion-reference-buffer)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
991 beg end completion)
42119
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
992 (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
993 (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
994 (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
995 (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
996 (if (null beg)
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
997 (error "No history entry here"))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
998 (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
999 (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
1000 (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
1001 (set-window-configuration comint-dynamic-list-input-ring-window-conf)
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105372
diff changeset
1002 (choose-completion-string completion buffer)))
42119
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
1003
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1004 (defun comint-dynamic-list-input-ring ()
111906
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
1005 "Display a list of recent inputs entered into the current buffer."
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1006 (interactive)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1007 (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
1008 (ring-empty-p comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1009 (message "No history")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1010 (let ((history nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1011 (history-buffer " *Input History*")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1012 (index (1- (ring-length comint-input-ring)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1013 (conf (current-window-configuration)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1014 ;; We have to build up a list ourselves from the ring vector.
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105372
diff changeset
1015 (dotimes (index (ring-length comint-input-ring))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105372
diff changeset
1016 (push (ring-ref comint-input-ring index) history))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105372
diff changeset
1017 ;; Show them most-recent-first.
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105372
diff changeset
1018 (setq history (nreverse history))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1019 ;; Change "completion" to "history reference"
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1020 ;; to make the display accurate.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1021 (with-output-to-temp-buffer history-buffer
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1022 (display-completion-list history)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1023 (set-buffer history-buffer)
42119
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
1024 (let ((keymap (make-sparse-keymap)))
cfeff2859949 (comint-dynamic-list-input-ring-select): New function.
Richard M. Stallman <rms@gnu.org>
parents: 41932
diff changeset
1025 (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
1026 (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
1027 (use-local-map keymap))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1028 (forward-line 3)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1029 (while (search-backward "completion" nil 'move)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1030 (replace-match "history reference")))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1031 (sit-for 0)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1032 (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
1033 (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
1034 (let ((ch (read-event)))
64000
e1ccb8b46dea (comint-completion, comint-source): Finsh `degroup' descriptions with period.
Juanma Barranquero <lekktu@gmail.com>
parents: 63813
diff changeset
1035 (if (eq ch ?\s)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1036 (set-window-configuration conf)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1037 (setq unread-command-events (list ch)))))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1038
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1039
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1040 (defun comint-regexp-arg (prompt)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1041 "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
1042 (let* (;; Don't clobber this.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1043 (last-command last-command)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1044 (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
1045 'minibuffer-history-search-history)))
79852
32dc15103b58 (comint-regexp-arg): Fix no-input case.
Glenn Morris <rgm@gnu.org>
parents: 79814
diff changeset
1046 ;; If the user didn't enter anything, nothing is added to m-h-s-h.
32dc15103b58 (comint-regexp-arg): Fix no-input case.
Glenn Morris <rgm@gnu.org>
parents: 79814
diff changeset
1047 ;; Use the previous search regexp, if there is one.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1048 (list (if (string-equal regexp "")
79852
32dc15103b58 (comint-regexp-arg): Fix no-input case.
Glenn Morris <rgm@gnu.org>
parents: 79814
diff changeset
1049 (or (car minibuffer-history-search-history)
32dc15103b58 (comint-regexp-arg): Fix no-input case.
Glenn Morris <rgm@gnu.org>
parents: 79814
diff changeset
1050 regexp)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1051 regexp)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1052 (prefix-numeric-value current-prefix-arg))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1053
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1054 (defun comint-search-arg (arg)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1055 ;; 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
1056 (cond ((not (comint-after-pmark-p))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1057 (error "Not at command line"))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1058 ((or (null comint-input-ring)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1059 (ring-empty-p comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1060 (error "Empty input ring"))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1061 ((zerop arg)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1062 ;; 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
1063 (setq comint-input-ring-index nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1064 1)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1065 (t
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1066 arg)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1067
70108
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1068 (defun comint-restore-input ()
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1069 "Restore unfinished input."
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1070 (interactive)
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1071 (when comint-input-ring-index
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1072 (comint-delete-input)
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1073 (when (> (length comint-stored-incomplete-input) 0)
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1074 (insert comint-stored-incomplete-input)
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1075 (message "Input restored"))
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1076 (setq comint-input-ring-index nil)))
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1077
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1078 (defun comint-search-start (arg)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1079 "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
1080 (if comint-input-ring-index
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1081 ;; 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
1082 (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
1083 (ring-length comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1084 ;; 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
1085 (if (>= arg 0)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1086 0 ; First elt for forward search
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1087 (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
1088
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1089 (defun comint-previous-input-string (arg)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1090 "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
1091 Moves relative to `comint-input-ring-index'."
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1092 (ring-ref comint-input-ring (if comint-input-ring-index
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
1093 (mod (+ arg comint-input-ring-index)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1094 (ring-length comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1095 arg)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1096
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1097 (defun comint-previous-input (arg)
70108
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1098 "Cycle backwards through input history, saving input."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1099 (interactive "*p")
71142
f912b6f4d358 (comint-send-input): Do not add help-echo and mouse-face to input if
Luc Teirlinck <teirllm@auburn.edu>
parents: 70963
diff changeset
1100 (if (and comint-input-ring-index
70108
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1101 (or ;; leaving the "end" of the ring
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1102 (and (< arg 0) ; going down
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1103 (eq comint-input-ring-index 0))
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1104 (and (> arg 0) ; going up
71142
f912b6f4d358 (comint-send-input): Do not add help-echo and mouse-face to input if
Luc Teirlinck <teirllm@auburn.edu>
parents: 70963
diff changeset
1105 (eq comint-input-ring-index
70108
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1106 (1- (ring-length comint-input-ring)))))
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1107 comint-stored-incomplete-input)
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1108 (comint-restore-input)
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1109 (comint-previous-matching-input "." arg)))
909
4c6cdb66c74c *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1110
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1111 (defun comint-next-input (arg)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1112 "Cycle forwards through input history."
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1113 (interactive "*p")
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1114 (comint-previous-input (- arg)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1115
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1116 (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
1117 "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
1118 Moves relative to `comint-input-ring-index'."
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1119 (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
1120 (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
1121
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1122 (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
1123 "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
1124 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
1125 (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
1126 (ring-empty-p comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1127 (error "No history"))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1128 (let* ((len (ring-length comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1129 (motion (if (> arg 0) 1 -1))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1130 (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
1131 (tried-each-ring-item nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1132 (prev nil))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1133 ;; 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
1134 (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
1135 ;; Step once.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1136 (setq prev n
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1137 n (mod (+ n motion) len))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1138 ;; 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
1139 (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
1140 (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
1141 (setq n (mod (+ n motion) len)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1142 ;; If we 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
1143 tried-each-ring-item (= n prev)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1144 (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
1145 ;; 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
1146 (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
1147 n)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1148
70108
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1149 (defun comint-delete-input ()
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1150 "Delete all input between accumulation or process mark and point."
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1151 (delete-region
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1152 ;; Can't use kill-region as it sets this-command
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1153 (or (marker-position comint-accum-marker)
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1154 (process-mark (get-buffer-process (current-buffer))))
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1155 (point-max)))
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1156
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1157 (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
1158 "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
1159 \(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
1160 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
1161 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
1162 (interactive (comint-regexp-arg "Previous input matching (regexp): "))
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1163 (setq n (comint-search-arg n))
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1164 (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
1165 ;; Has a match been found?
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1166 (if (null pos)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1167 (error "Not found")
70108
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1168 ;; If leaving the edit line, save partial input
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1169 (if (null comint-input-ring-index) ;not yet on ring
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1170 (setq comint-stored-incomplete-input
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1171 (funcall comint-get-old-input)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1172 (setq comint-input-ring-index pos)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1173 (message "History item: %d" (1+ pos))
70108
3233d9998115 (comint-previous-input): Don't clobber input line when moving off either
J.D. Smith <jdsmith@as.arizona.edu>
parents: 69687
diff changeset
1174 (comint-delete-input)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1175 (insert (ring-ref comint-input-ring pos)))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1176
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1177 (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
1178 "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
1179 \(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
1180 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
1181 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
1182 (interactive (comint-regexp-arg "Next input matching (regexp): "))
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1183 (comint-previous-matching-input regexp (- n)))
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1184
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1185 (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
1186 "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
1187 \(Previous history elements are earlier commands.)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1188 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
1189 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
1190 (interactive "p")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1191 (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
1192 comint-next-matching-input-from-input)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1193 ;; Starting a new search
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1194 (setq comint-matching-input-from-input-string
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
1195 (buffer-substring
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
1196 (or (marker-position comint-accum-marker)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
1197 (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
1198 (point))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1199 comint-input-ring-index nil))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1200 (comint-previous-matching-input
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1201 (concat "^" (regexp-quote comint-matching-input-from-input-string))
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1202 n))
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1203
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1204 (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
1205 "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
1206 \(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
1207 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
1208 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
1209 (interactive "p")
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1210 (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
1211
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1212
21714
9c454e5e03fa (comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents: 21617
diff changeset
1213 (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
1214 "Expand input command history references before point.
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1215 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
1216
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1217 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
1218 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
1219
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1220 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
1221 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
1222 it cannot expand absolute input line number references.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1223
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1224 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
1225 even if history reference seems erroneous.
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1226
21714
9c454e5e03fa (comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents: 21617
diff changeset
1227 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
1228 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
1229 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
1230
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1231 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
1232
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1233 Returns t if successful."
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1234 (interactive)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1235 (if (and comint-input-autoexpand
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
1236 (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
1237 ;; Use comint-prompt-regexp
33053
eb3d446c4a6e (comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents: 33023
diff changeset
1238 (save-excursion
eb3d446c4a6e (comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents: 33023
diff changeset
1239 (beginning-of-line)
eb3d446c4a6e (comint-replace-by-expanded-history): Don't use
Miles Bader <miles@gnu.org>
parents: 33023
diff changeset
1240 (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
1241 ;; 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
1242 ;; 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
1243 (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
1244 (string-match "!\\|^\\^" (field-string)))))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1245 ;; 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
1246 (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
1247 (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
1248 (/= previous-modified-tick (buffer-modified-tick)))))
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1249
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1250
21714
9c454e5e03fa (comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents: 21617
diff changeset
1251 (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
1252 "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
1253 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
1254
9c454e5e03fa (comint-replace-by-expanded-history): New arg START.
Richard M. Stallman <rms@gnu.org>
parents: 21617
diff changeset
1255 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
1256 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
1257 than the logical beginning of line."
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1258 (save-excursion
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1259 (let ((toend (- (line-end-position) (point)))
55881
79a700a71463 (comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55295
diff changeset
1260 (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
1261 (goto-char start)
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
1262 (while (progn
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
1263 (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
1264 (< (point) (- (line-end-position) toend)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1265 ;; 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
1266 ;; !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
1267 ;; 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
1268 ;; range specifiers.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1269 ;; 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
1270 ;; 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
1271 (setq comint-input-ring-index nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1272 (cond ((or (= (preceding-char) ?\\)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1273 (comint-within-quotes start (point)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1274 ;; 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
1275 (goto-char (1+ (point))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1276 ((looking-at "![0-9]+\\($\\|[^-]\\)")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1277 ;; 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
1278 (goto-char (match-end 0))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1279 (message "Absolute reference cannot be expanded"))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1280 ((looking-at "!-\\([0-9]+\\)\\(:?[0-9^$*-]+\\)?")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1281 ;; 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
1282 (let ((number (1- (string-to-number
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1283 (buffer-substring (match-beginning 1)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1284 (match-end 1))))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1285 (if (<= number (ring-length comint-input-ring))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1286 (progn
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1287 (replace-match
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1288 (comint-args (comint-previous-input-string number)
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1289 (match-beginning 2) (match-end 2))
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1290 t t)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1291 (setq comint-input-ring-index number)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1292 (message "History item: %d" (1+ number)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1293 (goto-char (match-end 0))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1294 (message "Relative reference exceeds input history size"))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1295 ((or (looking-at "!!?:?\\([0-9^$*-]+\\)") (looking-at "!!"))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1296 ;; Just a number of args from the previous input line.
112421
36dcbf24a6f1 * lisp/comint.el (comint-replace-by-expanded-history-before-point): Fix
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112218
diff changeset
1297 (replace-match (comint-args (comint-previous-input-string 0)
36dcbf24a6f1 * lisp/comint.el (comint-replace-by-expanded-history-before-point): Fix
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112218
diff changeset
1298 (match-beginning 1) (match-end 1))
36dcbf24a6f1 * lisp/comint.el (comint-replace-by-expanded-history-before-point): Fix
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112218
diff changeset
1299 t t)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1300 (message "History item: previous"))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1301 ((looking-at
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1302 "!\\??\\({\\(.+\\)}\\|\\(\\sw+\\)\\)\\(:?[0-9^$*-]+\\)?")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1303 ;; 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
1304 ;; 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
1305 (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
1306 (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
1307 (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
1308 (pref (if (save-match-data (looking-at "!\\?")) "" "^"))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1309 (pos (save-match-data
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1310 (comint-previous-matching-input-string-position
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1311 (concat pref (regexp-quote exp)) 1))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1312 (if (null pos)
6886
d4010211153e (comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents: 6847
diff changeset
1313 (progn
d4010211153e (comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents: 6847
diff changeset
1314 (goto-char (match-end 0))
d4010211153e (comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents: 6847
diff changeset
1315 (or silent
d4010211153e (comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents: 6847
diff changeset
1316 (progn (message "Not found")
d4010211153e (comint-replace-by-expanded-history-before-point): Advance point
Karl Heuer <kwzh@gnu.org>
parents: 6847
diff changeset
1317 (ding))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1318 (setq comint-input-ring-index pos)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1319 (replace-match
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1320 (comint-args (ring-ref comint-input-ring pos)
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1321 (match-beginning 4) (match-end 4))
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1322 t t)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1323 (message "History item: %d" (1+ pos)))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1324 ((looking-at "\\^\\([^^]+\\)\\^?\\([^^]*\\)\\^?")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1325 ;; Quick substitution on the previous input line.
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1326 (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
1327 (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
1328 (pos nil))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1329 (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
1330 (setq pos (point))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1331 (goto-char (match-beginning 0))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1332 (if (not (search-forward old pos t))
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1333 (or silent
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1334 (error "Not found"))
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1335 (replace-match new t t)
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1336 (message "History item: substituted"))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1337 (t
21951
ab7fa71c0957 (comint-replace-by-expanded-history-before-point):
Richard M. Stallman <rms@gnu.org>
parents: 21714
diff changeset
1338 (forward-char 1)))))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1339
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1340
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1341 (defun comint-magic-space (arg)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1342 "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
1343 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
1344 (interactive "p")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1345 (comint-replace-by-expanded-history)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1346 (self-insert-command arg))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1347
106206
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1348 ;; Isearch in comint input history
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1349
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1350 (defcustom comint-history-isearch nil
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1351 "Non-nil to Isearch in input history only, not in comint buffer output.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1352 If t, usual Isearch keys like `C-r' and `C-M-r' in comint mode search
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1353 in the input history.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1354 If `dwim', Isearch keys search in the input history only when initial
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1355 point position is at the comint command line. When starting Isearch
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1356 from other parts of the comint buffer, they search in the comint buffer.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1357 If nil, Isearch operates on the whole comint buffer."
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1358 :type '(choice (const :tag "Don't search in input history" nil)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1359 (const :tag "When point is on command line initially, search history" dwim)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1360 (const :tag "Always search in input history" t))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1361 :group 'comint
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1362 :version "23.2")
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1363
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1364 (defun comint-history-isearch-backward ()
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1365 "Search for a string backward in input history using Isearch."
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1366 (interactive)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1367 (let ((comint-history-isearch t))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1368 (isearch-backward)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1369
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1370 (defun comint-history-isearch-backward-regexp ()
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1371 "Search for a regular expression backward in input history using Isearch."
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1372 (interactive)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1373 (let ((comint-history-isearch t))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1374 (isearch-backward-regexp)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1375
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1376 (defvar comint-history-isearch-message-overlay nil)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1377 (make-variable-buffer-local 'comint-history-isearch-message-overlay)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1378
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1379 (defun comint-history-isearch-setup ()
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1380 "Set up a comint for using Isearch to search the input history.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1381 Intended to be added to `isearch-mode-hook' in `comint-mode'."
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1382 (when (or (eq comint-history-isearch t)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1383 (and (eq comint-history-isearch 'dwim)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1384 ;; Point is at command line.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1385 (comint-after-pmark-p)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1386 (setq isearch-message-prefix-add "history ")
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1387 (set (make-local-variable 'isearch-search-fun-function)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1388 'comint-history-isearch-search)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1389 (set (make-local-variable 'isearch-message-function)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1390 'comint-history-isearch-message)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1391 (set (make-local-variable 'isearch-wrap-function)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1392 'comint-history-isearch-wrap)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1393 (set (make-local-variable 'isearch-push-state-function)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1394 'comint-history-isearch-push-state)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1395 (add-hook 'isearch-mode-end-hook 'comint-history-isearch-end nil t)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1396
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1397 (defun comint-history-isearch-end ()
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1398 "Clean up the comint after terminating Isearch in comint."
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1399 (if comint-history-isearch-message-overlay
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1400 (delete-overlay comint-history-isearch-message-overlay))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1401 (setq isearch-message-prefix-add nil)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1402 (setq isearch-search-fun-function nil)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1403 (setq isearch-message-function nil)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1404 (setq isearch-wrap-function nil)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1405 (setq isearch-push-state-function nil)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1406 (remove-hook 'isearch-mode-end-hook 'comint-history-isearch-end t))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1407
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1408 (defun comint-goto-input (pos)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1409 "Put input history item of the absolute history position POS."
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1410 ;; If leaving the edit line, save partial unfinished input.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1411 (if (null comint-input-ring-index)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1412 (setq comint-stored-incomplete-input
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1413 (funcall comint-get-old-input)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1414 (setq comint-input-ring-index pos)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1415 (comint-delete-input)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1416 (if (and pos (not (ring-empty-p comint-input-ring)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1417 (insert (ring-ref comint-input-ring pos))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1418 ;; Restore partial unfinished input.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1419 (when (> (length comint-stored-incomplete-input) 0)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1420 (insert comint-stored-incomplete-input))))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1421
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1422 (defun comint-history-isearch-search ()
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1423 "Return the proper search function, for Isearch in input history."
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1424 (cond
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1425 (isearch-word
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1426 (if isearch-forward 'word-search-forward 'word-search-backward))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1427 (t
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1428 (lambda (string bound noerror)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1429 (let ((search-fun
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1430 ;; Use standard functions to search within comint text
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1431 (cond
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1432 (isearch-regexp
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1433 (if isearch-forward 're-search-forward 're-search-backward))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1434 (t
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1435 (if isearch-forward 'search-forward 'search-backward))))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1436 found)
106485
85eebb6799d7 Don't lazy-highlight the comint output in history Isearch mode.
Juri Linkov <juri@jurta.org>
parents: 106362
diff changeset
1437 ;; Avoid lazy-highlighting matches in the comint prompt and in the
85eebb6799d7 Don't lazy-highlight the comint output in history Isearch mode.
Juri Linkov <juri@jurta.org>
parents: 106362
diff changeset
1438 ;; output when searching forward. Lazy-highlight calls this lambda
85eebb6799d7 Don't lazy-highlight the comint output in history Isearch mode.
Juri Linkov <juri@jurta.org>
parents: 106362
diff changeset
1439 ;; with the bound arg, so skip the prompt and the output.
85eebb6799d7 Don't lazy-highlight the comint output in history Isearch mode.
Juri Linkov <juri@jurta.org>
parents: 106362
diff changeset
1440 (if (and bound isearch-forward (not (comint-after-pmark-p)))
85eebb6799d7 Don't lazy-highlight the comint output in history Isearch mode.
Juri Linkov <juri@jurta.org>
parents: 106362
diff changeset
1441 (goto-char (process-mark (get-buffer-process (current-buffer)))))
106206
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1442 (or
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1443 ;; 1. First try searching in the initial comint text
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1444 (funcall search-fun string
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1445 (if isearch-forward bound (comint-line-beginning-position))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1446 noerror)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1447 ;; 2. If the above search fails, start putting next/prev history
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1448 ;; elements in the comint successively, and search the string
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1449 ;; in them. Do this only when bound is nil (i.e. not while
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1450 ;; lazy-highlighting search strings in the current comint text).
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1451 (unless bound
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1452 (condition-case nil
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1453 (progn
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1454 (while (not found)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1455 (cond (isearch-forward
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1456 ;; Signal an error here explicitly, because
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1457 ;; `comint-next-input' doesn't signal an error.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1458 (when (null comint-input-ring-index)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1459 (error "End of history; no next item"))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1460 (comint-next-input 1)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1461 (goto-char (comint-line-beginning-position)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1462 (t
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1463 ;; Signal an error here explicitly, because
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1464 ;; `comint-previous-input' doesn't signal an error.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1465 (when (eq comint-input-ring-index
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1466 (1- (ring-length comint-input-ring)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1467 (error "Beginning of history; no preceding item"))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1468 (comint-previous-input 1)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1469 (goto-char (point-max))))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1470 (setq isearch-barrier (point) isearch-opoint (point))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1471 ;; After putting the next/prev history element, search
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1472 ;; the string in them again, until comint-next-input
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1473 ;; or comint-previous-input raises an error at the
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1474 ;; beginning/end of history.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1475 (setq found (funcall search-fun string
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1476 (unless isearch-forward
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1477 ;; For backward search, don't search
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1478 ;; in the comint prompt
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1479 (comint-line-beginning-position))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1480 noerror)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1481 ;; Return point of the new search result
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1482 (point))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1483 ;; Return nil on the error "no next/preceding item"
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1484 (error nil)))))))))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1485
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1486 (defun comint-history-isearch-message (&optional c-q-hack ellipsis)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1487 "Display the input history search prompt.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1488 If there are no search errors, this function displays an overlay with
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1489 the Isearch prompt which replaces the original comint prompt.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1490 Otherwise, it displays the standard Isearch message returned from
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1491 `isearch-message'."
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1492 (if (not (and isearch-success (not isearch-error)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1493 ;; Use standard function `isearch-message' when not in comint prompt,
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1494 ;; or search fails, or has an error (like incomplete regexp).
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1495 ;; This function displays isearch message in the echo area,
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1496 ;; so it's possible to see what is wrong in the search string.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1497 (isearch-message c-q-hack ellipsis)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1498 ;; Otherwise, put the overlay with the standard isearch prompt over
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1499 ;; the initial comint prompt.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1500 (if (overlayp comint-history-isearch-message-overlay)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1501 (move-overlay comint-history-isearch-message-overlay
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1502 (save-excursion (forward-line 0) (point))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1503 (comint-line-beginning-position))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1504 (setq comint-history-isearch-message-overlay
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1505 (make-overlay (save-excursion (forward-line 0) (point))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1506 (comint-line-beginning-position)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1507 (overlay-put comint-history-isearch-message-overlay 'evaporate t))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1508 (overlay-put comint-history-isearch-message-overlay
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1509 'display (isearch-message-prefix c-q-hack ellipsis))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1510 ;; And clear any previous isearch message.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1511 (message "")))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1512
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1513 (defun comint-history-isearch-wrap ()
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1514 "Wrap the input history search when search fails.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1515 Move point to the first history element for a forward search,
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1516 or to the last history element for a backward search."
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1517 (unless isearch-word
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1518 ;; When `comint-history-isearch-search' fails on reaching the
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1519 ;; beginning/end of the history, wrap the search to the first/last
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1520 ;; input history element.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1521 (if isearch-forward
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1522 (comint-goto-input (1- (ring-length comint-input-ring)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1523 (comint-goto-input nil))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1524 (setq isearch-success t))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1525 (goto-char (if isearch-forward (comint-line-beginning-position) (point-max))))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1526
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1527 (defun comint-history-isearch-push-state ()
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1528 "Save a function restoring the state of input history search.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1529 Save `comint-input-ring-index' to the additional state parameter
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1530 in the search status stack."
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1531 `(lambda (cmd)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1532 (comint-history-isearch-pop-state cmd ,comint-input-ring-index)))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1533
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1534 (defun comint-history-isearch-pop-state (cmd hist-pos)
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1535 "Restore the input history search state.
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1536 Go to the history element by the absolute history position HIST-POS."
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1537 (comint-goto-input hist-pos))
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1538
db4fe1337534 Implement Isearch in comint input history. (Bug#3746)
Juri Linkov <juri@jurta.org>
parents: 105957
diff changeset
1539
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1540 (defun comint-within-quotes (beg end)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1541 "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
1542 Quotes are single and double."
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1543 (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
1544 (countdq (comint-how-many-region "\\(^\\|[^\\\\]\\)\"" beg end)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1545 (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
1546
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1547 (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
1548 "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
1549 (let ((count 0))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1550 (save-excursion
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1551 (save-match-data
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1552 (goto-char beg)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1553 (while (re-search-forward regexp end t)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1554 (setq count (1+ count)))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1555 count))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1556
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1557 (defun comint-args (string begin end)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1558 ;; 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
1559 ;; 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
1560 ;; 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
1561 (save-match-data
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1562 (if (null begin)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1563 (comint-arguments string 0 nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1564 (let* ((range (buffer-substring
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1565 (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
1566 (nth (cond ((string-match "^[*^]" range) 1)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1567 ((string-match "^-" range) 0)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1568 ((string-equal range "$") nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1569 (t (string-to-number range))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1570 (mth (cond ((string-match "[-*$]$" range) nil)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1571 ((string-match "-" range)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1572 (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
1573 (t nth))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1574 (comint-arguments string nth mth)))))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1575
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1576 (defun comint-delim-arg (arg)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1577 "Return a list of arguments from ARG.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1578 Break it up at the delimiters in `comint-delimiter-argument-list'.
76491
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1579 Returned list is backwards.
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1580
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1581 Characters with non-nil values of the text property `literal' are
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1582 assumed to have literal values (e.g., backslash-escaped
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1583 characters), and are not considered to be delimiters."
6154
385d5fe1c95c (comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents: 6148
diff changeset
1584 (if (null comint-delimiter-argument-list)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1585 (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
1586 (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
1587 (pos 0)
385d5fe1c95c (comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents: 6148
diff changeset
1588 (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
1589 (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
1590 (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
1591 (start pos))
76491
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1592 (if (and (memq char comint-delimiter-argument-list)
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1593 ;; Ignore backslash-escaped characters.
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1594 (not (get-text-property pos 'literal arg)))
6154
385d5fe1c95c (comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents: 6148
diff changeset
1595 (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
1596 (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
1597 (while (and (< pos len)
76491
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1598 (not (and (memq (aref arg pos)
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1599 comint-delimiter-argument-list)
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1600 (not (get-text-property
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1601 pos 'literal arg)))))
6154
385d5fe1c95c (comint-arguments): Use just one regexp to find end of arg
Richard M. Stallman <rms@gnu.org>
parents: 6148
diff changeset
1602 (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
1603 (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
1604 args)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1605
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1606 (defun comint-arguments (string nth mth)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1607 "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
1608 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
1609 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
1610 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
1611 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
1612 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
1613 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
1614 Argument 0 is the command name."
23209
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1615 ;; 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
1616 ;; (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
1617 ;; 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
1618 ;; 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
1619 ;; 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
1620 ;; This seems to fit the syntax of BASH 2.0.
76491
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1621 (let* ((backslash-escape (not (and (fboundp 'w32-shell-dos-semantics)
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1622 (w32-shell-dos-semantics))))
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1623 (first (if backslash-escape
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1624 "[^ \n\t\"'`\\]\\|\\(\\\\.\\)\\|"
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1625 "[^ \n\t\"'`]+\\|"))
23209
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1626 (argpart (concat first
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1627 "\\(\"\\([^\"\\]\\|\\\\.\\)*\"\\|\
21018
edbd4156cf68 (comint-arguments): Treat \" and such as part of one arg.
Richard M. Stallman <rms@gnu.org>
parents: 20986
diff changeset
1628 '[^']*'\\|\
23209
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1629 `[^`]*`\\)"))
76491
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1630 (quote-subexpr (if backslash-escape 2 1))
23209
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1631 (args ()) (pos 0)
601bf7681009 (comint-arguments): Ignore backslashes when using
Geoff Voelker <voelker@cs.washington.edu>
parents: 23036
diff changeset
1632 (count 0)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1633 beg str quotes)
8616
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1634 ;; 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
1635 (while (and (or (null mth) (<= count mth))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1636 (string-match argpart string pos))
76491
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1637 ;; Apply the `literal' text property to backslash-escaped
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1638 ;; characters, so that `comint-delim-arg' won't break them up.
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1639 (and backslash-escape
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1640 (match-beginning 1)
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1641 (put-text-property (match-beginning 1) (match-end 1)
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1642 'literal t string))
8616
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1643 (if (and beg (= pos (match-beginning 0)))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1644 ;; It's contiguous, part of the same arg.
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1645 (setq pos (match-end 0)
76491
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1646 quotes (or quotes (match-beginning quote-subexpr)))
8616
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1647 ;; It's a new separate arg.
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1648 (if beg
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1649 ;; 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
1650 (setq str (substring string beg pos)
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1651 args (if quotes (cons str args)
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
1652 (nconc (comint-delim-arg str) args))))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
1653 (setq count (length args))
76491
2c6f34a88eaf (comint-arguments): Mark backslash-escaped chars.
Chong Yidong <cyd@stupidchicken.com>
parents: 76102
diff changeset
1654 (setq quotes (match-beginning quote-subexpr))
8616
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1655 (setq beg (match-beginning 0))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1656 (setq pos (match-end 0))))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1657 (if beg
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1658 (setq str (substring string beg pos)
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1659 args (if quotes (cons str args)
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
1660 (nconc (comint-delim-arg str) args))))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
1661 (setq count (length args))
8616
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1662 (let ((n (or nth (1- count)))
b9a9389714e1 (comint-arguments): Rewrite for speed.
Richard M. Stallman <rms@gnu.org>
parents: 8400
diff changeset
1663 (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
1664 (mapconcat
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1665 (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
1666
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
1667 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
1668 ;; Input processing stuff
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
1669 ;;
33138
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1670 (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
1671 "Add CMD to the input history.
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1672 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
1673 (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
1674 (or (null comint-input-ignoredups)
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1675 (not (ring-p comint-input-ring))
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1676 (ring-empty-p comint-input-ring)
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1677 (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
1678 cmd))))
1d835756e8e7 (comint-add-to-input-history): New function.
Eric M. Ludlam <zappo@gnu.org>
parents: 33055
diff changeset
1679 (ring-insert comint-input-ring cmd)))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1680
61449
a8e7bc540c1c (comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents: 61404
diff changeset
1681 (defun comint-send-input (&optional no-newline artificial)
1356
dcf780f7ae1b Doc fix.
Christopher Zaborsky <rogue@erratum.com>
parents: 1131
diff changeset
1682 "Send input to process.
dcf780f7ae1b Doc fix.
Christopher Zaborsky <rogue@erratum.com>
parents: 1131
diff changeset
1683 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
1684 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
1685 value of variable `comint-get-old-input' to retrieve old input, copies
61449
a8e7bc540c1c (comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents: 61404
diff changeset
1686 it to the process mark, and sends it.
a8e7bc540c1c (comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents: 61404
diff changeset
1687
a8e7bc540c1c (comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents: 61404
diff changeset
1688 This command also sends and inserts a final newline, unless
a8e7bc540c1c (comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents: 61404
diff changeset
1689 NO-NEWLINE is non-nil.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1690
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1691 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
1692 `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
1693 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
1694 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
1695 `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
1696
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
1697 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
1698 end of line before sending the input.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1699
40828
966dca4af18e (comint-send-input): Fix description of `comint-process-echoes' in the
Miles Bader <miles@gnu.org>
parents: 40003
diff changeset
1700 After the input has been sent, if `comint-process-echoes' is non-nil,
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1701 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
1702 matching the input, and if so, deletes that part of the output.
61449
a8e7bc540c1c (comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents: 61404
diff changeset
1703 If ARTIFICIAL is non-nil, it inhibits such deletion.
a8e7bc540c1c (comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents: 61404
diff changeset
1704 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
1705
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
1706 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
1707 `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
1708 in the buffer. E.g.,
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
1709
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1710 If the interpreter is the csh,
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1711 `comint-get-old-input' is the default:
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
1712 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
1713 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
1714 field, or the current line, if point is on an output field.
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
1715 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
1716 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
1717 regexp `comint-prompt-regexp' removed.
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1718 `comint-input-filter-functions' monitors input for \"cd\", \"pushd\", and
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1719 \"popd\" commands. When it sees one, it cd's the buffer.
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1720 `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
1721 space.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1722
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1723 If the Comint is Lucid Common Lisp,
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1724 `comint-get-old-input' snarfs the sexp ending at point.
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1725 `comint-input-filter-functions' does nothing.
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
1726 `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
1727 which matches (1) all whitespace (2) :a, :c, etc.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1728
909
4c6cdb66c74c *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1729 Similarly for Soar, Scheme, etc."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1730 (interactive)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1731 ;; 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
1732 (let ((proc (get-buffer-process (current-buffer))))
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
1733 (if (not proc) (error "Current buffer has no process")
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1734 (widen)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1735 (let* ((pmark (process-mark proc))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1736 (intxt (if (>= (point) (marker-position pmark))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1737 (progn (if comint-eol-on-send (end-of-line))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1738 (buffer-substring pmark (point)))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1739 (let ((copy (funcall comint-get-old-input)))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1740 (goto-char pmark)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1741 (insert copy)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1742 copy)))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1743 (input (if (not (eq comint-input-autoexpand 'input))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1744 ;; Just whatever's already there
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1745 intxt
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1746 ;; Expand and leave it visible in buffer
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1747 (comint-replace-by-expanded-history t pmark)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1748 (buffer-substring pmark (point))))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1749 (history (if (not (eq comint-input-autoexpand 'history))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1750 input
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1751 ;; This is messy 'cos ultimately the original
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1752 ;; functions used do insertion, rather than return
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1753 ;; strings. We have to expand, then insert back.
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1754 (comint-replace-by-expanded-history t pmark)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1755 (let ((copy (buffer-substring pmark (point)))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1756 (start (point)))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1757 (insert input)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1758 (delete-region pmark start)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1759 copy))))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1760
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1761 (unless no-newline
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1762 (insert ?\n))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1763
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1764 (comint-add-to-input-history history)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1766 (run-hook-with-args 'comint-input-filter-functions
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1767 (if no-newline input
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1768 (concat input "\n")))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1769
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1770 (let ((beg (marker-position pmark))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1771 (end (if no-newline (point) (1- (point))))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1772 (inhibit-modification-hooks t))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1773 (when (> end beg)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1774 (add-text-properties beg end
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1775 '(front-sticky t
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1776 font-lock-face comint-highlight-input))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1777 (unless comint-use-prompt-regexp
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1778 ;; Give old user input a field property of `input', to
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1779 ;; distinguish it from both process output and unsent
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1780 ;; input. The terminating newline is put into a special
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1781 ;; `boundary' field to make cursor movement between input
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1782 ;; and output fields smoother.
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1783 (add-text-properties
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1784 beg end
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1785 '(mouse-face highlight
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1786 help-echo "mouse-2: insert after prompt as new input"
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1787 field input))))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1788 (unless (or no-newline comint-use-prompt-regexp)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1789 ;; Cover the terminating newline
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1790 (add-text-properties end (1+ end)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1791 '(rear-nonsticky t
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1792 field boundary
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1793 inhibit-line-move-field-capture t))))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1794
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1795 (comint-snapshot-last-prompt)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1796
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1797 (setq comint-save-input-ring-index comint-input-ring-index)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1798 (setq comint-input-ring-index nil)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1799 ;; Update the markers before we send the input
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1800 ;; in case we get output amidst sending the input.
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1801 (set-marker comint-last-input-start pmark)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1802 (set-marker comint-last-input-end (point))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1803 (set-marker (process-mark proc) (point))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1804 ;; clear the "accumulation" marker
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1805 (set-marker comint-accum-marker nil)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1806 (let ((comint-input-sender-no-newline no-newline))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1807 (funcall comint-input-sender proc input))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1808
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1809 ;; Optionally delete echoed input (after checking it).
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1810 (when (and comint-process-echoes (not artificial))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1811 (let ((echo-len (- comint-last-input-end
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1812 comint-last-input-start)))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1813 ;; Wait for all input to be echoed:
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1814 (while (and (accept-process-output proc)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1815 (> (+ comint-last-input-end echo-len)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1816 (point-max))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1817 (zerop
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1818 (compare-buffer-substrings
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1819 nil comint-last-input-start
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1820 (- (point-max) echo-len)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1821 ;; Above difference is equivalent to
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1822 ;; (+ comint-last-input-start
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1823 ;; (- (point-max) comint-last-input-end))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1824 nil comint-last-input-end (point-max)))))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1825 (if (and
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1826 (<= (+ comint-last-input-end echo-len)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1827 (point-max))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1828 (zerop
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1829 (compare-buffer-substrings
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1830 nil comint-last-input-start comint-last-input-end
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1831 nil comint-last-input-end
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1832 (+ comint-last-input-end echo-len))))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1833 ;; Certain parts of the text to be deleted may have
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1834 ;; been mistaken for prompts. We have to prevent
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1835 ;; problems when `comint-prompt-read-only' is non-nil.
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1836 (let ((inhibit-read-only t))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1837 (delete-region comint-last-input-end
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1838 (+ comint-last-input-end echo-len))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1839 (when comint-prompt-read-only
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1840 (save-excursion
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1841 (goto-char comint-last-input-end)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1842 (comint-update-fence)))))))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1843
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1844 ;; This used to call comint-output-filter-functions,
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1845 ;; but that scrolled the buffer in undesirable ways.
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
1846 (run-hook-with-args 'comint-output-filter-functions "")))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
1847
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
1848 (defvar comint-preoutput-filter-functions nil
26616
615e184ede1b (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 26553
diff changeset
1849 "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
1850 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
1851 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
1852 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
1853 string.
615e184ede1b (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 26553
diff changeset
1854
615e184ede1b (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 26553
diff changeset
1855 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
1856 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
1857 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
1858 redirection buffer.
26616
615e184ede1b (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 26553
diff changeset
1859
43579
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1860 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
1861 either globally or locally.")
19515
a0ecbe13b54b (comint-preoutput-filter-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18805
diff changeset
1862
46941
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1863 (defvar comint-inhibit-carriage-motion nil
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1864 "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
1865 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
1866
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1867 ;; 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
1868 ;; 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
1869 (defvar comint-last-prompt-overlay nil)
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1870
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1871 (defun comint-snapshot-last-prompt ()
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1872 "`snapshot' any current `comint-last-prompt-overlay'.
63175
b09a11c8c73e (comint-check-proc, make-comint-in-buffer, comint-source-default): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 63172
diff changeset
1873 Freeze its attributes in place, even when more input comes along
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
1874 and moves the prompt overlay."
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1875 (when comint-last-prompt-overlay
55881
79a700a71463 (comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55295
diff changeset
1876 (let ((inhibit-read-only t)
79a700a71463 (comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55295
diff changeset
1877 (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
1878 (add-text-properties (overlay-start comint-last-prompt-overlay)
76897
56f63de10254 (comint-send-input): Widen the buffer first.
Chong Yidong <cyd@stupidchicken.com>
parents: 76767
diff changeset
1879 (overlay-end comint-last-prompt-overlay)
56f63de10254 (comint-send-input): Widen the buffer first.
Chong Yidong <cyd@stupidchicken.com>
parents: 76767
diff changeset
1880 (overlay-properties comint-last-prompt-overlay)))))
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
1881
46941
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1882 (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
1883 "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
1884 Translate carriage return/linefeed sequences to linefeeds.
689e6d3dbdc2 (comint-carriage-motion): Doc-string tweaks.
Miles Bader <miles@gnu.org>
parents: 37921
diff changeset
1885 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
1886 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
1887 (save-excursion
92482
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1888 ;; We used to check the existence of \b and \r at first to avoid
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1889 ;; calling save-match-data and save-restriction. But, such a
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1890 ;; check is not necessary now because we don't use regexp search
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1891 ;; nor save-restriction. Note that the buffer is already widen,
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1892 ;; and calling narrow-to-region and widen are not that heavy.
47073
714225426f8e (comint-carriage-motion): Start at START.
Miles Bader <miles@gnu.org>
parents: 46941
diff changeset
1893 (goto-char start)
92482
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1894 (let* ((inhibit-field-text-motion t)
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1895 (inhibit-read-only t)
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1896 (lbeg (line-beginning-position))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1897 delete-end ch)
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1898 ;; If the preceding text is marked as "must-overwrite", record
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1899 ;; it in delete-end.
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1900 (when (and (> start (point-min))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1901 (get-text-property (1- start) 'comint-must-overwrite))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1902 (setq delete-end (point-marker))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1903 (remove-text-properties lbeg start '(comint-must-overwrite nil)))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1904 (narrow-to-region lbeg end)
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1905 ;; Handle BS, LF, and CR specially.
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1906 (while (and (skip-chars-forward "^\b\n\r") (not (eobp)))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1907 (setq ch (following-char))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1908 (cond ((= ch ?\b) ; CH = BS
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1909 (delete-char 1)
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1910 (if (> (point) lbeg)
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1911 (delete-char -1)))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1912 ((= ch ?\n)
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1913 (when delete-end ; CH = LF
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1914 (if (< delete-end (point))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1915 (delete-region lbeg delete-end))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1916 (set-marker delete-end nil)
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1917 (setq delete-end nil))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1918 (forward-char 1)
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1919 (setq lbeg (point)))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1920 (t ; CH = CR
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1921 (delete-char 1)
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1922 (if delete-end
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1923 (when (< delete-end (point))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1924 (delete-region lbeg delete-end)
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1925 (move-marker delete-end (point)))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1926 (setq delete-end (point-marker))))))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1927 (when delete-end
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1928 (if (< delete-end (point))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1929 ;; As there's a text after the last CR, make the current
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1930 ;; line contain only that text.
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1931 (delete-region lbeg delete-end)
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1932 ;; Remember that the process output ends by CR, and thus we
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1933 ;; must overwrite the contents of the current line next
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1934 ;; time.
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1935 (put-text-property lbeg delete-end 'comint-must-overwrite t))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1936 (set-marker delete-end nil))
83962f810455 (comint-exec-1): Don't change the coding-system for
Kenichi Handa <handa@m17n.org>
parents: 87903
diff changeset
1937 (widen))))
39182
ed28d0187d3c (comint-send-input): Handle comint-process-echoes
Gerd Moellmann <gerd@gnu.org>
parents: 39124
diff changeset
1938
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1939 ;; 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
1940 ;; 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
1941 ;; when output is inserted.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
1942 (defun comint-output-filter (process string)
4939
d9ad390ef4e3 (comint-preinput-scroll-to-bottom): Added
Richard M. Stallman <rms@gnu.org>
parents: 4928
diff changeset
1943 (let ((oprocbuf (process-buffer process)))
26174
6860bca6e233 (comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents: 25443
diff changeset
1944 ;; 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
1945 (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
1946 (with-current-buffer oprocbuf
30740
46364997df9c (comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents: 30735
diff changeset
1947 ;; Run preoutput filters
26174
6860bca6e233 (comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents: 25443
diff changeset
1948 (let ((functions comint-preoutput-filter-functions))
6860bca6e233 (comint-output-filter): Make the Comint buffer current
Gerd Moellmann <gerd@gnu.org>
parents: 25443
diff changeset
1949 (while (and functions string)
43579
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1950 (if (eq (car functions) t)
105703
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
1951 (let ((functions
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
1952 (default-value 'comint-preoutput-filter-functions)))
43579
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1953 (while (and functions string)
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1954 (setq string (funcall (car functions) string))
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1955 (setq functions (cdr functions))))
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
1956 (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
1957 (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
1958
30958
ec347dd209e8 (comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents: 30782
diff changeset
1959 ;; Insert STRING
50966
379cf00d7016 (comint-carriage-motion, comint-output-filter):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49549
diff changeset
1960 (let ((inhibit-read-only t)
95899
d5d7186027e2 * progmodes/compile.el (compilation-start): Don't disable undo in
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95777
diff changeset
1961 ;; The point should float after any insertion we do.
d5d7186027e2 * progmodes/compile.el (compilation-start): Don't disable undo in
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95777
diff changeset
1962 (saved-point (copy-marker (point) t)))
31038
9e1d7707876b (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 30964
diff changeset
1963
30958
ec347dd209e8 (comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents: 30782
diff changeset
1964 ;; 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
1965 ;; 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
1966 (save-restriction
ec347dd209e8 (comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents: 30782
diff changeset
1967 (widen)
30740
46364997df9c (comint-output-filter): Doc fixes & misc code cleanup.
Miles Bader <miles@gnu.org>
parents: 30735
diff changeset
1968
30958
ec347dd209e8 (comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents: 30782
diff changeset
1969 (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
1970 (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
1971
31581
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1972 ;; insert-before-markers is a bad thing. XXX
95777
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
1973 ;; Luckily we don't have to use it any more, we use
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
1974 ;; window-point-insertion-type instead.
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
1975 (insert string)
30958
ec347dd209e8 (comint-output-filter): Remove ad-hoc saving of restriction, and just
Miles Bader <miles@gnu.org>
parents: 30782
diff changeset
1976
31581
e4d30cac5296 (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 31260
diff changeset
1977 ;; 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
1978 (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
1979
46941
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1980 (unless comint-inhibit-carriage-motion
1241ed1e9eee [original idea from Luc Teirlinck <teirllm@mail.auburn.edu>]
Miles Bader <miles@gnu.org>
parents: 46250
diff changeset
1981 ;; 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
1982 (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
1983
61592
7c224837fcfe (comint-output-filter): Run comint-output-filter-functions
Richard M. Stallman <rms@gnu.org>
parents: 61449
diff changeset
1984 ;; Run these hooks with point where the user had it.
7c224837fcfe (comint-output-filter): Run comint-output-filter-functions
Richard M. Stallman <rms@gnu.org>
parents: 61449
diff changeset
1985 (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
1986 (run-hook-with-args 'comint-output-filter-functions string)
61592
7c224837fcfe (comint-output-filter): Run comint-output-filter-functions
Richard M. Stallman <rms@gnu.org>
parents: 61449
diff changeset
1987 (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
1988
45916
e8271a03c1eb (comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents: 45898
diff changeset
1989 (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
1990
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
1991 (unless comint-use-prompt-regexp
55881
79a700a71463 (comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55295
diff changeset
1992 (let ((inhibit-read-only t)
79a700a71463 (comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55295
diff changeset
1993 (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
1994 (add-text-properties comint-last-output-start (point)
98232
e3190eb9e11b (comint-output-filter): Make output field properties front-sticky
Miles Bader <miles@gnu.org>
parents: 97764
diff changeset
1995 '(front-sticky
e3190eb9e11b (comint-output-filter): Make output field properties front-sticky
Miles Bader <miles@gnu.org>
parents: 97764
diff changeset
1996 (field inhibit-line-move-field-capture)
e3190eb9e11b (comint-output-filter): Make output field properties front-sticky
Miles Bader <miles@gnu.org>
parents: 97764
diff changeset
1997 rear-nonsticky t
55223
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
1998 field output
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
1999 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
2000
45727
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
2001 ;; 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
2002 ;; the most recent output that doesn't end with a newline.
55223
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
2003 (let ((prompt-start (save-excursion (forward-line 0) (point)))
55881
79a700a71463 (comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55295
diff changeset
2004 (inhibit-read-only t)
79a700a71463 (comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55295
diff changeset
2005 (inhibit-modification-hooks t))
55223
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
2006 (when comint-prompt-read-only
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
2007 (or (= (point-min) prompt-start)
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
2008 (get-text-property (1- prompt-start) 'read-only)
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
2009 (put-text-property
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
2010 (1- prompt-start) prompt-start 'read-only 'fence))
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
2011 (add-text-properties
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
2012 prompt-start (point)
57420
bcfb3a26a3bd (comint-output-filter): Typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57419
diff changeset
2013 '(read-only t rear-nonsticky t front-sticky (read-only))))
55223
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
2014 (unless (and (bolp) (null comint-last-prompt-overlay))
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
2015 ;; Need to create or move the prompt overlay (in the case
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
2016 ;; where there is no prompt ((bolp) == t), we still do
14d50685dce0 (comint-prompt-read-only): New variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55123
diff changeset
2017 ;; 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
2018 (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
2019 ;; 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
2020 (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
2021 prompt-start (point))
a899b2c6ce9b (comint-send-input, comint-output-filter): Use the `font-lock-face'
Miles Bader <miles@gnu.org>
parents: 44663
diff changeset
2022 ;; 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
2023 (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
2024 (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
2025 (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
2026 'font-lock-face 'comint-highlight-prompt))))
30731
4ce2b3d23348 (comint-highlight-prompt, comint-highlight-prompt-face)
Miles Bader <miles@gnu.org>
parents: 30694
diff changeset
2027
45916
e8271a03c1eb (comint-get-old-input-default): Strip text properties for fields too.
Miles Bader <miles@gnu.org>
parents: 45898
diff changeset
2028 (goto-char saved-point)))))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2029
4890
dab300dfe449 (comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 4880
diff changeset
2030 (defun comint-preinput-scroll-to-bottom ()
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2031 "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
2032 Movement occurs if point in the selected window is not after the process mark,
63502
f0f76b7d0f74 (comint-replace-by-expanded-filename, comint-prompt-regexp,
Juanma Barranquero <lekktu@gmail.com>
parents: 63175
diff changeset
2033 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
2034 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
2035 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
2036
4890
dab300dfe449 (comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 4880
diff changeset
2037 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
2038 (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
2039 (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
2040 hilit-yank)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2041 (let* ((selected (selected-window))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2042 (current (current-buffer))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2043 (process (get-buffer-process current))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2044 (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
2045 (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
2046 (if (eq scroll 'this)
23f6d57ced16 (comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents: 5058
diff changeset
2047 (goto-char (point-max))
23f6d57ced16 (comint-preinput-scroll-to-bottom): If SCROLL is `this',
Richard M. Stallman <rms@gnu.org>
parents: 5058
diff changeset
2048 (walk-windows
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2049 (lambda (window)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2050 (if (and (eq (window-buffer window) current)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2051 (or (eq scroll t) (eq scroll 'all)))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2052 (progn
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2053 (select-window window)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2054 (goto-char (point-max))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2055 (select-window selected))))
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
2056 nil t))))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2057
4890
dab300dfe449 (comint-scroll-to-bottom-on-input): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 4880
diff changeset
2058 (defun comint-postoutput-scroll-to-bottom (string)
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
2059 "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
2060 Does not scroll if the current line is the last line in the buffer.
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
2061 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
2062 `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
2063
6187
280d4a97da69 (comint-input-filter-functions)
Richard M. Stallman <rms@gnu.org>
parents: 6185
diff changeset
2064 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
2065 (let* ((selected (selected-window))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2066 (current (current-buffer))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2067 (process (get-buffer-process current))
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
2068 (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
2069 (unwind-protect
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
2070 (if process
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
2071 (walk-windows
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2072 (lambda (window)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2073 (when (eq (window-buffer window) current)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2074 (select-window window)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2075 (if (and (< (point) (process-mark process))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2076 (or (eq scroll t) (eq scroll 'all)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2077 ;; Maybe user wants point to jump to end.
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2078 (and (eq scroll 'this) (eq selected window))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2079 (and (eq scroll 'others) (not (eq selected window)))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2080 ;; If point was at the end, keep it at end.
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2081 (and (marker-position comint-last-output-start)
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2082 (>= (point) comint-last-output-start))))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2083 (goto-char (process-mark process)))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2084 ;; Optionally scroll so that the text
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2085 ;; ends at the bottom of the window.
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2086 (if (and comint-scroll-show-maximum-output
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2087 (= (point) (point-max)))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2088 (save-excursion
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2089 (goto-char (point-max))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2090 (recenter (- -1 scroll-margin))))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2091 (select-window selected)))
5284
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
2092 nil t))
9c8749be37da (comint-read-input-ring): New arg SILENT.
Richard M. Stallman <rms@gnu.org>
parents: 5166
diff changeset
2093 (set-buffer current))))
2683
21ab70613c42 (comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2680
diff changeset
2094
10833
77d7d3990300 Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents: 10830
diff changeset
2095 (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
2096 "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
2097 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
2098 (interactive)
77d7d3990300 Added comint-buffer-maximum-size and comint-truncate-buffer.
Simon Marshall <simon@gnu.org>
parents: 10830
diff changeset
2099 (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
2100 (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
2101 (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
2102 (beginning-of-line)
50966
379cf00d7016 (comint-carriage-motion, comint-output-filter):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49549
diff changeset
2103 (let ((inhibit-read-only t))
379cf00d7016 (comint-carriage-motion, comint-output-filter):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49549
diff changeset
2104 (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
2105
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
2106 (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
2107 "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
2108 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
2109 (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
2110 (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
2111 (save-excursion
20458
ad0d2c5040a0 (comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents: 20020
diff changeset
2112 (condition-case nil
ad0d2c5040a0 (comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents: 20020
diff changeset
2113 (goto-char
105372
bd2966850aac Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents: 105195
diff changeset
2114 (if (called-interactively-p 'interactive)
bd2966850aac Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents: 105195
diff changeset
2115 comint-last-input-end comint-last-output-start))
20458
ad0d2c5040a0 (comint-strip-ctrl-m): Don't die if
Karl Heuer <kwzh@gnu.org>
parents: 20020
diff changeset
2116 (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
2117 (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
2118 (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
2119 (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
2120
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2121 (defun comint-show-maximum-output ()
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2122 "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
2123 (interactive)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2124 (goto-char (point-max))
64169
20da0da3a956 (comint-postoutput-scroll-to-bottom)
Eli Zaretskii <eliz@gnu.org>
parents: 64091
diff changeset
2125 (recenter (- -1 scroll-margin)))
2683
21ab70613c42 (comint-filter): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2680
diff changeset
2126
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2127 (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
2128 "Default for `comint-get-old-input'.
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2129 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
2130 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
2131 current line, if point is on an output field.
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2132 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
2133 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
2134 `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
2135 (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
2136 (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
2137 (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
2138 (comint-bol)
45732
5555fce97d97 Make comint use text properties for highlighting instead of overlays:
Miles Bader <miles@gnu.org>
parents: 45727
diff changeset
2139 (buffer-substring-no-properties (point) (line-end-position)))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2140
70575
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
2141 (defun comint-copy-old-input ()
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
2142 "Insert after prompt old input at point as new input to be edited.
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
2143 Calls `comint-get-old-input' to get old input."
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
2144 (interactive)
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
2145 (let ((input (funcall comint-get-old-input))
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
2146 (process (get-buffer-process (current-buffer))))
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
2147 (if (not process)
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
2148 (error "Current buffer has no process")
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
2149 (goto-char (process-mark process))
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
2150 (insert input))))
aaf48e9df47b (comint-insert-input): Just make it when
Nick Roberts <nickrob@snap.net.nz>
parents: 70553
diff changeset
2151
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2152 (defun comint-skip-prompt ()
3386
bc4729d67e6e (comint-filter): Put window-start before the input.
Richard M. Stallman <rms@gnu.org>
parents: 3113
diff changeset
2153 "Skip past the text matching regexp `comint-prompt-regexp'.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2154 If this takes us past the end of the current line, don't skip at all."
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2155 (if (and (looking-at comint-prompt-regexp)
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2156 (<= (match-end 0) (line-end-position)))
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2157 (goto-char (match-end 0))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2158
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2159 (defun comint-after-pmark-p ()
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2160 "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
2161 (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
2162 (<= (marker-position pmark) (point))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2163
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2164 (defun comint-simple-send (proc string)
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2165 "Default function for sending to PROC input STRING.
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2166 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
2167 set the hook `comint-input-sender'."
78193
b088dcbbe69a (comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents: 76897
diff changeset
2168 (let ((send-string
b088dcbbe69a (comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents: 76897
diff changeset
2169 (if comint-input-sender-no-newline
b088dcbbe69a (comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents: 76897
diff changeset
2170 string
b088dcbbe69a (comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents: 76897
diff changeset
2171 ;; Sending as two separate strings does not work
b088dcbbe69a (comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents: 76897
diff changeset
2172 ;; on Windows, so concat the \n before sending.
b088dcbbe69a (comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents: 76897
diff changeset
2173 (concat string "\n"))))
b088dcbbe69a (comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents: 76897
diff changeset
2174 (comint-send-string proc send-string))
b088dcbbe69a (comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents: 76897
diff changeset
2175 (if (and comint-input-sender-no-newline
b088dcbbe69a (comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents: 76897
diff changeset
2176 (not (string-equal string "")))
b088dcbbe69a (comint-simple-send): Concat newline before sending.
Jason Rumney <jasonr@gnu.org>
parents: 76897
diff changeset
2177 (process-send-eof)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2178
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2179 (defun comint-line-beginning-position ()
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2180 "Return the buffer position of the beginning of the line, after any prompt.
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2181 If `comint-use-prompt-regexp' is non-nil, then the prompt skip is done by
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2182 skipping text matching the regular expression `comint-prompt-regexp',
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2183 a buffer local variable."
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2184 (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
2185 ;; Use comint-prompt-regexp
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2186 (save-excursion
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2187 (beginning-of-line)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2188 (comint-skip-prompt)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2189 (point))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2190 ;; 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
2191 ;; `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
2192 ;; 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
2193 ;; 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
2194 ;; 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
2195 ;; 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
2196 ;; (as input fields should be).
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2197 (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
2198
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2199 (defun comint-bol (&optional arg)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2200 "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
2201 If prefix argument is given (\\[universal-argument]) the prompt is not skipped.
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2202 If `comint-use-prompt-regexp' is non-nil, then the prompt skip is done
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2203 by skipping text matching the regular expression `comint-prompt-regexp',
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2204 a buffer local variable."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2205 (interactive "P")
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2206 (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
2207 ;; 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
2208 (forward-line 0)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2209 (goto-char (comint-line-beginning-position))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2210
58588
a44a4cdb021d (comint-read-noecho): Add trivial compatibility definition.
Richard M. Stallman <rms@gnu.org>
parents: 58375
diff changeset
2211 ;; For compatibility.
a44a4cdb021d (comint-read-noecho): Add trivial compatibility definition.
Richard M. Stallman <rms@gnu.org>
parents: 58375
diff changeset
2212 (defun comint-read-noecho (prompt &optional ignore)
a44a4cdb021d (comint-read-noecho): Add trivial compatibility definition.
Richard M. Stallman <rms@gnu.org>
parents: 58375
diff changeset
2213 (read-passwd prompt))
a44a4cdb021d (comint-read-noecho): Add trivial compatibility definition.
Richard M. Stallman <rms@gnu.org>
parents: 58375
diff changeset
2214
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2215 ;; 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
2216 ;; saved -- typically passwords to ftp, telnet, or somesuch.
57539
8c6fc4afae74 (comint-output-filter-functions): Add comint-watch-for-password-prompt.
Richard M. Stallman <rms@gnu.org>
parents: 57420
diff changeset
2217 ;; Just enter m-x send-invisible and type in your line.
705
c7d478752305 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 662
diff changeset
2218
53391
ab9195f48a6f (comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53272
diff changeset
2219 (defun send-invisible (&optional prompt)
1356
dcf780f7ae1b Doc fix.
Christopher Zaborsky <rogue@erratum.com>
parents: 1131
diff changeset
2220 "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
2221 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
2222 The string is sent using `comint-input-sender'.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2223 Security bug: your string can still be temporarily recovered with
53391
ab9195f48a6f (comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53272
diff changeset
2224 \\[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
2225 (interactive "P") ; Defeat snooping via C-x ESC ESC
64819
fe9134f14297 (send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents: 64762
diff changeset
2226 (let ((proc (get-buffer-process (current-buffer)))
fe9134f14297 (send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents: 64762
diff changeset
2227 (prefix
fe9134f14297 (send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents: 64762
diff changeset
2228 (if (eq (window-buffer (selected-window)) (current-buffer))
fe9134f14297 (send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents: 64762
diff changeset
2229 ""
fe9134f14297 (send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents: 64762
diff changeset
2230 (format "(In buffer %s) "
fe9134f14297 (send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents: 64762
diff changeset
2231 (current-buffer)))))
53391
ab9195f48a6f (comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53272
diff changeset
2232 (if proc
64819
fe9134f14297 (send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents: 64762
diff changeset
2233 (let ((str (read-passwd (concat prefix
fe9134f14297 (send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents: 64762
diff changeset
2234 (or prompt "Non-echoed text: ")))))
53391
ab9195f48a6f (comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53272
diff changeset
2235 (if (stringp str)
ab9195f48a6f (comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53272
diff changeset
2236 (progn
ab9195f48a6f (comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53272
diff changeset
2237 (comint-snapshot-last-prompt)
ab9195f48a6f (comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53272
diff changeset
2238 (funcall comint-input-sender proc str))
ab9195f48a6f (comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53272
diff changeset
2239 (message "Warning: text will be echoed")))
64819
fe9134f14297 (send-invisible): Identify buffer, if not selected.
Richard M. Stallman <rms@gnu.org>
parents: 64762
diff changeset
2240 (error "Buffer %s has no process" (current-buffer)))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2241
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2242 (defun comint-watch-for-password-prompt (string)
6507
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
2243 "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
2244 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
2245 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
2246 `comint-password-prompt-regexp'.
6507
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
2247
ff41e0e932b8 (comint-run): New command.
Richard M. Stallman <rms@gnu.org>
parents: 6256
diff changeset
2248 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
2249 (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
2250 (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
2251 (setq string (replace-match "" t t string)))
53391
ab9195f48a6f (comint-watch-for-password-prompt): Pass `string' as
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53272
diff changeset
2252 (send-invisible string)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2253
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2254 ;; Low-level process communication
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2255
30766
dacf4830a9a0 (comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents: 30740
diff changeset
2256 (defun comint-send-string (process string)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2257 "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
2258 (if process
52fc3d972e9c (comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents: 33182
diff changeset
2259 (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
2260 (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
2261 (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
2262 (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
2263 (comint-snapshot-last-prompt))
dacf4830a9a0 (comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents: 30740
diff changeset
2264 (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
2265
dacf4830a9a0 (comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents: 30740
diff changeset
2266 (defun comint-send-region (process start end)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2267 "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
2268 (if process
52fc3d972e9c (comint-send-string, comint-send-region): Also accept a buffer, buffer-name,
Miles Bader <miles@gnu.org>
parents: 33182
diff changeset
2269 (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
2270 (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
2271 (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
2272 (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
2273 (comint-snapshot-last-prompt))
dacf4830a9a0 (comint-send-string, comint-send-region): Make into real functions.
Miles Bader <miles@gnu.org>
parents: 30740
diff changeset
2274 (process-send-region process start end))
39713
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2275
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2276
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2277 ;; Random input hackage
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2278
32613
6aece997f0f9 (comint-delete-output): Renamed from `comint-kill-output'.
Miles Bader <miles@gnu.org>
parents: 32598
diff changeset
2279 (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
2280 "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
2281 Does not delete the prompt."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2282 (interactive)
6998
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2283 (let ((proc (get-buffer-process (current-buffer)))
55123
a27729919ff1 (comint-delete-output): Bind inhibit-read-only to t.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54879
diff changeset
2284 (replacement nil)
a27729919ff1 (comint-delete-output): Bind inhibit-read-only to t.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54879
diff changeset
2285 (inhibit-read-only t))
6998
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2286 (save-excursion
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2287 (let ((pmark (progn (goto-char (process-mark proc))
32598
b7462e534fdc (comint-output-filter):
Miles Bader <miles@gnu.org>
parents: 32326
diff changeset
2288 (forward-line 0)
6998
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2289 (point-marker))))
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2290 (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
2291 (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
2292 (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
2293 (buffer-substring pmark (point))))
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2294 (delete-region pmark (point))))
40163ff9fc7c (comint-mode): Set comint-last-input-start and
Richard M. Stallman <rms@gnu.org>
parents: 6958
diff changeset
2295 ;; 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
2296 (comint-output-filter proc replacement)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2297
32635
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2298 (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
2299 "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
2300 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
2301
32635
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2302 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
2303 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
2304
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2305 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
2306 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
2307 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
2308 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
2309 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
2310 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
2311 otherwise."
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2312 (interactive
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2313 (list (read-file-name
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2314 (if current-prefix-arg
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2315 "Append output to file: "
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2316 "Write output to file: "))
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2317 current-prefix-arg
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2318 (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
2319 (save-excursion
ba88cc6434f3 (comint-write-output, comint-append-output-to-file): New functions.
Miles Bader <miles@gnu.org>
parents: 32623
diff changeset
2320 (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
2321 (forward-line 0)
32635
9a3072529aa5 (comint-write-output): Add APPEND argument. Rework interactive spec.
Miles Bader <miles@gnu.org>
parents: 32633
diff changeset
2322 (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
2323 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
2324
32892
25182c4fd302 (comint-mode): Locally set `next-line-add-newlines' to nil.
Miles Bader <miles@gnu.org>
parents: 32852
diff changeset
2325 ;; 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
2326 ;; 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
2327 (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
2328 "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
2329 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
2330 (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
2331 (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
2332
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2333 (defun comint-show-output ()
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2334 "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
2335 Sets mark to the value of point when this command is run."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2336 (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
2337 (push-mark)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2338 (let ((pos (or (marker-position comint-last-input-end) (point-max))))
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2339 (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
2340 (goto-char pos)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2341 (beginning-of-line 0)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2342 (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
2343 (comint-skip-prompt))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2344 (t
98385
8f747339c80c (comint-show-output): Adjust to stickiness changes of the output field.
Romain Francoise <romain@orebokech.com>
parents: 98356
diff changeset
2345 (goto-char (field-beginning pos))
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2346 (set-window-start (selected-window) (point))))))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2347
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2348
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2349 (defun comint-interrupt-subjob ()
20894
962d8c41cfa2 (comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents: 20458
diff changeset
2350 "Interrupt the current subjob.
962d8c41cfa2 (comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents: 20458
diff changeset
2351 This command also kills the pending input
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2352 between the process mark and point."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2353 (interactive)
45836
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2354 (comint-skip-input)
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
2355 (interrupt-process nil comint-ptyp)
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2356 ;; (process-send-string nil "\n")
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2357 )
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2358
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2359 (defun comint-kill-subjob ()
20894
962d8c41cfa2 (comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents: 20458
diff changeset
2360 "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
2361 This command also kills the pending input
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2362 between the process mark and point."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2363 (interactive)
45836
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2364 (comint-skip-input)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2365 (kill-process nil comint-ptyp))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2366
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2367 (defun comint-quit-subjob ()
20894
962d8c41cfa2 (comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents: 20458
diff changeset
2368 "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
2369 This command also kills the pending input
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2370 between the process mark and point."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2371 (interactive)
45836
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2372 (comint-skip-input)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2373 (quit-process nil comint-ptyp))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2374
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2375 (defun comint-stop-subjob ()
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2376 "Stop the current subjob.
20894
962d8c41cfa2 (comint-interrupt-subjob): Call comint-kill-input.
Richard M. Stallman <rms@gnu.org>
parents: 20458
diff changeset
2377 This command also kills the pending input
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2378 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
2379
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2380 WARNING: if there is no current subjob, you can end up suspending
57419
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
2381 the top-level process running in the buffer. If you accidentally do
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
2382 this, use \\[comint-continue-subjob] to resume the process. (This
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2383 is not a problem with most shells, since they ignore this signal.)"
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2384 (interactive)
45836
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2385 (comint-skip-input)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2386 (stop-process nil comint-ptyp))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2387
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2388 (defun comint-continue-subjob ()
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2389 "Send CONT signal to process buffer's process group.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2390 Useful if you accidentally suspend the top-level process."
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2391 (interactive)
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2392 (continue-process nil comint-ptyp))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2393
45836
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2394 (defun comint-skip-input ()
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2395 "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
2396 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
2397 (let ((comint-input-sender 'ignore)
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2398 (comint-input-filter-functions nil))
61449
a8e7bc540c1c (comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents: 61404
diff changeset
2399 (comint-send-input t t))
45836
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2400 (end-of-line)
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2401 (let ((pos (point))
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2402 (marker (process-mark (get-buffer-process (current-buffer)))))
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2403 (insert " " (key-description (this-command-keys)))
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2404 (if (= marker pos)
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2405 (set-marker marker (point)))))
e4a48b5ab2fb (comint-skip-input): New function.
Richard M. Stallman <rms@gnu.org>
parents: 45826
diff changeset
2406
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2407 (defun comint-kill-input ()
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2408 "Kill all text from last stuff output by interpreter to point."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2409 (interactive)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2410 (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
2411 (if (> (point) (marker-position pmark))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2412 (kill-region pmark (point)))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2413
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2414 (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
2415 "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
2416 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
2417 (interactive "p")
17269
b177ee3c4f0e (comint-delchar-or-maybe-eof): Check for null proc.
Karl Heuer <kwzh@gnu.org>
parents: 17159
diff changeset
2418 (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
2419 (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
2420 (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
2421 (delete-char arg))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2422
4112
ab7dee78e335 (comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents: 3985
diff changeset
2423 (defun comint-send-eof ()
ab7dee78e335 (comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents: 3985
diff changeset
2424 "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
2425 (interactive)
61449
a8e7bc540c1c (comint-send-input): New arg ARTIFICIAL. Callers in this file changed.
Richard M. Stallman <rms@gnu.org>
parents: 61404
diff changeset
2426 (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
2427 (process-send-eof))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2428
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2429
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2430 (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
2431 "Search backward through buffer for input fields that match REGEXP.
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2432 If `comint-use-prompt-regexp' is non-nil, then input fields are identified
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2433 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
2434
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2435 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
2436 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
2437 (interactive (comint-regexp-arg "Backward input matching (regexp): "))
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2438 (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
2439 ;; Use comint-prompt-regexp
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2440 (let* ((re (concat comint-prompt-regexp ".*" regexp))
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2441 (pos (save-excursion (end-of-line (if (> n 0) 0 1))
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2442 (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
2443 (point)))))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2444 (if (null pos)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2445 (progn (message "Not found")
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2446 (ding))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2447 (goto-char pos)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2448 (comint-bol nil)))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2449 ;; Use input fields
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2450 (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
2451 (pos
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2452 (save-excursion
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2453 (while (/= n 0)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2454 (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
2455 (error "Not found"))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2456 (when (eq (get-char-property (point) 'field) 'input)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2457 (setq n (- n dir))))
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2458 (field-beginning))))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2459 (goto-char pos))))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2460
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2461
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
2462 (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
2463 "Search forward through buffer for input fields that match REGEXP.
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2464 If `comint-use-prompt-regexp' is non-nil, then input fields are identified
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2465 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
2466
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2467 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
2468 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
2469 (interactive (comint-regexp-arg "Forward input matching (regexp): "))
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
2470 (comint-backward-matching-input regexp (- n)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2471
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2472
4112
ab7dee78e335 (comint-{next,prev}-prompt, comint-send-eof): New functions.
Roland McGrath <roland@gnu.org>
parents: 3985
diff changeset
2473 (defun comint-next-prompt (n)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2474 "Move to end of Nth next prompt in the buffer.
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2475 If `comint-use-prompt-regexp' is nil, then this means the beginning of
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2476 the Nth next `input' field, otherwise, it means the Nth occurrence of
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2477 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
2478 (interactive "p")
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2479 (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
2480 ;; Use comint-prompt-regexp
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2481 (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
2482 (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
2483 (forward-paragraph n)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2484 (comint-skip-prompt))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2485 ;; Use input fields
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2486 (let ((pos (point))
38977
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2487 (input-pos nil)
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2488 prev-pos)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2489 (while (/= n 0)
38977
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2490 (setq prev-pos pos)
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2491 (setq pos
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2492 (if (> n 0)
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2493 (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
2494 (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
2495 (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
2496 ;; 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
2497 (when (> n 0)
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2498 ;; 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
2499 ;; 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
2500 (setq input-pos (point-max)))
3037adea8353 (comint-next-prompt): Don't loop infinitely if
Miles Bader <miles@gnu.org>
parents: 38971
diff changeset
2501 ;; stop iterating
30640
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2502 (setq n 0))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2503 ((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
2504 (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
2505 (setq input-pos pos))))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2506 (when input-pos
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2507 (goto-char input-pos)))))
6f943008c543 (comint-use-prompt-regexp-instead-of-fields): New variable.
Miles Bader <miles@gnu.org>
parents: 30325
diff changeset
2508
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2509
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2510 (defun comint-previous-prompt (n)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2511 "Move to end of Nth previous prompt in the buffer.
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2512 If `comint-use-prompt-regexp' is nil, then this means the beginning of
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2513 the Nth previous `input' field, otherwise, it means the Nth occurrence of
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
2514 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
2515 (interactive "p")
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2516 (comint-next-prompt (- n)))
39713
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2517
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2518 ;; 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
2519 (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
2520 (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
2521 (defvar comint-insert-previous-argument-last-index nil)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2522 (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
2523
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2524 ;; Needs fixing:
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2525 ;; 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
2526 (defun comint-insert-previous-argument (index)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2527 "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
2528 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
2529 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
2530 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
2531 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
2532 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
2533 with the first command).
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2534 This command is like `M-.' in bash."
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2535 (interactive "P")
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2536 (unless (null index)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2537 (setq index (prefix-numeric-value index)))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2538 (cond ((eq last-command this-command)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2539 ;; Delete last input inserted by this command.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2540 (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
2541 (setq index comint-insert-previous-argument-last-index))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2542 (t
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2543 ;; 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
2544 (setq comint-input-ring-index nil)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2545 (setq comint-insert-previous-argument-last-index index)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2546 (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
2547 ;; First usage; initialize to a marker
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2548 (setq comint-insert-previous-argument-last-start-pos
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2549 (make-marker)))))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2550 ;; 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
2551 (if (<= (point) (comint-line-beginning-position))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2552 (comint-bol)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2553 (just-one-space))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2554 ;; 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
2555 ;; the command is repeated.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2556 (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
2557 ;; Insert the argument.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2558 (let ((input-string (comint-previous-input-string 0)))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2559 (when (string-match "[ \t\n]*&" input-string)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2560 ;; strip terminating '&'
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2561 (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
2562 (insert (comint-arguments input-string index index)))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2563 ;; Make next invocation return arg from previous input
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2564 (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
2565 ;; Add a terminating space if necessary.
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2566 (unless (eolp)
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2567 (just-one-space)))
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
2568
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2569
55295
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2570 ;; Support editing with `comint-prompt-read-only' set to t.
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2571
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2572 (defun comint-update-fence ()
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2573 "Update read-only status of newline before point.
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2574 The `fence' read-only property is used to indicate that a newline
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2575 is read-only for no other reason than to \"fence off\" a
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2576 following front-sticky read-only region. This is used to
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2577 implement comint read-only prompts. If the text after a newline
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2578 changes, the read-only status of that newline may need updating.
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2579 That is what this function does.
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2580
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2581 This function does nothing if point is not at the beginning of a
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2582 line, or is at the beginning of the accessible portion of the buffer.
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2583 Otherwise, if the character after point has a front-sticky
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2584 read-only property, then the preceding newline is given a
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2585 read-only property of `fence', unless it already is read-only.
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2586 If the character after point does not have a front-sticky
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2587 read-only property, any read-only property of `fence' on the
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2588 preceding newline is removed."
55881
79a700a71463 (comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55295
diff changeset
2589 (let* ((pt (point)) (lst (get-text-property pt 'front-sticky))
79a700a71463 (comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55295
diff changeset
2590 (inhibit-modification-hooks t))
55295
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2591 (and (bolp)
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2592 (not (bobp))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2593 (if (and (get-text-property pt 'read-only)
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2594 (if (listp lst) (memq 'read-only lst) t))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2595 (unless (get-text-property (1- pt) 'read-only)
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2596 (put-text-property (1- pt) pt 'read-only 'fence))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2597 (when (eq (get-text-property (1- pt) 'read-only) 'fence)
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2598 (remove-list-of-text-properties (1- pt) pt '(read-only)))))))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2599
70963
098d9b195f6e (comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70575
diff changeset
2600 (defun comint-kill-whole-line (&optional count)
55295
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2601 "Kill current line, ignoring read-only and field properties.
70963
098d9b195f6e (comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70575
diff changeset
2602 With prefix arg COUNT, kill that many lines starting from the current line.
098d9b195f6e (comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70575
diff changeset
2603 If COUNT is negative, kill backward. Also kill the preceding newline,
57419
658b7dadee60 (comint-mouse-insert-input): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56220
diff changeset
2604 instead of the trailing one. \(This is meant to make \\[repeat] work well
55295
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2605 with negative arguments.)
70963
098d9b195f6e (comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70575
diff changeset
2606 If COUNT is zero, kill current line but exclude the trailing newline.
55295
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2607 The read-only status of newlines is updated with `comint-update-fence',
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2608 if necessary."
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2609 (interactive "p")
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2610 (let ((inhibit-read-only t) (inhibit-field-text-motion t))
70963
098d9b195f6e (comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70575
diff changeset
2611 (kill-whole-line count)
098d9b195f6e (comint-kill-whole-line): Rename arg to count. Fix
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70575
diff changeset
2612 (when (>= count 0) (comint-update-fence))))
55295
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2613
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2614 (defun comint-kill-region (beg end &optional yank-handler)
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2615 "Like `kill-region', but ignores read-only properties, if safe.
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2616 This command assumes that the buffer contains read-only
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2617 \"prompts\" which are regions with front-sticky read-only
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2618 properties at the beginning of a line, with the preceding newline
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2619 being read-only to protect the prompt. This is true of the
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2620 comint prompts if `comint-prompt-read-only' is non-nil. This
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2621 command will not delete the region if this would create mutilated
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2622 or out of place prompts. That is, if any part of a prompt is
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2623 deleted, the entire prompt must be deleted and all remaining
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2624 prompts should stay at the beginning of a line. If this is not
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2625 the case, this command just calls `kill-region' with all
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2626 read-only properties intact. The read-only status of newlines is
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2627 updated using `comint-update-fence', if necessary."
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2628 (interactive "r")
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2629 (save-excursion
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2630 (let* ((true-beg (min beg end))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2631 (true-end (max beg end))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2632 (beg-bolp (progn (goto-char true-beg) (bolp)))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2633 (beg-lst (get-text-property true-beg 'front-sticky))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2634 (beg-bad (and (get-text-property true-beg 'read-only)
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2635 (if (listp beg-lst) (memq 'read-only beg-lst) t)))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2636 (end-bolp (progn (goto-char true-end) (bolp)))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2637 (end-lst (get-text-property true-end 'front-sticky))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2638 (end-bad (and (get-text-property true-end 'read-only)
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2639 (if (listp end-lst) (memq 'read-only end-lst) t))))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2640 (if (or (and (not beg-bolp) (or beg-bad end-bad))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2641 (and (not end-bolp) end-bad))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2642 (kill-region beg end yank-handler)
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2643 (let ((inhibit-read-only t))
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2644 (kill-region beg end yank-handler)
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2645 (comint-update-fence))))))
111624
32de8ce4db5b * comint.el (comint-kill-region): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111623
diff changeset
2646 (set-advertised-calling-convention 'comint-kill-region '(beg end) "23.3")
55295
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2647
16abc166af9d (comint-prompt-read-only): Update docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55223
diff changeset
2648
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2649 ;; Support for source-file processing commands.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2650 ;;============================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2651 ;; Many command-interpreters (e.g., Lisp, Scheme, Soar) have
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2652 ;; 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
2653 ;; files). So the corresponding process-in-a-buffer modes have commands
7308bbc423d5 Doc fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 42119
diff changeset
2654 ;; 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
2655 ;; for defining these commands.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2656 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2657 ;; 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
2658 ;; 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
2659 ;; So the compile/load interface gets the wrong default occasionally.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2660 ;; 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
2661 ;; doesn't know about the relationship between filename extensions and
42205
7308bbc423d5 Doc fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 42119
diff changeset
2662 ;; 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
2663 ;; 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
2664 ;; 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
2665 ;; 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
2666 ;; .lbin, .mo, .vo, .ao, ...).
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2667
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2668
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2669 ;; COMINT-SOURCE-DEFAULT -- determines defaults for source-file processing
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2670 ;; commands.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2671 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2672 ;; 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
2673 ;; 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
2674 ;; interpreter.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2675 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2676 ;; 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
2677 ;; for the file to process.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2678
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2679 (defun comint-source-default (previous-dir/file source-modes)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2680 "Compute the defaults for `load-file' and `compile-file' commands.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2681
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
2682 PREVIOUS-DIR/FILE is a pair (DIRECTORY . FILENAME) from the last
63175
b09a11c8c73e (comint-check-proc, make-comint-in-buffer, comint-source-default): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 63172
diff changeset
2683 source-file processing command, or nil if there hasn't been one yet.
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2684 SOURCE-MODES is a list used to determine what buffers contain source
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2685 files: if the major mode of the buffer is in SOURCE-MODES, it's source.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2686 Typically, (lisp-mode) or (scheme-mode).
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2687
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2688 If the command is given while the cursor is inside a string, *and*
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2689 the string is an existing filename, *and* the filename is not a directory,
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2690 then the string is taken as default. This allows you to just position
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2691 your cursor over a string that's a filename and have it taken as default.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2692
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2693 If the command is given in a file buffer whose major mode is in
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2694 SOURCE-MODES, then the filename is the default file, and the
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2695 file's directory is the default directory.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2696
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2697 If the buffer isn't a source file buffer (e.g., it's the process buffer),
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2698 then the default directory & file are what was used in the last source-file
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2699 processing command (i.e., PREVIOUS-DIR/FILE). If this is the first time
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2700 the command has been run (PREVIOUS-DIR/FILE is nil), the default directory
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2701 is the cwd, with no default file. (\"no default file\" = nil)
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2702
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
2703 SOURCE-MODES is typically going to be something like (tea-mode)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2704 for T programs, (lisp-mode) for Lisp programs, (soar-mode lisp-mode)
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2705 for Soar programs, etc.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2706
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2707 The function returns a pair: (default-directory . default-file)."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2708 (cond ((and buffer-file-name (memq major-mode source-modes))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2709 (cons (file-name-directory buffer-file-name)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2710 (file-name-nondirectory buffer-file-name)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2711 (previous-dir/file)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2712 (t
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2713 (cons default-directory nil))))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2714
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2715
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2716 (defun comint-check-source (fname)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2717 "Check whether to save buffers visiting file FNAME.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2718 Prior to loading or compiling (or otherwise processing) a file (in the CMU
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2719 process-in-a-buffer modes), this function can be called on the filename.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2720 If the file is loaded into a buffer, and the buffer is modified, the user
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2721 is queried to see if he wants to save the buffer before proceeding with
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2722 the load or compile."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2723 (let ((buff (get-file-buffer fname)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2724 (if (and buff
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2725 (buffer-modified-p buff)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2726 (y-or-n-p (format "Save buffer %s first? " (buffer-name buff))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2727 ;; save BUFF.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2728 (let ((old-buffer (current-buffer)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2729 (set-buffer buff)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2730 (save-buffer)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2731 (set-buffer old-buffer)))))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2732
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2733 (defun comint-extract-string ()
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
2734 "Return string around point, or nil."
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2735 (let ((syntax (syntax-ppss)))
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2736 (when (nth 3 syntax)
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2737 (condition-case ()
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2738 (buffer-substring-no-properties (1+ (nth 8 syntax))
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2739 (progn (goto-char (nth 8 syntax))
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2740 (forward-sexp)
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2741 (1- (point))))
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2742 (error nil)))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2743
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2744 (defun comint-get-source (prompt prev-dir/file source-modes mustmatch-p)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2745 "Prompt for filenames in commands that process source files,
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2746 e.g. loading or compiling a file.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2747 Provides a default, if there is one, and returns the result filename.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2748
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2749 See `comint-source-default' for more on determining defaults.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2750
57603
bdfa227d18a8 (comint-insert-input): Use @ in `interactive'.
Richard M. Stallman <rms@gnu.org>
parents: 57539
diff changeset
2751 PROMPT is the prompt string. PREV-DIR/FILE is the (DIRECTORY . FILE) pair
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2752 from the last source processing command. SOURCE-MODES is a list of major
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2753 modes used to determine what file buffers contain source files. (These
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
2754 two arguments are used for determining defaults.) If MUSTMATCH-P is true,
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2755 then the filename reader will only accept a file that exists.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2756
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2757 A typical use:
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2758 (interactive (comint-get-source \"Compile file: \" prev-lisp-dir/file
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2759 '(lisp-mode) t))"
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2760 (let* ((def (comint-source-default prev-dir/file source-modes))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2761 (stringfile (comint-extract-string))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2762 (sfile-p (and stringfile
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2763 (condition-case ()
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2764 (file-exists-p stringfile)
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2765 (error nil))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2766 (not (file-directory-p stringfile))))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2767 (defdir (if sfile-p (file-name-directory stringfile)
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2768 (car def)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2769 (deffile (if sfile-p (file-name-nondirectory stringfile)
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2770 (cdr def)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2771 (ans (read-file-name (if deffile (format "%s(default %s) "
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2772 prompt deffile)
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2773 prompt)
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2774 defdir
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2775 (concat defdir deffile)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2776 mustmatch-p)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2777 (list (expand-file-name (substitute-in-file-name ans)))))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2778
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2779 ;; 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
2780 ;; 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
2781 ;; 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
2782 ;; 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
2783 ;; 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
2784 ;; on this.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2785 ;; -Olin
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2786
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2787
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2788 ;; Simple process query facility.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2789 ;; ===========================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2790 ;; 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
2791 ;; 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
2792 ;; 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
2793 ;; to an inferior Common Lisp process.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2794 ;;
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2795 ;; 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
2796 ;; 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
2797 ;; 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
2798 ;; 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
2799 ;; line. We just display the buffer. Low tech. Simple. Works good.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2800
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2801 (defun comint-proc-query (proc str)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2802 "Send to the inferior process PROC the string STR.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2803 Pop-up but do not select a window for the inferior process so that
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2804 its response can be seen."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2805 (let* ((proc-buf (process-buffer proc))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2806 (proc-mark (process-mark proc)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2807 (display-buffer proc-buf)
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2808 (set-buffer proc-buf) ; but it's not the selected *window*
76767
3f12f4633f63 (comint-proc-query, comint-dynamic-list-completions):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 76491
diff changeset
2809 (let ((proc-win (get-buffer-window proc-buf 0))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2810 (proc-pt (marker-position proc-mark)))
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2811 (comint-send-string proc str) ; send the query
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2812 (accept-process-output proc) ; wait for some output
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2813 ;; Try to position the proc window so you can see the answer.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2814 ;; This is bogus code. If you delete the (sit-for 0), it breaks.
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2815 ;; 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
2816 (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
2817 (let ((opoint (window-point proc-win)))
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2818 (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
2819 (sit-for 0)
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2820 (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
2821 (push-mark opoint)
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
2822 (set-window-point proc-win opoint)))))))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2823
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2824
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2825 ;; Filename/command/history completion in a buffer
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2826 ;; ===========================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2827 ;; Useful completion functions, courtesy of the Ergo group.
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2828
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2829 ;; Six commands:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2830 ;; comint-dynamic-complete Complete or expand command, filename,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2831 ;; history at point.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2832 ;; comint-dynamic-complete-filename Complete filename at point.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2833 ;; comint-dynamic-list-filename-completions List completions in help buffer.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2834 ;; 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
2835 ;; replace with expanded/completed name.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2836 ;; 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
2837
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2838 ;; 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
2839 ;; available for people who want them. Shell-mode installs them:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2840 ;; (define-key shell-mode-map "\t" 'comint-dynamic-complete)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2841 ;; (define-key shell-mode-map "\M-?"
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2842 ;; 'comint-dynamic-list-filename-completions)))
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2843 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
2844 ;; 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
2845 ;; want them present in specific modes.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2846
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2847 (defcustom comint-completion-autolist nil
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
2848 "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
2849 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
2850 :type 'boolean
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2851 :group 'comint-completion)
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2852
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2853 (defcustom comint-completion-addsuffix t
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
2854 "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
2855 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
2856 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
2857 This mirrors the optional behavior of tcsh."
33166
61e62bc5bd7f (comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents: 33138
diff changeset
2858 :type '(choice (const :tag "None" nil)
33167
e821d3197110 Capital in last change.
Dave Love <fx@gnu.org>
parents: 33166
diff changeset
2859 (const :tag "Add /" t)
33166
61e62bc5bd7f (comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents: 33138
diff changeset
2860 (cons :tag "Suffix pair"
61e62bc5bd7f (comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents: 33138
diff changeset
2861 (string :tag "Directory suffix")
61e62bc5bd7f (comint-completion-addsuffix): Fix custom type.
Dave Love <fx@gnu.org>
parents: 33138
diff changeset
2862 (string :tag "File suffix")))
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2863 :group 'comint-completion)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2864
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2865 (defcustom comint-completion-recexact nil
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
2866 "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
2867 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
2868
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2869 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
2870 :type 'boolean
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2871 :group 'comint-completion)
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2872
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2873 (defcustom comint-completion-fignore nil
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
2874 "List of suffixes to be disregarded during file completion.
6256
3810012eb29f (comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6239
diff changeset
2875 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
2876
17428
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2877 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
2878 :type '(repeat (string :tag "Suffix"))
653c0e2e1b31 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17269
diff changeset
2879 :group 'comint-completion)
6256
3810012eb29f (comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6239
diff changeset
2880
65113
58d4ddcf0c9a (comint-file-name-prefix): Add autoload.
Richard M. Stallman <rms@gnu.org>
parents: 64819
diff changeset
2881 ;;;###autoload
105957
25e1d7e37015 * widget.el (define-widget): Purecopy the docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105828
diff changeset
2882 (defvar comint-file-name-prefix (purecopy "")
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2883 "Prefix prepended to absolute file names taken from process input.
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2884 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
2885 directory tracking functions.")
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2886
15817
9e94b5fdaab1 (comint-file-name-chars): Was comint-file-name-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 15727
diff changeset
2887 (defvar comint-file-name-chars
49549
99be3a1e2589 Cygwin support patch.
Juanma Barranquero <lekktu@gmail.com>
parents: 48987
diff changeset
2888 (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
2889 "~/A-Za-z0-9_^$!#%&{}@`'.,:()-"
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2890 "[]~/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
2891 "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
2892 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
2893 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
2894
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
2895 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
2896
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2897 (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
2898 "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
2899
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2900 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
2901
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2902
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2903 (defun comint-directory (directory)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2904 "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
2905 (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
2906 (concat comint-file-name-prefix directory)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2907 directory)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2908
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2909
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2910 (defun comint-word (word-chars)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2911 "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
2912 Word constituents are considered to be those in WORD-CHARS, which is like the
64570
76a0015820fb (comint-use-prompt-regexp, comint-send-input, comint-source-default,
Juanma Barranquero <lekktu@gmail.com>
parents: 64169
diff changeset
2913 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
2914 (save-excursion
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2915 (let ((here (point))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2916 giveup)
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2917 (while (not giveup)
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2918 (let ((startpoint (point)))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2919 (skip-chars-backward (concat "\\\\" word-chars))
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2920 ;; Fixme: This isn't consistent with Bash, at least -- not
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
2921 ;; all non-ASCII chars should be word constituents.
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2922 (if (and (> (- (point) 2) (point-min))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2923 (= (char-after (- (point) 2)) ?\\))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2924 (forward-char -2))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2925 (if (and (> (- (point) 1) (point-min))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2926 (>= (char-after (- (point) 1)) 128))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2927 (forward-char -1))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2928 (if (= (point) startpoint)
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
2929 (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
2930 ;; 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
2931 (when (< (point) here)
21152
8197c659e85c (comint-word): store-match-data => set-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 21018
diff changeset
2932 (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
2933 (match-string 0)))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2934
15369
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2935 (defun comint-substitute-in-file-name (filename)
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2936 "Return FILENAME with environment variables substituted.
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2937 Supports additional environment variable syntax of the command
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2938 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
2939 (let ((name (substitute-in-file-name filename)))
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2940 (if (memq system-type '(ms-dos windows-nt))
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2941 (let (env-var-name
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2942 env-var-val)
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2943 (save-match-data
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2944 (while (string-match "%\\([^\\\\/]*\\)%" name)
105703
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
2945 (setq env-var-name (match-string 1 name))
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
2946 (setq env-var-val (or (getenv env-var-name) ""))
29883
53bc9bb1f0b8 (comint-substitute-in-file-name): Call replace-match
Gerd Moellmann <gerd@gnu.org>
parents: 29078
diff changeset
2947 (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
2948 name))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2949
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2950 (defun comint-match-partial-filename ()
70186
a2173a369f78 (comint-match-partial-filename): Doc fix.
Romain Francoise <romain@orebokech.com>
parents: 70116
diff changeset
2951 "Return the filename at point, or nil if none is found.
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2952 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
2953 (let ((filename (comint-word comint-file-name-chars)))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
2954 (and filename (comint-substitute-in-file-name
15369
0c818ae83d43 (comint-dynamic-complete-as-filename)
Richard M. Stallman <rms@gnu.org>
parents: 15361
diff changeset
2955 (comint-unquote-filename filename)))))
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2956
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2957
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2958 (defun comint-quote-filename (filename)
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2959 "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
2960 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
2961 (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
2962 filename
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2963 (let ((regexp
53272
bb2708b976f1 (comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents: 52401
diff changeset
2964 (format "[%s]"
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
2965 (mapconcat 'char-to-string comint-file-name-quote-list ""))))
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2966 (save-match-data
53272
bb2708b976f1 (comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents: 52401
diff changeset
2967 (let ((i 0))
bb2708b976f1 (comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents: 52401
diff changeset
2968 (while (string-match regexp filename i)
bb2708b976f1 (comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents: 52401
diff changeset
2969 (setq filename (replace-match "\\\\\\&" nil nil filename))
bb2708b976f1 (comint-quote-filename): Correctly handle backslash
Andreas Schwab <schwab@suse.de>
parents: 52401
diff changeset
2970 (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
2971 filename))))
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2972
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2973 (defun comint-unquote-filename (filename)
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2974 "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
2975 (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
2976 filename
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
2977 (save-match-data
15337
cf1e6f4dd2b0 (comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents: 14814
diff changeset
2978 (let ((i 0))
cf1e6f4dd2b0 (comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents: 14814
diff changeset
2979 (while (string-match "\\\\\\(.\\)" filename i)
cf1e6f4dd2b0 (comint-dynamic-complete-filename) [ms-dos, windows-nt]:
Richard M. Stallman <rms@gnu.org>
parents: 14814
diff changeset
2980 (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
2981 (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
2982 filename)))
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2983
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2984
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
2985 (defun comint-dynamic-complete ()
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2986 "Dynamically perform completion at point.
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2987 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
2988 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
2989 assumed to have occurred."
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2990 (interactive)
12208
d10ef5c093ce (comint-mode): Use make-local-hook.
Karl Heuer <kwzh@gnu.org>
parents: 12058
diff changeset
2991 (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
2992
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2993
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2994 (defun comint-dynamic-complete-filename ()
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
2995 "Dynamically complete the filename at point.
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
2996 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
2997 `comint-dynamic-complete-as-filename'.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
2998 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
2999 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
3000 adds completion characters to the end of the filename. A completions listing
111906
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3001 may be shown in a separate buffer if completion is ambiguous.
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3002
6256
3810012eb29f (comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6239
diff changeset
3003 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
3004 `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
3005 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
3006
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3007 Returns t if successful."
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
3008 (interactive)
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3009 (when (comint-match-partial-filename)
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3010 (unless (window-minibuffer-p (selected-window))
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3011 (message "Completing file name..."))
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3012 (comint-dynamic-complete-as-filename)))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3013
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3014 (defun comint-dynamic-complete-as-filename ()
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3015 "Dynamically complete at point as a filename.
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3016 See `comint-dynamic-complete-filename'. Returns t if successful."
81822
64c8ecd78bf2 (comint-dynamic-complete-as-filename,comint-dynamic-list-filename-completions):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81801
diff changeset
3017 (let* ((completion-ignore-case read-file-name-completion-ignore-case)
6256
3810012eb29f (comint-completion-fignore): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6239
diff changeset
3018 (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
3019 ;; 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
3020 ;; 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
3021 ;; 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
3022 ;;(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
3023 (minibuffer-p (window-minibuffer-p (selected-window)))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3024 (success t)
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3025 (dirsuffix (cond ((not comint-completion-addsuffix)
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3026 "")
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3027 ((not (consp comint-completion-addsuffix))
51421
79dc5a8eacfe (comint-move-point-for-output): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 50966
diff changeset
3028 "/")
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3029 (t
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3030 (car comint-completion-addsuffix))))
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3031 (filesuffix (cond ((not comint-completion-addsuffix)
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3032 "")
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3033 ((not (consp comint-completion-addsuffix))
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3034 " ")
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3035 (t
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3036 (cdr comint-completion-addsuffix))))
97744
b5ba9469961a (comint-dynamic-complete-as-filename): If case is ignored while
Chong Yidong <cyd@stupidchicken.com>
parents: 95899
diff changeset
3037 (filename (comint-match-partial-filename))
97762
870ef2dba090 (comint-dynamic-complete-as-filename): Generalize last change to allow
Chong Yidong <cyd@stupidchicken.com>
parents: 97744
diff changeset
3038 (filename-beg (if filename (match-beginning 0) (point)))
870ef2dba090 (comint-dynamic-complete-as-filename): Generalize last change to allow
Chong Yidong <cyd@stupidchicken.com>
parents: 97744
diff changeset
3039 (filename-end (if filename (match-end 0) (point)))
97744
b5ba9469961a (comint-dynamic-complete-as-filename): If case is ignored while
Chong Yidong <cyd@stupidchicken.com>
parents: 95899
diff changeset
3040 (filename (or filename ""))
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3041 (filedir (file-name-directory filename))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3042 (filenondir (file-name-nondirectory filename))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3043 (directory (if filedir (comint-directory filedir) default-directory))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3044 (completion (file-name-completion filenondir directory)))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3045 (cond ((null completion)
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3046 (if minibuffer-p
105703
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3047 (minibuffer-message "No completions of %s" filename)
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3048 (message "No completions of %s" filename))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3049 (setq success nil))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3050 ((eq completion t) ; Means already completed "file".
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3051 (insert filesuffix)
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3052 (unless minibuffer-p
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3053 (message "Sole completion")))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3054 ((string-equal completion "") ; Means completion on "directory/".
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3055 (comint-dynamic-list-filename-completions))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3056 (t ; Completion string returned.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3057 (let ((file (concat (file-name-as-directory directory) completion)))
97762
870ef2dba090 (comint-dynamic-complete-as-filename): Generalize last change to allow
Chong Yidong <cyd@stupidchicken.com>
parents: 97744
diff changeset
3058 ;; Insert completion. Note that the completion string
870ef2dba090 (comint-dynamic-complete-as-filename): Generalize last change to allow
Chong Yidong <cyd@stupidchicken.com>
parents: 97744
diff changeset
3059 ;; may have a different case than what's in the prompt,
870ef2dba090 (comint-dynamic-complete-as-filename): Generalize last change to allow
Chong Yidong <cyd@stupidchicken.com>
parents: 97744
diff changeset
3060 ;; if read-file-name-completion-ignore-case is non-nil,
97744
b5ba9469961a (comint-dynamic-complete-as-filename): If case is ignored while
Chong Yidong <cyd@stupidchicken.com>
parents: 95899
diff changeset
3061 (delete-region filename-beg filename-end)
98356
26e60becb11f (comint-dynamic-complete-as-filename): Quote directory name when
Chong Yidong <cyd@stupidchicken.com>
parents: 98232
diff changeset
3062 (if filedir (insert (comint-quote-filename filedir)))
97762
870ef2dba090 (comint-dynamic-complete-as-filename): Generalize last change to allow
Chong Yidong <cyd@stupidchicken.com>
parents: 97744
diff changeset
3063 (insert (comint-quote-filename (directory-file-name completion)))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3064 (cond ((symbolp (file-name-completion completion directory))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3065 ;; 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
3066 (insert (if (file-directory-p file) dirsuffix filesuffix))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3067 (unless minibuffer-p
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3068 (message "Completed")))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3069 ((and comint-completion-recexact comint-completion-addsuffix
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3070 (string-equal filenondir completion)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3071 (file-exists-p file))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3072 ;; It's not unique, but user wants shortest match.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3073 (insert (if (file-directory-p file) dirsuffix filesuffix))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3074 (unless minibuffer-p
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3075 (message "Completed shortest")))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3076 ((or comint-completion-autolist
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3077 (string-equal filenondir completion))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3078 ;; It's not unique, list possible completions.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3079 (comint-dynamic-list-filename-completions))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3080 (t
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3081 (unless minibuffer-p
20986
72fa617ce5e2 Changed to use directory-sep-char rather than "/".
Simon Marshall <simon@gnu.org>
parents: 20894
diff changeset
3082 (message "Partially completed")))))))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3083 success))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3084
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3085
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3086 (defun comint-replace-by-expanded-filename ()
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3087 "Dynamically expand and complete the filename at point.
111906
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3088 Replace the filename with an expanded, canonicalized and
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3089 completed replacement, i.e. substituting environment
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3090 variables (e.g. $HOME), `~'s, `..', and `.', and making the
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3091 filename absolute. For expansion see `expand-file-name' and
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3092 `substitute-in-file-name'. For completion see
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3093 `comint-dynamic-complete-filename'."
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3094 (interactive)
43530
aee3db99fcca (comint-replace-by-expanded-filename): Do nothing if
Kim F. Storm <storm@cua.dk>
parents: 43492
diff changeset
3095 (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
3096 (when filename
aee3db99fcca (comint-replace-by-expanded-filename): Do nothing if
Kim F. Storm <storm@cua.dk>
parents: 43492
diff changeset
3097 (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
3098 (comint-dynamic-complete-filename))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3099
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3100
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3101 (defun comint-dynamic-simple-complete (stub candidates)
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3102 "Dynamically complete STUB from CANDIDATES list.
111906
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3103 This function inserts completion characters at point by
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3104 completing STUB from the strings in CANDIDATES. If completion is
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3105 ambiguous, possibly show a completions listing in a separate
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3106 buffer.
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3107
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3108 Return nil if no completion was inserted.
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3109 Return `sole' if completed with the only completion match.
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3110 Return `shortest' if completed with the shortest match.
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3111 Return `partial' if completed as far as possible.
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3112 Return `listed' if a completion listing was shown.
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3113
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3114 See also `comint-dynamic-complete-filename'."
49549
99be3a1e2589 Cygwin support patch.
Juanma Barranquero <lekktu@gmail.com>
parents: 48987
diff changeset
3115 (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt cygwin)))
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3116 (minibuffer-p (window-minibuffer-p (selected-window)))
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
3117 (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
3118 ((not (consp comint-completion-addsuffix)) " ")
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
3119 (t (cdr comint-completion-addsuffix))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3120 (completions (all-completions stub candidates)))
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3121 (cond ((null completions)
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3122 (if minibuffer-p
105703
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3123 (minibuffer-message "No completions of %s" stub)
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3124 (message "No completions of %s" stub))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3125 nil)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3126 ((= 1 (length completions)) ; Gotcha!
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3127 (let ((completion (car completions)))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3128 (if (string-equal completion stub)
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3129 (unless minibuffer-p
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3130 (message "Sole completion"))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3131 (insert (substring completion (length stub)))
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3132 (unless minibuffer-p
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3133 (message "Completed")))
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
3134 (insert suffix)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3135 'sole))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3136 (t ; There's no unique completion.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3137 (let ((completion (try-completion stub candidates)))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3138 ;; Insert the longest substring.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3139 (insert (substring completion (length stub)))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3140 (cond ((and comint-completion-recexact comint-completion-addsuffix
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3141 (string-equal stub completion)
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3142 (member completion completions))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3143 ;; It's not unique, but user wants shortest match.
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3144 (insert suffix)
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3145 (unless minibuffer-p
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3146 (message "Completed shortest"))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3147 'shortest)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3148 ((or comint-completion-autolist
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3149 (string-equal stub completion))
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3150 ;; It's not unique, list possible completions.
93134
4e8466e2b7c4 * comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents: 93132
diff changeset
3151 (comint-dynamic-list-completions completions stub)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3152 'listed)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3153 (t
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3154 (unless minibuffer-p
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3155 (message "Partially completed"))
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3156 'partial)))))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3157
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3158
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3159 (defun comint-dynamic-list-filename-completions ()
111906
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3160 "Display a list of possible completions for the filename at point."
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3161 (interactive)
81822
64c8ecd78bf2 (comint-dynamic-complete-as-filename,comint-dynamic-list-filename-completions):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81801
diff changeset
3162 (let* ((completion-ignore-case read-file-name-completion-ignore-case)
15654
6f32894f4ad3 1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark.
Simon Marshall <simon@gnu.org>
parents: 15541
diff changeset
3163 ;; 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
3164 ;; 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
3165 ;; 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
3166 ;;(file-name-handler-alist nil)
6185
82a92cf44059 (comint-after-partial-filename-command,
Richard M. Stallman <rms@gnu.org>
parents: 6154
diff changeset
3167 (filename (or (comint-match-partial-filename) ""))
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3168 (filedir (file-name-directory filename))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3169 (filenondir (file-name-nondirectory filename))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3170 (directory (if filedir (comint-directory filedir) default-directory))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3171 (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
3172 (if (not completions)
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3173 (if (window-minibuffer-p (selected-window))
105703
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3174 (minibuffer-message "No completions of %s" filename)
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3175 (message "No completions of %s" filename))
11187
ac3611b5f490 Added support for special (quoted) characters in file names:
Simon Marshall <simon@gnu.org>
parents: 11156
diff changeset
3176 (comint-dynamic-list-completions
93134
4e8466e2b7c4 * comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents: 93132
diff changeset
3177 (mapcar 'comint-quote-filename completions)
97764
0445036f6742 (comint-dynamic-list-filename-completions): Quote common substring.
Chong Yidong <cyd@stupidchicken.com>
parents: 97762
diff changeset
3178 (comint-quote-filename filenondir)))))
4872
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3179
628cbf7e7005 (comint-after-partial-file-name-command):
Richard M. Stallman <rms@gnu.org>
parents: 4675
diff changeset
3180
46171
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
3181 ;; 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
3182 ;; 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
3183 ;; 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
3184 (defvar comint-displayed-dynamic-completions nil)
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
3185
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3186 (defvar comint-dynamic-list-completions-config nil)
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3187
93134
4e8466e2b7c4 * comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents: 93132
diff changeset
3188 (defun comint-dynamic-list-completions (completions &optional common-substring)
111906
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3189 "Display a list of sorted COMPLETIONS.
93134
4e8466e2b7c4 * comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents: 93132
diff changeset
3190 The meaning of COMMON-SUBSTRING is the same as in `display-completion-list'.
111906
da6435021d47 Doc fixes for comint functions (Bug#7499).
Chong Yidong <cyd@stupidchicken.com>
parents: 111624
diff changeset
3191 Typing SPC flushes the completions buffer."
76767
3f12f4633f63 (comint-proc-query, comint-dynamic-list-completions):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 76491
diff changeset
3192 (let ((window (get-buffer-window "*Completions*" 0)))
46250
2c383709a149 (comint-dynamic-list-completions): Sort COMPLETIONS before first use.
Miles Bader <miles@gnu.org>
parents: 46171
diff changeset
3193 (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
3194 (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
3195 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
3196 (buffer-name (window-buffer window))
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
3197 ;; 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
3198 ;; 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
3199 ;; 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
3200 ;; 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
3201 ;; previous completion command with a different set of
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
3202 ;; 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
3203 ;; 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
3204 ;; displayed set.
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
3205 (equal completions
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
3206 (buffer-local-value 'comint-displayed-dynamic-completions
c1c7a7405444 (comint-displayed-dynamic-completions): New variable.
Miles Bader <miles@gnu.org>
parents: 45916
diff changeset
3207 (window-buffer window))))
42669
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
3208 ;; If this command was repeated, and
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
3209 ;; 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
3210 ;; 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
3211 (with-current-buffer (window-buffer window)
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
3212 (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
3213 (set-window-start window (point-min))
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
3214 (save-selected-window
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
3215 (select-window window)
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
3216 (scroll-up))))
356ecd21a13c (comint-dynamic-list-completions): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents: 42450
diff changeset
3217
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3218 ;; Display a completion list for the first time.
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3219 (setq comint-dynamic-list-completions-config
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3220 (current-window-configuration))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3221 (with-output-to-temp-buffer "*Completions*"
93134
4e8466e2b7c4 * comint.el (comint-dynamic-simple-complete):
Juri Linkov <juri@jurta.org>
parents: 93132
diff changeset
3222 (display-completion-list completions common-substring))
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3223 (if (window-minibuffer-p (selected-window))
105703
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3224 (minibuffer-message "Type space to flush; repeat completion command to scroll")
93132
13f0e673b94b (comint-dynamic-complete-as-filename)
Juri Linkov <juri@jurta.org>
parents: 92765
diff changeset
3225 (message "Type space to flush; repeat completion command to scroll")))
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3226
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3227 ;; Read the next key, to process SPC.
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3228 (let (key first)
55881
79a700a71463 (comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55295
diff changeset
3229 (if (with-current-buffer (get-buffer "*Completions*")
79a700a71463 (comint-replace-by-expanded-history-before-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55295
diff changeset
3230 (set (make-local-variable 'comint-displayed-dynamic-completions)
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3231 completions)
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3232 (setq key (read-key-sequence nil)
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3233 first (aref key 0))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3234 (and (consp first) (consp (event-start first))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3235 (eq (window-buffer (posn-window (event-start first)))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3236 (get-buffer "*Completions*"))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3237 (eq (key-binding key) 'mouse-choose-completion)))
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3238 ;; If the user does mouse-choose-completion with the mouse,
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3239 ;; execute the command, then delete the completion window.
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3240 (progn
105740
f6fc3559bd1d (comint-dynamic-list-completions): Use choose-completion rather than
Glenn Morris <rgm@gnu.org>
parents: 105703
diff changeset
3241 (choose-completion first)
53399
9a9d11c249b9 (comint-arguments): Set COUNT after ARGS is complete.
Richard M. Stallman <rms@gnu.org>
parents: 53391
diff changeset
3242 (set-window-configuration comint-dynamic-list-completions-config))
69687
4b35cb9e0b98 (comint-dynamic-list-completions): Allow user to select *Completions* buffer.
Nick Roberts <nickrob@snap.net.nz>
parents: 68651
diff changeset
3243 (if (eq first ?\s)
4b35cb9e0b98 (comint-dynamic-list-completions): Allow user to select *Completions* buffer.
Nick Roberts <nickrob@snap.net.nz>
parents: 68651
diff changeset
3244 (set-window-configuration comint-dynamic-list-completions-config)
4b35cb9e0b98 (comint-dynamic-list-completions): Allow user to select *Completions* buffer.
Nick Roberts <nickrob@snap.net.nz>
parents: 68651
diff changeset
3245 (setq unread-command-events (listify-key-sequence key)))))))
39713
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
3246
114
899728e6052a Initial revision
David Lawrence <tale@gnu.org>
parents:
diff changeset
3247
22265
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3248 (defun comint-get-next-from-history ()
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3249 "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
3250 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
3251 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
3252 (interactive)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3253 (if comint-save-input-ring-index
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3254 (progn
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3255 (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
3256 (comint-next-input 1))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3257 (message "No previous history command")))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3258
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3259 (defun comint-accumulate ()
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3260 "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
3261 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
3262 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
3263 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
3264 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
3265 when you send it."
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3266 (interactive)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3267 (insert "\n")
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3268 (set-marker comint-accum-marker (point))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3269 (if comint-input-ring-index
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3270 (setq comint-save-input-ring-index
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3271 (- comint-input-ring-index 1))))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3272
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3273 (defun comint-goto-process-mark ()
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3274 "Move point to the process mark.
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3275 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
3276 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
3277 (interactive)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3278 (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
3279 (error "Current buffer has no process"))))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3280 (goto-char (process-mark proc))
105372
bd2966850aac Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents: 105195
diff changeset
3281 (when (called-interactively-p 'interactive)
35236
ebc45a028f0f (comint-goto-process-mark): Don't print a message
Gerd Moellmann <gerd@gnu.org>
parents: 34977
diff changeset
3282 (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
3283
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3284 (defun comint-bol-or-process-mark ()
24765
6c69a507d9bd (comint-bol-or-process-mark): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 24719
diff changeset
3285 "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
3286 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
3287 \(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
3288 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
3289
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3290 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
3291 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
3292 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
3293 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
3294 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
3295 (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
3296 (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
3297 (comint-bol nil)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3298 (comint-goto-process-mark)))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3299
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3300 (defun comint-set-process-mark ()
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3301 "Set the process mark at point."
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3302 (interactive)
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3303 (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
3304 (error "Current buffer has no process"))))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3305 (set-marker (process-mark proc) (point))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3306 (message "Process mark set")))
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3307
46bb1b22d269 (comint-get-next-from-history): New command.
Richard M. Stallman <rms@gnu.org>
parents: 21951
diff changeset
3308
42887
466c8a363992 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 42831
diff changeset
3309 ;; 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
3310
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3311 ;; 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
3312 ;; 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
3313 ;; or buffers, and then go back to using the comint shell.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3314 ;;
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3315 ;; 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
3316 ;; query using the process associated with a comint-buffer, and save that
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3317 ;; 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
3318 ;; 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
3319 ;; process and having it execute the query and then finish, would not
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3320 ;; 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
3321 ;; starting a new process is the simpler, and thus preferable, approach.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3322 ;;
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3323 ;; The basic implementation is as follows: comint-redirect changes the
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3324 ;; preoutput filter functions (`comint-preoutput-filter-functions') to use
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3325 ;; 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
3326 ;; or buffers, until it sees a regexp that tells it to stop (by default,
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3327 ;; 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
3328 ;; sees the stop regexp, it restores the old filter functions, and runs
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3329 ;; `comint-redirect-hook'.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3330 ;;
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3331 ;; 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
3332 ;; 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
3333 ;;
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3334 ;; 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
3335 ;; correct prompt for your interpreter, or that you supply a regexp that says
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3336 ;; when the redirection is finished. Otherwise, redirection will continue
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3337 ;; 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
3338 ;; 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
3339 ;; this prompt is set correctly.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3340 ;;
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3341 ;; 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
3342 ;; 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
3343 ;; 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
3344 ;;
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3345 ;; Fixme: look for appropriate fields, rather than regexp, if
61873
1cd2d4d601fa (comint-prompt-regexp, comint-get-old-input)
Luc Teirlinck <teirllm@auburn.edu>
parents: 61592
diff changeset
3346 ;; `comint-use-prompt-regexp' is true.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3347
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3348 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3349 ;; Variables
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3350 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3351
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3352 (defcustom comint-redirect-verbose nil
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 98385
diff changeset
3353 "If non-nil, print messages each time the redirection filter is invoked.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3354 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
3355 :group 'comint
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3356 :type 'boolean)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3357
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3358 ;; Directly analagous to comint-preoutput-filter-functions
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3359 (defvar comint-redirect-filter-functions nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3360 "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
3361 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
3362 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
3363 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
3364 string.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3365
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3366 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
3367 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
3368 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
3369
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3370 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
3371 either globally or locally.")
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3372
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3373 ;; Internal variables
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3374
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3375 (defvar comint-redirect-output-buffer nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3376 "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
3377
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3378 (defvar comint-redirect-finished-regexp nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3379 "Regular expression that determines when to stop redirection in Comint.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3380 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
3381 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
3382
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3383 (defvar comint-redirect-insert-matching-regexp nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3384 "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
3385 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
3386 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
3387 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
3388
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3389 (defvar comint-redirect-echo-input nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3390 "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
3391
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3392 (defvar comint-redirect-completed nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3393 "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
3394
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3395 (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
3396 "Original mode line for redirected process.")
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3397
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3398 (defvar comint-redirect-perform-sanity-check t
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3399 "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
3400 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
3401 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
3402 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
3403 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
3404 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
3405 in the process buffer already.")
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3406
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3407 (defvar comint-redirect-original-filter-function nil
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3408 "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
3409 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
3410 this value.")
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3411
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3412 (defvar comint-redirect-subvert-readonly nil
65784
06a7b3628c63 (comint-redirect-subvert-readonly): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 65724
diff changeset
3413 "Non-nil means `comint-redirect' can insert into read-only buffers.
06a7b3628c63 (comint-redirect-subvert-readonly): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 65724
diff changeset
3414 This works by binding `inhibit-read-only' around the insertion.
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3415 This is useful, for instance, for insertion into Help mode buffers.
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3416 You probably want to set it locally to the output buffer.")
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3417
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3418 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3419 ;; Functions
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3420 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3421
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3422 (defun comint-redirect-setup (output-buffer
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3423 comint-buffer
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3424 finished-regexp
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3425 &optional echo-input)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3426 "Set up for output redirection.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3427 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
3428 to perform redirection.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3429
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3430 Output from COMINT-BUFFER is redirected to OUTPUT-BUFFER, until something
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3431 in the output matches FINISHED-REGEXP.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3432
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3433 If optional argument ECHO-INPUT is non-nil, output is echoed to the
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3434 original Comint buffer.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3435
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3436 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
3437 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
3438 (with-current-buffer comint-buffer
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3439
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3440 (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
3441 (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
3442
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3443 (make-local-variable 'comint-redirect-output-buffer)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3444 (setq comint-redirect-output-buffer output-buffer)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3445
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3446 (make-local-variable 'comint-redirect-finished-regexp)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3447 (setq comint-redirect-finished-regexp finished-regexp)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3448
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3449 (make-local-variable 'comint-redirect-echo-input)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3450 (setq comint-redirect-echo-input echo-input)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3451
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3452 (make-local-variable 'comint-redirect-completed)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3453 (setq comint-redirect-completed nil)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3454
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3455 (setq mode-line-process
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3456 (if mode-line-process
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3457 (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
3458 (list ":%s Redirection")))))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3459
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3460 (defun comint-redirect-cleanup ()
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3461 "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
3462 (interactive)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3463 ;; Restore the process filter
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3464 (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
3465 comint-redirect-original-filter-function)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3466 ;; Restore the mode line
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3467 (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
3468 ;; Set the completed flag
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3469 (setq comint-redirect-completed t))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3470
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3471 ;; 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
3472 ;; that it really occurs.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3473 (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
3474
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3475 (defun comint-redirect-filter (process input-string)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3476 "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
3477 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
3478 place output in.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3479
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3480 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
3481
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3482 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
3483 end user."
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3484 (and process
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3485 (with-current-buffer (process-buffer process)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3486 (comint-redirect-preoutput-filter input-string)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3487 ;; 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
3488 (and comint-redirect-echo-input
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3489 comint-redirect-original-filter-function
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3490 (funcall comint-redirect-original-filter-function
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3491 process input-string)))))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3492
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3493
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3494 (defun comint-redirect-preoutput-filter (input-string)
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3495 "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
3496 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
3497 place output in.
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3498
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3499 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
3500
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3501 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
3502 (let ((output-buffer-list
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3503 (if (listp comint-redirect-output-buffer)
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3504 comint-redirect-output-buffer
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3505 (list comint-redirect-output-buffer)))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3506 (filtered-input-string input-string))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3507
105703
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3508 ;; If there are any filter functions, give them a chance to modify
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3509 ;; the string.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3510 (let ((functions comint-redirect-filter-functions))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3511 (while (and functions filtered-input-string)
43579
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3512 (if (eq (car functions) t)
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3513 ;; 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
3514 ;; do that.
105703
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3515 (let ((functions
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3516 (default-value 'comint-redirect-filter-functions)))
43579
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3517 (while (and functions filtered-input-string)
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3518 (setq filtered-input-string
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3519 (funcall (car functions) filtered-input-string))
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3520 (setq functions (cdr functions))))
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3521 (setq filtered-input-string
ebb2754ac469 (comint-preoutput-filter-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43530
diff changeset
3522 (funcall (car functions) filtered-input-string)))
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3523 (setq functions (cdr functions))))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3524
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3525 ;; Clobber `comint-redirect-finished-regexp'
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3526 (or comint-redirect-insert-matching-regexp
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3527 (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
3528 (setq filtered-input-string
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3529 (replace-match "" nil nil filtered-input-string))))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3530
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3531 ;; Send output to all registered buffers
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3532 (save-excursion
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3533 (dolist (buf output-buffer-list)
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3534 ;; Set this buffer to the output buffer
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3535 (set-buffer (get-buffer-create buf))
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3536 ;; Go to the end of the buffer
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3537 (goto-char (point-max))
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3538 ;; Insert the output
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3539 (let ((inhibit-read-only comint-redirect-subvert-readonly))
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3540 (insert filtered-input-string))))
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3541
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3542 ;; Message
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3543 (and comint-redirect-verbose
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3544 (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
3545 (mapconcat 'identity output-buffer-list " ")))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3546
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3547 ;; If we see the prompt, tidy up
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3548 ;; 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
3549 ;; clobber it
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3550 (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
3551 (progn
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3552 (and comint-redirect-verbose
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3553 (message "Redirection completed"))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3554 (comint-redirect-cleanup)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3555 (run-hooks 'comint-redirect-hook)))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3556 ;; Echo input?
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3557 (if comint-redirect-echo-input
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3558 filtered-input-string
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3559 "")))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3560
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3561 ;;;###autoload
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3562 (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
3563 "Send COMMAND to process in current buffer, with output to OUTPUT-BUFFER.
54879
4763dd572f96 Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53399
diff changeset
3564 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
3565
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3566 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
3567 (interactive "sCommand: \nBOutput Buffer: \nP")
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3568 (let ((process (get-buffer-process (current-buffer))))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3569 (if process
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3570 (comint-redirect-send-command-to-process
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3571 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
3572 (error "No process for current buffer"))))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3573
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3574 ;;;###autoload
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3575 (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
3576 (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
3577 "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
3578 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
3579
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3580 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
3581 (interactive "sCommand: \nBOutput Buffer: \nbProcess Buffer: \nP")
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3582 (let* (;; The process buffer
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3583 (process-buffer (if (processp process)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3584 (process-buffer process)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3585 process))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3586 (proc (get-buffer-process process-buffer)))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3587 ;; 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
3588 (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
3589
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3590 ;; 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
3591 (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
3592 (save-excursion
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3593 (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
3594 (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
3595 (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
3596
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3597 ;; Set up for redirection
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3598 (comint-redirect-setup
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3599 output-buffer
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3600 (current-buffer) ; Comint Buffer
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3601 comint-prompt-regexp ; Finished Regexp
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3602 echo) ; Echo input
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3603
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3604 ;; Set the filter
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3605 (setq comint-redirect-original-filter-function ; Save the old filter
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3606 (process-filter proc))
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3607 (set-process-filter proc 'comint-redirect-filter)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3608
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3609 ;; Send the command
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3610 (process-send-string (current-buffer) (concat command "\n"))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3611
42831
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3612 ;; Show the output
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3613 (or no-display
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3614 (display-buffer
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3615 (get-buffer-create
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3616 (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
3617 (car output-buffer)
ba5189cc6432 (comint-redirect-send-command-to-process): Restore previous current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 42803
diff changeset
3618 output-buffer)))))))
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3619
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3620 ;;;###autoload
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3621 (defun comint-redirect-results-list (command regexp regexp-group)
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3622 "Send COMMAND to current process.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3623 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
3624 REGEXP-GROUP is the regular expression group in REGEXP to use."
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3625 (comint-redirect-results-list-from-process
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3626 (get-buffer-process (current-buffer))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3627 command regexp regexp-group))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3628
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3629 ;;;###autoload
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3630 (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
3631 "Send COMMAND to PROCESS.
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3632 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
3633 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
3634 (let ((output-buffer " *Comint Redirect Work Buffer*")
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3635 results)
105703
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3636 (with-current-buffer (get-buffer-create output-buffer)
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3637 (erase-buffer)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3638 (comint-redirect-send-command-to-process command
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3639 output-buffer process nil t)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3640 ;; Wait for the process to complete
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3641 (set-buffer (process-buffer process))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3642 (while (null comint-redirect-completed)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3643 (accept-process-output nil 1))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3644 ;; Collect the output
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3645 (set-buffer output-buffer)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3646 (goto-char (point-min))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3647 ;; 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
3648 (and (looking-at command)
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3649 (forward-line))
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3650 (while (re-search-forward regexp nil t)
105703
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3651 (push (buffer-substring-no-properties
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3652 (match-beginning regexp-group)
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3653 (match-end regexp-group))
56a197ab757c (comint-read-input-ring, comint-write-input-ring)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
3654 results))
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3655 results)))
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3656
92765
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3657 (dolist (x '("^Not at command line$"
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3658 "^Empty input ring$"
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3659 "^No history$"
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3660 "^Not found$" ; Too common?
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3661 "^Current buffer has no process$"))
8a7561cc8360 Fix up indentation and comment style. Remove `function'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92482
diff changeset
3662 (add-to-list 'debug-ignored-errors x))
39713
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
3663
26553
b3b1f3b51229 Add redirection.from active comint buffers into
Gerd Moellmann <gerd@gnu.org>
parents: 26174
diff changeset
3664
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3665 ;; Converting process modes to use comint mode
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3666 ;; ===========================================================================
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3667 ;; 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
3668 ;; 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
3669 ;; 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
3670 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3671 ;; Renaming variables
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3672 ;; 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
3673 ;; ones:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3674 ;; Local variables:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3675 ;; last-input-start comint-last-input-start
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3676 ;; last-input-end comint-last-input-end
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3677 ;; shell-prompt-pattern comint-prompt-regexp
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3678 ;; shell-set-directory-error-hook <no equivalent>
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3679 ;; Miscellaneous:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3680 ;; shell-set-directory <unnecessary>
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3681 ;; shell-mode-map comint-mode-map
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3682 ;; Commands:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3683 ;; shell-send-input comint-send-input
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3684 ;; shell-send-eof comint-delchar-or-maybe-eof
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3685 ;; kill-shell-input comint-kill-input
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3686 ;; interrupt-shell-subjob comint-interrupt-subjob
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3687 ;; stop-shell-subjob comint-stop-subjob
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3688 ;; quit-shell-subjob comint-quit-subjob
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3689 ;; 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
3690 ;; kill-output-from-shell comint-delete-output
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3691 ;; show-output-from-shell comint-show-output
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3692 ;; 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
3693 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3694 ;; SHELL-SET-DIRECTORY is gone, its functionality taken over by
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3695 ;; 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
3696 ;; Comint mode does not provide functionality equivalent to
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3697 ;; shell-set-directory-error-hook; it is gone.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3698 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3699 ;; 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
3700 ;; the buffer after input is sent, perhaps because the inferior
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3701 ;; 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
3702 ;; 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
3703 ;; 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
3704 ;; for this; the input history ring often does the job better.
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3705 ;;
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3706 ;; 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
3707 ;; *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
3708 ;; 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
3709 ;; necessary comint-specific local variables. Then create the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3710 ;; 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
3711 ;; 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
3712 ;; (comint-{prompt-regexp, input-filter, input-filter-functions,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3713 ;; 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
3714 ;; 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
3715 ;; 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
3716 ;; is typical:
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3717 ;;
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3718 ;; (defvar shell-mode-map '())
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3719 ;; (cond ((not shell-mode-map)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3720 ;; (setq shell-mode-map (copy-keymap comint-mode-map))
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3721 ;; (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
3722 ;; (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
3723 ;; (define-key shell-mode-map "\t" 'comint-dynamic-complete)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3724 ;; (define-key shell-mode-map "\M-?"
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3725 ;; 'comint-dynamic-list-filename-completions)))
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3726 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3727 ;; (defun shell-mode ()
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3728 ;; (interactive)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3729 ;; (comint-mode)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3730 ;; (setq comint-prompt-regexp shell-prompt-pattern)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3731 ;; (setq major-mode 'shell-mode)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3732 ;; (setq mode-name "Shell")
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3733 ;; (use-local-map shell-mode-map)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3734 ;; (make-local-variable 'shell-directory-stack)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3735 ;; (setq shell-directory-stack nil)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3736 ;; (add-hook 'comint-input-filter-functions 'shell-directory-tracker)
62740
073c3cc1d1d5 Use run-mode-hooks in example.
Lute Kamstra <lute@gnu.org>
parents: 61922
diff changeset
3737 ;; (run-mode-hooks 'shell-mode-hook))
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3738 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3739 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3740 ;; Completion for comint-mode users
32326
b8132c394173 Cleanup whitespace.
Miles Bader <miles@gnu.org>
parents: 32196
diff changeset
3741 ;;
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13971
diff changeset
3742 ;; 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
3743 ;; 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
3744 ;; 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
3745 ;; 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
3746 ;; completion job.
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
3747
39713
25d48943cd58 (comint-insert-previous-argument): New function.
Miles Bader <miles@gnu.org>
parents: 39240
diff changeset
3748
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 182
diff changeset
3749 (provide 'comint)
662
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 638
diff changeset
3750
38409
153f1b1f2efd Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 38073
diff changeset
3751 ;;; comint.el ends here