annotate lisp/eshell/esh-mode.el @ 52847:b1a58a58e5ef

*** empty log message ***
author Richard M. Stallman <rms@gnu.org>
date Mon, 13 Oct 2003 19:40:41 +0000
parents 695cf19ef79e
children 94735a7620dd 375f2633d815
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38414
67b464da13ec Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38111
diff changeset
1 ;;; esh-mode.el --- user interface
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
2
38438
7b528c6c17a3 (eshell-send-invisible): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 38414
diff changeset
3 ;; Copyright (C) 1999, 2000, 2001 Free Software Foundation
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
4
32526
8e57189d61b4 Add author information.
Gerd Moellmann <gerd@gnu.org>
parents: 32446
diff changeset
5 ;; Author: John Wiegley <johnw@gnu.org>
8e57189d61b4 Add author information.
Gerd Moellmann <gerd@gnu.org>
parents: 32446
diff changeset
6
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
7 ;; This file is part of GNU Emacs.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
8
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
10 ;; it under the terms of the GNU General Public License as published by
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
12 ;; any later version.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
13
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
14 ;; GNU Emacs is distributed in the hope that it will be useful,
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
17 ;; GNU General Public License for more details.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
18
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
22 ;; Boston, MA 02111-1307, USA.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
23
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
24 (provide 'esh-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
25
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
26 (eval-when-compile (require 'esh-maint))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
27
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
28 (defgroup eshell-mode nil
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
29 "This module contains code for handling input from the user."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
30 :tag "User interface"
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
31 :group 'eshell)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
32
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
33 ;;; Commentary:
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
34
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
35 ;; Basically, Eshell is used just like shell mode (<M-x shell>). The
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
36 ;; keystrokes for navigating the buffer, and accessing the command
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
37 ;; history, are identical. Unlike shell mode, however, Eshell mode's
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
38 ;; governing process is Emacs itself. With shell mode, an inferior
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
39 ;; shell process is executed that communicates with Emacs via comint
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
40 ;; -- a mode for handling sub-process interaction. Eshell mode, on
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
41 ;; the other hand, is a truly native Emacs shell. No subprocess are
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
42 ;; invoked except the ones requested by the user at the prompt.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
43 ;;
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
44 ;; After entering a command, use <RET> to invoke it ([Command
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
45 ;; invocation]) . If there is a command on disk, it will be executed
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
46 ;; as in a normal shell. If there is no command by that name on disk,
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
47 ;; but a Lisp function with that name is defined, the Lisp function
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
48 ;; will be called, using the arguments passed on the command line.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
49 ;;
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
50 ;; Some of the other features of the command interaction mode are:
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
51 ;;
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
52 ;; @ <M-RET> can be used to accumulate further commands while a
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
53 ;; command is currently running. Since all input is passed to the
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
54 ;; subprocess being executed, there is no automatic input queueing
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
55 ;; as there is with other shells.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
56 ;;
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
57 ;; @ <C-c C-t> can be used to truncate the buffer if it grows too
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
58 ;; large.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
59 ;;
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
60 ;; @ <C-c C-r> will move point to the beginning of the output of the
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
61 ;; last command. With a prefix argument, it will narrow to view
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
62 ;; only that output.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
63 ;;
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
64 ;; @ <C-c C-o> will delete the output from the last command.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
65 ;;
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
66 ;; @ <C-c C-f> will move forward a complete shell argument.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
67 ;;
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
68 ;; @ <C-c C-b> will move backward a complete shell argument.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
69
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
70 (require 'esh-module)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
71 (require 'esh-cmd)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
72 (require 'esh-io)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
73 (require 'esh-var)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
74
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
75 ;;; User Variables:
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
76
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
77 (defcustom eshell-mode-unload-hook nil
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
78 "*A hook that gets run when `eshell-mode' is unloaded."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
79 :type 'hook
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
80 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
81
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
82 (defcustom eshell-mode-hook nil
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
83 "*A hook that gets run when `eshell-mode' is entered."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
84 :type 'hook
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
85 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
86
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
87 (defcustom eshell-first-time-mode-hook nil
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
88 "*A hook that gets run the first time `eshell-mode' is entered.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
89 That is to say, the first time during an Emacs session."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
90 :type 'hook
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
91 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
92
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
93 (defcustom eshell-exit-hook '(eshell-query-kill-processes)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
94 "*A hook that is run whenever `eshell' is exited.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
95 This hook is only run if exiting actually kills the buffer."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
96 :type 'hook
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
97 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
98
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
99 (defcustom eshell-kill-on-exit t
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
100 "*If non-nil, kill the Eshell buffer on the `exit' command.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
101 Otherwise, the buffer will simply be buried."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
102 :type 'boolean
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
103 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
104
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
105 (defcustom eshell-input-filter-functions nil
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
106 "*Functions to call before input is processed.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
107 The input is contained in the region from `eshell-last-input-start' to
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
108 `eshell-last-input-end'."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
109 :type 'hook
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
110 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
111
31326
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
112 (defcustom eshell-send-direct-to-subprocesses nil
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
113 "*If t, send any input immediately to a subprocess."
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
114 :type 'boolean
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
115 :group 'eshell-mode)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
116
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
117 (defcustom eshell-expand-input-functions nil
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
118 "*Functions to call before input is parsed.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
119 Each function is passed two arguments, which bounds the region of the
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
120 current input text."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
121 :type 'hook
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
122 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
123
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
124 (defcustom eshell-scroll-to-bottom-on-input nil
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
125 "*Controls whether input to interpreter causes window to scroll.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
126 If nil, then do not scroll. If t or `all', scroll all windows showing
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
127 buffer. If `this', scroll only the selected window.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
128
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
129 See `eshell-preinput-scroll-to-bottom'."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
130 :type '(radio (const :tag "Do not scroll Eshell windows" nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
131 (const :tag "Scroll all windows showing the buffer" all)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
132 (const :tag "Scroll only the selected window" this))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
133 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
134
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
135 (defcustom eshell-scroll-to-bottom-on-output nil
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
136 "*Controls whether interpreter output causes window to scroll.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
137 If nil, then do not scroll. If t or `all', scroll all windows showing
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
138 buffer. If `this', scroll only the selected window. If `others',
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
139 scroll only those that are not the selected window.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
140
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
141 See variable `eshell-scroll-show-maximum-output' and function
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
142 `eshell-postoutput-scroll-to-bottom'."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
143 :type '(radio (const :tag "Do not scroll Eshell windows" nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
144 (const :tag "Scroll all windows showing the buffer" all)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
145 (const :tag "Scroll only the selected window" this)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
146 (const :tag "Scroll all windows other than selected" this))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
147 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
148
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
149 (defcustom eshell-scroll-show-maximum-output t
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
150 "*Controls how interpreter output causes window to scroll.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
151 If non-nil, then show the maximum output when the window is scrolled.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
152
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
153 See variable `eshell-scroll-to-bottom-on-output' and function
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
154 `eshell-postoutput-scroll-to-bottom'."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
155 :type 'boolean
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
156 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
157
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
158 (defcustom eshell-buffer-maximum-lines 1024
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
159 "*The maximum size in lines for eshell buffers.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
160 Eshell buffers are truncated from the top to be no greater than this
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
161 number, if the function `eshell-truncate-buffer' is on
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
162 `eshell-output-filter-functions'."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
163 :type 'integer
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
164 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
165
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
166 (defcustom eshell-output-filter-functions
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
167 '(eshell-handle-control-codes
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
168 eshell-watch-for-password-prompt)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
169 "*Functions to call before output is displayed.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
170 These functions are only called for output that is displayed
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
171 interactively, and not for output which is redirected."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
172 :type 'hook
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
173 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
174
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
175 (defcustom eshell-preoutput-filter-functions nil
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
176 "*Functions to call before output is inserted into the buffer.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
177 These functions get one argument, a string containing the text to be
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
178 inserted. They return the string as it should be inserted."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
179 :type 'hook
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
180 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
181
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
182 (defcustom eshell-password-prompt-regexp
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
183 "[Pp]ass\\(word\\|phrase\\).*:\\s *\\'"
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
184 "*Regexp matching prompts for passwords in the inferior process.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
185 This is used by `eshell-watch-for-password-prompt'."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
186 :type 'regexp
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
187 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
188
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
189 (defcustom eshell-skip-prompt-function nil
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
190 "*A function called from beginning of line to skip the prompt."
35974
0faaf71003ac (eshell-skip-prompt-function): Fix :type.
Dave Love <fx@gnu.org>
parents: 33020
diff changeset
191 :type '(choice (const nil) function)
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
192 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
193
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
194 (defcustom eshell-status-in-modeline t
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
195 "*If non-nil, let the user know a command is running in the modeline."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
196 :type 'boolean
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
197 :group 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
198
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
199 (defvar eshell-first-time-p t
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
200 "A variable which is non-nil the first time Eshell is loaded.")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
201
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
202 ;; Internal Variables:
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
203
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
204 ;; these are only set to `nil' initially for the sake of the
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
205 ;; byte-compiler, when compiling other files which `require' this one
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
206 (defvar eshell-mode nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
207 (defvar eshell-mode-map nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
208 (defvar eshell-command-running-string "--")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
209 (defvar eshell-command-map nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
210 (defvar eshell-command-prefix nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
211 (defvar eshell-last-input-start nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
212 (defvar eshell-last-input-end nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
213 (defvar eshell-last-output-start nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
214 (defvar eshell-last-output-block-begin nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
215 (defvar eshell-last-output-end nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
216
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
217 (defvar eshell-currently-handling-window nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
218 (defvar eshell-mode-syntax-table nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
219 (defvar eshell-mode-abbrev-table nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
220
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
221 (define-abbrev-table 'eshell-mode-abbrev-table ())
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
222
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
223 (eval-when-compile
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
224 (unless (eshell-under-xemacs-p)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
225 (defalias 'characterp 'ignore)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
226 (defalias 'char-int 'ignore)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
227
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
228 (if (not eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
229 (let ((i 0))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
230 (setq eshell-mode-syntax-table (make-syntax-table))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
231 (while (< i ?0)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
232 (modify-syntax-entry i "_ " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
233 (setq i (1+ i)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
234 (setq i (1+ ?9))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
235 (while (< i ?A)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
236 (modify-syntax-entry i "_ " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
237 (setq i (1+ i)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
238 (setq i (1+ ?Z))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
239 (while (< i ?a)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
240 (modify-syntax-entry i "_ " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
241 (setq i (1+ i)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
242 (setq i (1+ ?z))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
243 (while (< i 128)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
244 (modify-syntax-entry i "_ " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
245 (setq i (1+ i)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
246 (modify-syntax-entry ? " " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
247 (modify-syntax-entry ?\t " " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
248 (modify-syntax-entry ?\f " " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
249 (modify-syntax-entry ?\n "> " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
250 ;; Give CR the same syntax as newline, for selective-display.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
251 (modify-syntax-entry ?\^m "> " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
252 ;;; (modify-syntax-entry ?\; "< " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
253 (modify-syntax-entry ?` "' " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
254 (modify-syntax-entry ?' "' " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
255 (modify-syntax-entry ?, "' " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
256 ;; Used to be singlequote; changed for flonums.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
257 (modify-syntax-entry ?. "_ " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
258 (modify-syntax-entry ?- "_ " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
259 (modify-syntax-entry ?| ". " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
260 (modify-syntax-entry ?# "' " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
261 (modify-syntax-entry ?\" "\" " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
262 (modify-syntax-entry ?\\ "/ " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
263 (modify-syntax-entry ?\( "() " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
264 (modify-syntax-entry ?\) ")( " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
265 (modify-syntax-entry ?\{ "(} " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
266 (modify-syntax-entry ?\} "){ " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
267 (modify-syntax-entry ?\[ "(] " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
268 (modify-syntax-entry ?\] ")[ " eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
269 ;; All non-word multibyte characters should be `symbol'.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
270 (if (eshell-under-xemacs-p)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
271 (map-char-table
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
272 (function
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
273 (lambda (key val)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
274 (and (characterp key)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
275 (>= (char-int key) 256)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
276 (/= (char-syntax key) ?w)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
277 (modify-syntax-entry key "_ "
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
278 eshell-mode-syntax-table))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
279 (standard-syntax-table))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
280 (map-char-table
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
281 (function
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
282 (lambda (key val)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
283 (and (>= key 256)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
284 (/= (char-syntax key) ?w)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
285 (modify-syntax-entry key "_ "
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
286 eshell-mode-syntax-table))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
287 (standard-syntax-table)))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
288
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
289 ;;; User Functions:
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
290
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
291 ;;;###autoload
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
292 (defun eshell-mode ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
293 "Emacs shell interactive mode.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
294
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
295 \\{eshell-mode-map}"
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
296 (kill-all-local-variables)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
297
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
298 (setq major-mode 'eshell-mode)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
299 (setq mode-name "EShell")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
300 (set (make-local-variable 'eshell-mode) t)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
301
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
302 (make-local-variable 'eshell-mode-map)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
303 (setq eshell-mode-map (make-sparse-keymap))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
304 (use-local-map eshell-mode-map)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
305
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
306 (when eshell-status-in-modeline
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
307 (make-local-variable 'eshell-command-running-string)
45735
642c25258945 (eshell-mode, eshell-mode): Use copy-sequence.
Richard M. Stallman <rms@gnu.org>
parents: 43338
diff changeset
308 (let ((fmt (copy-sequence mode-line-format)))
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
309 (make-local-variable 'mode-line-format)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
310 (setq mode-line-format fmt))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
311 (let ((modeline (memq 'mode-line-modified mode-line-format)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
312 (if modeline
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
313 (setcar modeline 'eshell-command-running-string))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
314
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
315 (define-key eshell-mode-map [return] 'eshell-send-input)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
316 (define-key eshell-mode-map [(control ?m)] 'eshell-send-input)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
317 (define-key eshell-mode-map [(control ?j)] 'eshell-send-input)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
318 (define-key eshell-mode-map [(meta return)] 'eshell-queue-input)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
319 (define-key eshell-mode-map [(meta control ?m)] 'eshell-queue-input)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
320 (define-key eshell-mode-map [(meta control ?l)] 'eshell-show-output)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
321
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
322 (set (make-local-variable 'eshell-command-prefix)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
323 (make-symbol "eshell-command-prefix"))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
324 (fset eshell-command-prefix (make-sparse-keymap))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
325 (set (make-local-variable 'eshell-command-map)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
326 (symbol-function eshell-command-prefix))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
327 (define-key eshell-mode-map [(control ?c)] eshell-command-prefix)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
328
31240
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
329 ;; without this, find-tag complains about read-only text being
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
330 ;; modified
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
331 (if (eq (key-binding [(meta ?.)]) 'find-tag)
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
332 (define-key eshell-mode-map [(meta ?.)] 'eshell-find-tag))
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
333 (define-key eshell-command-map [(meta ?o)] 'eshell-mark-output)
31326
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
334 (define-key eshell-command-map [(meta ?d)] 'eshell-toggle-direct-send)
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
335
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
336 (define-key eshell-command-map [(control ?a)] 'eshell-bol)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
337 (define-key eshell-command-map [(control ?b)] 'eshell-backward-argument)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
338 (define-key eshell-command-map [(control ?e)] 'eshell-show-maximum-output)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
339 (define-key eshell-command-map [(control ?f)] 'eshell-forward-argument)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
340 (define-key eshell-command-map [return] 'eshell-copy-old-input)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
341 (define-key eshell-command-map [(control ?m)] 'eshell-copy-old-input)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
342 (define-key eshell-command-map [(control ?o)] 'eshell-kill-output)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
343 (define-key eshell-command-map [(control ?r)] 'eshell-show-output)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
344 (define-key eshell-command-map [(control ?t)] 'eshell-truncate-buffer)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
345 (define-key eshell-command-map [(control ?u)] 'eshell-kill-input)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
346 (define-key eshell-command-map [(control ?w)] 'backward-kill-word)
31240
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
347 (define-key eshell-command-map [(control ?y)] 'eshell-repeat-argument)
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
348
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
349 (setq local-abbrev-table eshell-mode-abbrev-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
350 (set-syntax-table eshell-mode-syntax-table)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
351
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
352 (set (make-local-variable 'dired-directory) default-directory)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
353 (set (make-local-variable 'list-buffers-directory)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
354 (expand-file-name default-directory))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
355
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
356 ;; always set the tab width to 8 in Eshell buffers, since external
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
357 ;; commands which do their own formatting almost always expect this
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
358 (set (make-local-variable 'tab-width) 8)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
359
31240
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
360 ;; don't ever use auto-fill in Eshell buffers
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
361 (setq auto-fill-function nil)
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
362
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
363 ;; always display everything from a return value
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
364 (if (boundp 'print-length)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
365 (set (make-local-variable 'print-length) nil))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
366 (if (boundp 'print-level)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
367 (set (make-local-variable 'print-level) nil))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
368
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
369 ;; set require-final-newline to nil; otherwise, all redirected
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
370 ;; output will end with a newline, whether or not the source
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
371 ;; indicated it!
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
372 (set (make-local-variable 'require-final-newline) nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
373
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
374 (set (make-local-variable 'max-lisp-eval-depth)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
375 (max 3000 max-lisp-eval-depth))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
376 (set (make-local-variable 'max-specpdl-size)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
377 (max 6000 max-lisp-eval-depth))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
378
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
379 (set (make-local-variable 'eshell-last-input-start) (point-marker))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
380 (set (make-local-variable 'eshell-last-input-end) (point-marker))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
381 (set (make-local-variable 'eshell-last-output-start) (point-marker))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
382 (set (make-local-variable 'eshell-last-output-end) (point-marker))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
383 (set (make-local-variable 'eshell-last-output-block-begin) (point))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
384
45735
642c25258945 (eshell-mode, eshell-mode): Use copy-sequence.
Richard M. Stallman <rms@gnu.org>
parents: 43338
diff changeset
385 (let ((modules-list (copy-sequence eshell-modules-list)))
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
386 (make-local-variable 'eshell-modules-list)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
387 (setq eshell-modules-list modules-list))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
388
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
389 ;; load extension modules into memory. This will cause any global
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
390 ;; variables they define to be visible, since some of the core
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
391 ;; modules sometimes take advantage of their functionality if used.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
392 (eshell-for module eshell-modules-list
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
393 (let ((module-fullname (symbol-name module))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
394 module-shortname)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
395 (if (string-match "^eshell-\\(.*\\)" module-fullname)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
396 (setq module-shortname
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
397 (concat "em-" (match-string 1 module-fullname))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
398 (unless module-shortname
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
399 (error "Invalid Eshell module name: %s" module-fullname))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
400 (unless (featurep (intern module-shortname))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
401 (load module-shortname))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
402
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
403 (unless (file-exists-p eshell-directory-name)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
404 (eshell-make-private-directory eshell-directory-name t))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
405
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
406 ;; load core Eshell modules for this session
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
407 (eshell-for module (eshell-subgroups 'eshell)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
408 (run-hooks (intern-soft (concat (symbol-name module)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
409 "-load-hook"))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
410
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
411 ;; load extension modules for this session
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
412 (eshell-for module eshell-modules-list
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
413 (let ((load-hook (intern-soft (concat (symbol-name module)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
414 "-load-hook"))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
415 (if (and load-hook (boundp load-hook))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
416 (run-hooks load-hook))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
417
31326
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
418 (if eshell-send-direct-to-subprocesses
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
419 (add-hook 'pre-command-hook 'eshell-intercept-commands t t))
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
420
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
421 (if eshell-scroll-to-bottom-on-input
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
422 (add-hook 'pre-command-hook 'eshell-preinput-scroll-to-bottom t t))
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
423
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
424 (when eshell-scroll-show-maximum-output
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
425 (set (make-local-variable 'scroll-conservatively) 1000))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
426
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
427 (when eshell-status-in-modeline
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
428 (add-hook 'eshell-pre-command-hook 'eshell-command-started nil t)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
429 (add-hook 'eshell-post-command-hook 'eshell-command-finished nil t))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
430
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
431 (add-hook 'kill-buffer-hook
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
432 (function
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
433 (lambda ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
434 (run-hooks 'eshell-exit-hook))) t t)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
435
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
436 (if eshell-first-time-p
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
437 (run-hooks 'eshell-first-time-mode-hook))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
438 (run-hooks 'eshell-mode-hook)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
439 (run-hooks 'eshell-post-command-hook))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
440
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
441 (put 'eshell-mode 'mode-class 'special)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
442
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
443 (eshell-deftest mode major-mode
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
444 "Major mode is correct"
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
445 (eq major-mode 'eshell-mode))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
446
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
447 (eshell-deftest mode eshell-mode-variable
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
448 "`eshell-mode' is true"
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
449 (eq eshell-mode t))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
450
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
451 (eshell-deftest var window-height
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
452 "LINES equals window height"
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
453 (let ((eshell-stringify-t t))
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
454 (eshell-command-result-p "= $LINES (window-height)" "t\n")))
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
455
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
456 (defun eshell-command-started ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
457 "Indicate in the modeline that a command has started."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
458 (setq eshell-command-running-string "**")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
459 (force-mode-line-update))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
460
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
461 (defun eshell-command-finished ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
462 "Indicate in the modeline that a command has finished."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
463 (setq eshell-command-running-string "--")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
464 (force-mode-line-update))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
465
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
466 (eshell-deftest mode command-running-p
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
467 "Modeline shows no command running"
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
468 (or (eshell-under-xemacs-p)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
469 (not eshell-status-in-modeline)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
470 (and (memq 'eshell-command-running-string mode-line-format)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
471 (equal eshell-command-running-string "--"))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
472
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
473 ;;; Internal Functions:
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
474
31326
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
475 (defun eshell-toggle-direct-send ()
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
476 (interactive)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
477 (if eshell-send-direct-to-subprocesses
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
478 (progn
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
479 (setq eshell-send-direct-to-subprocesses nil)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
480 (remove-hook 'pre-command-hook 'eshell-intercept-commands t)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
481 (message "Sending subprocess input on RET"))
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
482 (setq eshell-send-direct-to-subprocesses t)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
483 (add-hook 'pre-command-hook 'eshell-intercept-commands t t)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
484 (message "Sending subprocess input directly")))
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
485
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
486 (defun eshell-self-insert-command (N)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
487 (interactive "i")
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
488 (process-send-string
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
489 (eshell-interactive-process)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
490 (char-to-string (if (symbolp last-command-char)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
491 (get last-command-char 'ascii-character)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
492 last-command-char))))
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
493
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
494 (defun eshell-intercept-commands ()
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
495 (when (and (eshell-interactive-process)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
496 (not (and (integerp last-input-event)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
497 (memq last-input-event '(?\C-x ?\C-c)))))
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
498 (let ((possible-events (where-is-internal this-command))
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
499 (name (symbol-name this-command))
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
500 (intercept t))
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
501 ;; Assume that any multikey combination which does NOT target an
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
502 ;; Eshell command, is a combo the user wants invoked rather than
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
503 ;; sent to the underlying subprocess.
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
504 (unless (and (> (length name) 7)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
505 (equal (substring name 0 7) "eshell-"))
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
506 (while possible-events
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
507 (if (> (length (car possible-events)) 1)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
508 (setq intercept nil possible-events nil)
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
509 (setq possible-events (cdr possible-events)))))
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
510 (if intercept
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
511 (setq this-command 'eshell-self-insert-command)))))
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
512
31240
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
513 (defun eshell-find-tag (&optional tagname next-p regexp-p)
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
514 "A special version of `find-tag' that ignores read-onlyness."
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
515 (interactive)
31241
3099993cba0f See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31240
diff changeset
516 (require 'etags)
31240
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
517 (let ((inhibit-read-only t)
32446
aab90b31807c Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents: 31326
diff changeset
518 (no-default (eobp))
aab90b31807c Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents: 31326
diff changeset
519 (find-tag-default-function 'ignore))
aab90b31807c Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents: 31326
diff changeset
520 (setq tagname (car (find-tag-interactive "Find tag: ")))
31240
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
521 (find-tag tagname next-p regexp-p)))
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
522
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
523 (defun eshell-move-argument (limit func property arg)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
524 "Move forward ARG arguments."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
525 (catch 'eshell-incomplete
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
526 (eshell-parse-arguments (save-excursion (eshell-bol) (point))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
527 (line-end-position)))
31240
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
528 (let ((pos (save-excursion
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
529 (funcall func 1)
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
530 (while (and (> arg 0) (/= (point) limit))
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
531 (if (get-text-property (point) property)
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
532 (setq arg (1- arg)))
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
533 (if (> arg 0)
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
534 (funcall func 1)))
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
535 (point))))
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
536 (goto-char pos)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
537 (if (and (eq func 'forward-char)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
538 (= (1+ pos) limit))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
539 (forward-char 1))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
540
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
541 (eshell-deftest arg forward-arg
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
542 "Move across command arguments"
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
543 (eshell-insert-command "echo $(+ 1 (- 4 3)) \"alpha beta\" file" 'ignore)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
544 (let ((here (point)) begin valid)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
545 (eshell-bol)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
546 (setq begin (point))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
547 (eshell-forward-argument 4)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
548 (setq valid (= here (point)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
549 (eshell-backward-argument 4)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
550 (prog1
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
551 (and valid (= begin (point)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
552 (eshell-bol)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
553 (delete-region (point) (point-max)))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
554
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
555 (defun eshell-forward-argument (&optional arg)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
556 "Move forward ARG arguments."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
557 (interactive "p")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
558 (eshell-move-argument (point-max) 'forward-char 'arg-end arg))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
559
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
560 (defun eshell-backward-argument (&optional arg)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
561 "Move backward ARG arguments."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
562 (interactive "p")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
563 (eshell-move-argument (point-min) 'backward-char 'arg-begin arg))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
564
31240
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
565 (defun eshell-repeat-argument (&optional arg)
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
566 (interactive "p")
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
567 (let ((begin (save-excursion
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
568 (eshell-backward-argument arg)
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
569 (point))))
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
570 (kill-ring-save begin (point))
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
571 (yank)))
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
572
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
573 (defun eshell-bol ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
574 "Goes to the beginning of line, then skips past the prompt, if any."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
575 (interactive)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
576 (beginning-of-line)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
577 (and eshell-skip-prompt-function
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
578 (funcall eshell-skip-prompt-function)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
579
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
580 (defsubst eshell-push-command-mark ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
581 "Push a mark at the end of the last input text."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
582 (push-mark (1- eshell-last-input-end) t))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
583
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
584 (custom-add-option 'eshell-pre-command-hook 'eshell-push-command-mark)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
585
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
586 (defsubst eshell-goto-input-start ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
587 "Goto the start of the last command input.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
588 Putting this function on `eshell-pre-command-hook' will mimic Plan 9's
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
589 9term behavior."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
590 (goto-char eshell-last-input-start))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
591
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
592 (custom-add-option 'eshell-pre-command-hook 'eshell-push-command-mark)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
593
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
594 (defsubst eshell-interactive-print (string)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
595 "Print STRING to the eshell display buffer."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
596 (eshell-output-filter nil string))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
597
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
598 (defsubst eshell-begin-on-new-line ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
599 "This function outputs a newline if not at beginning of line."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
600 (save-excursion
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
601 (goto-char eshell-last-output-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
602 (or (bolp)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
603 (eshell-interactive-print "\n"))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
604
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
605 (defsubst eshell-reset (&optional no-hooks)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
606 "Output a prompt on a new line, aborting any current input.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
607 If NO-HOOKS is non-nil, then `eshell-post-command-hook' won't be run."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
608 (goto-char (point-max))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
609 (setq eshell-last-input-start (point-marker)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
610 eshell-last-input-end (point-marker)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
611 eshell-last-output-start (point-marker)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
612 eshell-last-output-block-begin (point)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
613 eshell-last-output-end (point-marker))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
614 (eshell-begin-on-new-line)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
615 (unless no-hooks
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
616 (run-hooks 'eshell-post-command-hook)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
617 (goto-char (point-max))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
618
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
619 (defun eshell-parse-command-input (beg end &optional args)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
620 "Parse the command input from BEG to END.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
621 The difference is that `eshell-parse-command' expects a complete
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
622 command string (and will error if it doesn't get one), whereas this
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
623 function will inform the caller whether more input is required.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
624
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
625 If nil is returned, more input is necessary (probably because a
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
626 multi-line input string wasn't terminated properly). Otherwise, it
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
627 will return the parsed command."
31240
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
628 (let (delim command)
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
629 (if (setq delim
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
630 (catch 'eshell-incomplete
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
631 (ignore
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
632 (setq command (eshell-parse-command (cons beg end)
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
633 args t)))))
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
634 (ignore
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
635 (message "Expecting completion of delimeter %c ..."
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
636 (if (listp delim)
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
637 (car delim)
10b1c85c0bbe See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 29934
diff changeset
638 delim)))
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
639 command)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
640
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
641 (defun eshell-update-markers (pmark)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
642 "Update the input and output markers relative to point and PMARK."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
643 (set-marker eshell-last-input-start pmark)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
644 (set-marker eshell-last-input-end (point))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
645 (set-marker eshell-last-output-end (point)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
646
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
647 (defun eshell-queue-input (&optional use-region)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
648 "Queue the current input text for execution by Eshell.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
649 Particularly, don't send the text to the current process, even if it's
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
650 waiting for input."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
651 (interactive "P")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
652 (eshell-send-input use-region t))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
653
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
654 (eshell-deftest mode queue-input
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
655 "Queue command input"
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
656 (eshell-insert-command "sleep 2")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
657 (eshell-insert-command "echo alpha" 'eshell-queue-input)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
658 (let ((count 10))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
659 (while (and eshell-current-command
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
660 (> count 0))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
661 (sit-for 1 0)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
662 (setq count (1- count))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
663 (eshell-match-result "alpha\n"))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
664
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
665 (defun eshell-send-input (&optional use-region queue-p no-newline)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
666 "Send the input received to Eshell for parsing and processing..
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
667 After `eshell-last-output-end', sends all text from that marker to
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
668 point as input. Before that marker, calls `eshell-get-old-input' to
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
669 retrieve old input, copies it to the end of the buffer, and sends it.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
670
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
671 If USE-REGION is non-nil, the current region (between point and mark)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
672 will be used as input.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
673
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
674 If QUEUE-P is non-nil, input will be queued until the next prompt,
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
675 rather than sent to the currently active process. If no process, the
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
676 input is processed immediately.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
677
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
678 If NO-NEWLINE is non-nil, the input is sent without an implied final
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
679 newline."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
680 (interactive "P")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
681 ;; Note that the input string does not include its terminal newline.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
682 (let ((proc-running-p (and (eshell-interactive-process)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
683 (not queue-p)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
684 (inhibit-point-motion-hooks t)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
685 after-change-functions)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
686 (unless (and proc-running-p
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
687 (not (eq (process-status
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
688 (eshell-interactive-process)) 'run)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
689 (if (or proc-running-p
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
690 (>= (point) eshell-last-output-end))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
691 (goto-char (point-max))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
692 (let ((copy (eshell-get-old-input use-region)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
693 (goto-char eshell-last-output-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
694 (insert-and-inherit copy)))
31326
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
695 (unless (or no-newline
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
696 (and eshell-send-direct-to-subprocesses
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
697 proc-running-p))
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
698 (insert-before-markers-and-inherit ?\n))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
699 (if proc-running-p
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
700 (progn
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
701 (eshell-update-markers eshell-last-output-end)
31326
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
702 (if (or eshell-send-direct-to-subprocesses
a36c3cf583d4 See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 31241
diff changeset
703 (= eshell-last-input-start eshell-last-input-end))
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
704 (unless no-newline
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
705 (process-send-string (eshell-interactive-process) "\n"))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
706 (process-send-region (eshell-interactive-process)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
707 eshell-last-input-start
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
708 eshell-last-input-end)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
709 (if (= eshell-last-output-end (point))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
710 (run-hooks 'eshell-post-command-hook)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
711 (let (input)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
712 (eshell-condition-case err
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
713 (progn
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
714 (setq input (buffer-substring-no-properties
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
715 eshell-last-output-end (1- (point))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
716 (run-hook-with-args 'eshell-expand-input-functions
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
717 eshell-last-output-end (1- (point)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
718 (let ((cmd (eshell-parse-command-input
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
719 eshell-last-output-end (1- (point)))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
720 (when cmd
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
721 (eshell-update-markers eshell-last-output-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
722 (setq input (buffer-substring-no-properties
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
723 eshell-last-input-start
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
724 (1- eshell-last-input-end)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
725 (run-hooks 'eshell-input-filter-functions)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
726 (and (catch 'eshell-terminal
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
727 (ignore
33020
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
728 (if (eshell-invoke-directly cmd input)
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
729 (eval cmd)
e21feeab77fb See ChangeLog
John Wiegley <johnw@newartisans.com>
parents: 32526
diff changeset
730 (eshell-eval-command cmd input))))
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
731 (eshell-life-is-too-much)))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
732 (quit
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
733 (eshell-reset t)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
734 (run-hooks 'eshell-post-command-hook)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
735 (signal 'quit nil))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
736 (error
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
737 (eshell-reset t)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
738 (eshell-interactive-print
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
739 (concat (error-message-string err) "\n"))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
740 (run-hooks 'eshell-post-command-hook)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
741 (insert-and-inherit input)))))))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
742
38111
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
743 ; (eshell-deftest proc send-to-subprocess
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
744 ; "Send input to a subprocess"
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
745 ; ;; jww (1999-12-06): what about when bc is unavailable?
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
746 ; (if (not (eshell-search-path "bc"))
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
747 ; t
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
748 ; (eshell-insert-command "bc")
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
749 ; (eshell-insert-command "1 + 2")
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
750 ; (sit-for 1 0)
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
751 ; (forward-line -1)
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
752 ; (prog1
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
753 ; (looking-at "3\n")
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
754 ; (eshell-insert-command "quit")
737e1a913c78 Disabled a test that often yields false failures.
John Wiegley <johnw@newartisans.com>
parents: 37435
diff changeset
755 ; (sit-for 1 0))))
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
756
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
757 (defsubst eshell-kill-new ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
758 "Add the last input text to the kill ring."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
759 (kill-ring-save eshell-last-input-start eshell-last-input-end))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
760
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
761 (custom-add-option 'eshell-input-filter-functions 'eshell-kill-new)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
762
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
763 (defun eshell-output-filter (process string)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
764 "Send the output from PROCESS (STRING) to the interactive display.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
765 This is done after all necessary filtering has been done."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
766 (let ((oprocbuf (if process (process-buffer process)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
767 (current-buffer)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
768 (inhibit-point-motion-hooks t)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
769 after-change-functions)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
770 (let ((functions eshell-preoutput-filter-functions))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
771 (while (and functions string)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
772 (setq string (funcall (car functions) string))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
773 (setq functions (cdr functions))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
774 (if (and string oprocbuf (buffer-name oprocbuf))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
775 (let ((obuf (current-buffer))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
776 opoint obeg oend)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
777 (set-buffer oprocbuf)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
778 (setq opoint (point))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
779 (setq obeg (point-min))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
780 (setq oend (point-max))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
781 (let ((buffer-read-only nil)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
782 (nchars (length string))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
783 (ostart nil))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
784 (widen)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
785 (goto-char eshell-last-output-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
786 (setq ostart (point))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
787 (if (<= (point) opoint)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
788 (setq opoint (+ opoint nchars)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
789 (if (< (point) obeg)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
790 (setq obeg (+ obeg nchars)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
791 (if (<= (point) oend)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
792 (setq oend (+ oend nchars)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
793 (insert-before-markers string)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
794 (if (= (window-start (selected-window)) (point))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
795 (set-window-start (selected-window)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
796 (- (point) nchars)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
797 (if (= (point) eshell-last-input-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
798 (set-marker eshell-last-input-end
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
799 (- eshell-last-input-end nchars)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
800 (set-marker eshell-last-output-start ostart)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
801 (set-marker eshell-last-output-end (point))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
802 (force-mode-line-update))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
803 (narrow-to-region obeg oend)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
804 (goto-char opoint)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
805 (eshell-run-output-filters)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
806 (set-buffer obuf)))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
807
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
808 (defun eshell-run-output-filters ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
809 "Run the `eshell-output-filter-functions' on the current output."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
810 (save-current-buffer
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
811 (run-hooks 'eshell-output-filter-functions))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
812 (setq eshell-last-output-block-begin
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
813 (marker-position eshell-last-output-end)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
814
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
815 ;;; jww (1999-10-23): this needs testing
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
816 (defun eshell-preinput-scroll-to-bottom ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
817 "Go to the end of buffer in all windows showing it.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
818 Movement occurs if point in the selected window is not after the
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
819 process mark, and `this-command' is an insertion command. Insertion
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
820 commands recognised are `self-insert-command', `yank', and
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
821 `hilit-yank'. Depends on the value of
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
822 `eshell-scroll-to-bottom-on-input'.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
823
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
824 This function should be a pre-command hook."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
825 (if (memq this-command '(self-insert-command yank hilit-yank))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
826 (let* ((selected (selected-window))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
827 (current (current-buffer))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
828 (scroll eshell-scroll-to-bottom-on-input))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
829 (if (< (point) eshell-last-output-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
830 (if (eq scroll 'this)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
831 (goto-char (point-max))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
832 (walk-windows
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
833 (function
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
834 (lambda (window)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
835 (when (and (eq (window-buffer window) current)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
836 (or (eq scroll t) (eq scroll 'all)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
837 (select-window window)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
838 (goto-char (point-max))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
839 (select-window selected))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
840 nil t))))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
841
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
842 ;;; jww (1999-10-23): this needs testing
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
843 (defun eshell-postoutput-scroll-to-bottom ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
844 "Go to the end of buffer in all windows showing it.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
845 Does not scroll if the current line is the last line in the buffer.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
846 Depends on the value of `eshell-scroll-to-bottom-on-output' and
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
847 `eshell-scroll-show-maximum-output'.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
848
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
849 This function should be in the list `eshell-output-filter-functions'."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
850 (let* ((selected (selected-window))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
851 (current (current-buffer))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
852 (scroll eshell-scroll-to-bottom-on-output))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
853 (unwind-protect
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
854 (walk-windows
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
855 (function
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
856 (lambda (window)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
857 (if (eq (window-buffer window) current)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
858 (progn
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
859 (select-window window)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
860 (if (and (< (point) eshell-last-output-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
861 (or (eq scroll t) (eq scroll 'all)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
862 ;; Maybe user wants point to jump to end.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
863 (and (eq scroll 'this)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
864 (eq selected window))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
865 (and (eq scroll 'others)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
866 (not (eq selected window)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
867 ;; If point was at the end, keep it at end.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
868 (>= (point) eshell-last-output-start)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
869 (goto-char eshell-last-output-end))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
870 ;; Optionally scroll so that the text
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
871 ;; ends at the bottom of the window.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
872 (if (and eshell-scroll-show-maximum-output
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
873 (>= (point) eshell-last-output-end))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
874 (save-excursion
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
875 (goto-char (point-max))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
876 (recenter -1)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
877 (select-window selected)))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
878 nil t)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
879 (set-buffer current))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
880
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
881 (custom-add-option 'eshell-output-filter-functions
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
882 'eshell-postoutput-scroll-to-bottom)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
883
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
884 (defun eshell-beginning-of-input ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
885 "Return the location of the start of the previous input."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
886 eshell-last-input-start)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
887
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
888 (defun eshell-beginning-of-output ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
889 "Return the location of the end of the previous output block."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
890 eshell-last-input-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
891
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
892 (defun eshell-end-of-output ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
893 "Return the location of the end of the previous output block."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
894 (if (eshell-using-module 'eshell-prompt)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
895 eshell-last-output-start
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
896 eshell-last-output-end))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
897
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
898 (defun eshell-kill-output ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
899 "Kill all output from interpreter since last input.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
900 Does not delete the prompt."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
901 (interactive)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
902 (save-excursion
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
903 (goto-char (eshell-beginning-of-output))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
904 (insert "*** output flushed ***\n")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
905 (delete-region (point) (eshell-end-of-output))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
906
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
907 (eshell-deftest io flush-output
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
908 "Flush previous output"
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
909 (eshell-insert-command "echo alpha")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
910 (eshell-kill-output)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
911 (and (eshell-match-result (regexp-quote "*** output flushed ***\n"))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
912 (forward-line)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
913 (= (point) eshell-last-output-start)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
914
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
915 (defun eshell-show-output (&optional arg)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
916 "Display start of this batch of interpreter output at top of window.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
917 Sets mark to the value of point when this command is run.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
918 With a prefix argument, narrows region to last command output."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
919 (interactive "P")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
920 (goto-char (eshell-beginning-of-output))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
921 (set-window-start (selected-window)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
922 (save-excursion
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
923 (goto-char (eshell-beginning-of-input))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
924 (line-beginning-position)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
925 (if arg
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
926 (narrow-to-region (eshell-beginning-of-output)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
927 (eshell-end-of-output)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
928 (eshell-end-of-output))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
929
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
930 (defun eshell-mark-output (&optional arg)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
931 "Display start of this batch of interpreter output at top of window.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
932 Sets mark to the value of point when this command is run.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
933 With a prefix argument, narrows region to last command output."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
934 (interactive "P")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
935 (push-mark (eshell-show-output arg)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
936
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
937 (defun eshell-kill-input ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
938 "Kill all text from last stuff output by interpreter to point."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
939 (interactive)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
940 (if (> (point) eshell-last-output-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
941 (kill-region eshell-last-output-end (point))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
942 (let ((here (point)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
943 (eshell-bol)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
944 (kill-region (point) here))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
945
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
946 (defun eshell-show-maximum-output ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
947 "Put the end of the buffer at the bottom of the window."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
948 (interactive)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
949 (if (interactive-p)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
950 (widen))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
951 (goto-char (point-max))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
952 (recenter -1))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
953
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
954 (defun eshell-get-old-input (&optional use-current-region)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
955 "Return the command input on the current line."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
956 (if use-current-region
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
957 (buffer-substring (min (point) (mark))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
958 (max (point) (mark)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
959 (save-excursion
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
960 (beginning-of-line)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
961 (and eshell-skip-prompt-function
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
962 (funcall eshell-skip-prompt-function))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
963 (let ((beg (point)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
964 (end-of-line)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
965 (buffer-substring beg (point))))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
966
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
967 (defun eshell-copy-old-input ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
968 "Insert after prompt old input at point as new input to be edited."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
969 (interactive)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
970 (let ((input (eshell-get-old-input)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
971 (goto-char eshell-last-output-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
972 (insert-and-inherit input)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
973
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
974 (eshell-deftest mode run-old-command
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
975 "Re-run an old command"
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
976 (eshell-insert-command "echo alpha")
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
977 (goto-char eshell-last-input-start)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
978 (string= (eshell-get-old-input) "echo alpha"))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
979
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
980 (defun eshell/exit ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
981 "Leave or kill the Eshell buffer, depending on `eshell-kill-on-exit'."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
982 (throw 'eshell-terminal t))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
983
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
984 (defun eshell-life-is-too-much ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
985 "Kill the current buffer (or bury it). Good-bye Eshell."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
986 (interactive)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
987 (if (not eshell-kill-on-exit)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
988 (bury-buffer)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
989 (kill-buffer (current-buffer))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
990
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
991 (defun eshell-truncate-buffer ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
992 "Truncate the buffer to `eshell-buffer-maximum-lines'.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
993 This function could be on `eshell-output-filter-functions' or bound to
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
994 a key."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
995 (interactive)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
996 (save-excursion
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
997 (goto-char eshell-last-output-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
998 (let ((lines (count-lines 1 (point)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
999 (inhibit-read-only t))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1000 (forward-line (- eshell-buffer-maximum-lines))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1001 (beginning-of-line)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1002 (let ((pos (point)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1003 (if (bobp)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1004 (if (interactive-p)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1005 (error "Buffer too short to truncate"))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1006 (delete-region (point-min) (point))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1007 (if (interactive-p)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1008 (message "Truncated buffer from %d to %d lines (%.1fk freed)"
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1009 lines eshell-buffer-maximum-lines
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1010 (/ pos 1024.0))))))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1011
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1012 (custom-add-option 'eshell-output-filter-functions
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1013 'eshell-truncate-buffer)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1014
38438
7b528c6c17a3 (eshell-send-invisible): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 38414
diff changeset
1015 (defun eshell-send-invisible (str)
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1016 "Read a string without echoing.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1017 Then send it to the process running in the current buffer."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1018 (interactive "P") ; Defeat snooping via C-x ESC ESC
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1019 (let ((str (read-passwd
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1020 (format "Password: "
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1021 (process-name (eshell-interactive-process))))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1022 (if (stringp str)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1023 (process-send-string (eshell-interactive-process)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1024 (concat str "\n"))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1025 (message "Warning: text will be echoed"))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1026
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1027 (defun eshell-watch-for-password-prompt ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1028 "Prompt in the minibuffer for password and send without echoing.
38438
7b528c6c17a3 (eshell-send-invisible): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 38414
diff changeset
1029 This function uses `eshell-send-invisible' to read and send a password to the
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1030 buffer's process if STRING contains a password prompt defined by
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1031 `eshell-password-prompt-regexp'.
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1032
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1033 This function could be in the list `eshell-output-filter-functions'."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1034 (when (eshell-interactive-process)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1035 (save-excursion
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1036 (goto-char eshell-last-output-block-begin)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1037 (beginning-of-line)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1038 (if (re-search-forward eshell-password-prompt-regexp
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1039 eshell-last-output-end t)
38438
7b528c6c17a3 (eshell-send-invisible): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 38414
diff changeset
1040 (eshell-send-invisible nil)))))
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1041
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1042 (custom-add-option 'eshell-output-filter-functions
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1043 'eshell-watch-for-password-prompt)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1044
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1045 (defun eshell-handle-control-codes ()
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1046 "Act properly when certain control codes are seen."
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1047 (save-excursion
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1048 (let ((orig (point)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1049 (goto-char eshell-last-output-block-begin)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1050 (unless (eolp)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1051 (beginning-of-line))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1052 (while (< (point) eshell-last-output-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1053 (let ((char (char-after)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1054 (cond
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1055 ((eq char ?\r)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1056 (if (< (1+ (point)) eshell-last-output-end)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1057 (if (memq (char-after (1+ (point)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1058 '(?\n ?\r))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1059 (delete-char 1)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1060 (let ((end (1+ (point))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1061 (beginning-of-line)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1062 (delete-region (point) end)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1063 (add-text-properties (point) (1+ (point))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1064 '(invisible t))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1065 (forward-char)))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1066 ((eq char ?\a)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1067 (delete-char 1)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1068 (beep))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1069 ((eq char ?\C-h)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1070 (delete-backward-char 1)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1071 (delete-char 1))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1072 (t
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1073 (forward-char))))))))
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1074
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1075 (custom-add-option 'eshell-output-filter-functions
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1076 'eshell-handle-control-codes)
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1077
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1078 ;;; Code:
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1079
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 45735
diff changeset
1080 ;;; arch-tag: ec65bc2b-da14-4547-81d3-a32af3a4dc57
29870
ccc03e321fdf *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1081 ;;; esh-mode.el ends here