Index: emacs/man/misc.texi
diff -c emacs/man/misc.texi:1.65 emacs/man/misc.texi:1.66
*** emacs/man/misc.texi:1.65 Mon Apr 18 18:29:26 2005
--- emacs/man/misc.texi Wed Apr 27 00:06:36 2005
***************
*** 342,347 ****
--- 342,348 ----
* Single Shell:: How to run one shell command and return.
* Interactive Shell:: Permanent shell taking input via Emacs.
* Shell Mode:: Special Emacs commands used with permanent shell.
+ * Shell Prompts:: Two ways to recognize shell prompts.
* History: Shell History. Repeating previous commands in a shell buffer.
* Directory Tracking:: Keeping track when the subshell changes directory.
* Options: Shell Options. Options for customizing Shell mode.
***************
*** 405,411 ****
either or both of these default [EMAIL PROTECTED]
Both @kbd{M-!} and @kbd{M-|} wait for the shell command to complete,
! unless you end the command with @samp{&} to make it asyncronous. To
stop waiting, type @kbd{C-g} to quit; that terminates the shell
command with the signal @code{SIGINT}---the same signal that @kbd{C-c}
normally generates in the shell. Emacs waits until the command
--- 406,412 ----
either or both of these default [EMAIL PROTECTED]
Both @kbd{M-!} and @kbd{M-|} wait for the shell command to complete,
! unless you end the command with @samp{&} to make it asynchronous. To
stop waiting, type @kbd{C-g} to quit; that terminates the shell
command with the signal @code{SIGINT}---the same signal that @kbd{C-c}
normally generates in the shell. Emacs waits until the command
***************
*** 506,513 ****
At end of buffer send line as input; otherwise, copy current line to
end of buffer and send it (@code{comint-send-input}). When a line is
copied, any prompt at the beginning of the line (text output by
! programs preceding your input) is omitted. (See also the variable
! @code{comint-use-prompt-regexp-instead-of-fields}.)
@item @key{TAB}
@kindex TAB @r{(Shell mode)}
--- 507,514 ----
At end of buffer send line as input; otherwise, copy current line to
end of buffer and send it (@code{comint-send-input}). When a line is
copied, any prompt at the beginning of the line (text output by
! programs preceding your input) is omitted. @xref{Shell Prompts}, for
! how Shell mode recognizes prompts.
@item @key{TAB}
@kindex TAB @r{(Shell mode)}
***************
*** 562,568 ****
@kindex C-c C-u @r{(Shell mode)}
@findex comint-kill-input
Kill all text pending at end of buffer to be sent as input
! (@code{comint-kill-input}).
@item C-c C-w
@kindex C-c C-w @r{(Shell mode)}
--- 563,570 ----
@kindex C-c C-u @r{(Shell mode)}
@findex comint-kill-input
Kill all text pending at end of buffer to be sent as input
! (@code{comint-kill-input}). If point is not at end of buffer,
! this only kills the part of this text that precedes point.
@item C-c C-w
@kindex C-c C-w @r{(Shell mode)}
***************
*** 684,693 ****
@end example
@end table
- Shell mode also customizes the paragraph commands so that only shell
- prompts start new paragraphs. Thus, a paragraph consists of an input
- command plus the output that follows it in the buffer.
-
@cindex Comint mode
@cindex mode, Comint
Shell mode is a derivative of Comint mode, a general-purpose mode for
--- 686,691 ----
***************
*** 704,709 ****
--- 702,746 ----
in a subprocess using unmodified Comint mode---without the
specializations of Shell mode.
+ @node Shell Prompts
+ @subsection Shell Prompts
+
+ @vindex shell-prompt-pattern
+ @vindex comint-prompt-regexp
+ @vindex comint-use-prompt-regexp
+ @cindex prompt, shell
+ A prompt is text output by a program to show that it is ready to
+ accept new user input. Normally, Comint mode (and thus Shell mode)
+ considers the prompt to be any text output by a program at the
+ beginning of an input line. However, if the variable
+ @code{comint-use-prompt-regexp} is [EMAIL PROTECTED], then Comint mode
+ uses a regular expression to recognize prompts. In Shell mode,
+ @code{shell-prompt-pattern} specifies the regular expression.
+
+ The value of @code{comint-use-prompt-regexp} also affects many
+ motion and paragraph commands. If the value is [EMAIL PROTECTED], the
+ general Emacs motion commands behave as they normally do in buffers
+ without special text properties. However, if the value is @code{nil},
+ the default, then Comint mode divides the buffer into two types of
+ ``fields'' (ranges of consecutive characters having the same
+ @code{field} text property): input and output. Prompts are part of
+ the output. Most Emacs motion commands do not cross field boundaries,
+ unless they move over multiple lines. For instance, when point is in
+ input on the same line as a prompt, @kbd{C-a} puts point at the
+ beginning of the input if @code{comint-use-prompt-regexp} is
+ @code{nil} and at the beginning of the line otherwise.
+
+ In Shell mode, only shell prompts start new paragraphs. Thus, a
+ paragraph consists of a prompt and the input and output that follow
+ it. However, if @code{comint-use-prompt-regexp} is @code{nil}, the
+ default, most paragraph commands do not cross field boundaries. This
+ means that prompts, ranges of input, and ranges of non-prompt output
+ behave mostly like separate paragraphs; with this setting, numeric
+ arguments to most paragraph commands yield essentially undefined
+ behavior. For the purpose of finding paragraph boundaries, Shell mode
+ uses @code{shell-prompt-pattern}, regardless of
+ @code{comint-use-prompt-regexp}.
+
@node Shell History
@subsection Shell Command History
***************
*** 810,816 ****
@vindex shell-input-ring-file-name
Some shells store their command histories in files so that you can
! refer to previous commands from previous shell sessions. Emacs reads
the command history file for your chosen shell, to initialize its own
command history. The file name is @file{~/.bash_history} for bash,
@file{~/.sh_history} for ksh, and @file{~/.history} for other shells.
--- 847,853 ----
@vindex shell-input-ring-file-name
Some shells store their command histories in files so that you can
! refer to commands from previous shell sessions. Emacs reads
the command history file for your chosen shell, to initialize its own
command history. The file name is @file{~/.bash_history} for bash,
@file{~/.sh_history} for ksh, and @file{~/.history} for other shells.
***************
*** 876,894 ****
@key{SPC} perform history expansion by binding @key{SPC} to the
command @code{comint-magic-space}.
- @vindex shell-prompt-pattern
- @vindex comint-prompt-regexp
- @vindex comint-use-prompt-regexp-instead-of-fields
- @cindex prompt, shell
Shell mode recognizes history references when they follow a prompt.
! Normally, any text output by a program at the beginning of an input
! line is considered a prompt. However, if the variable
! @code{comint-use-prompt-regexp-instead-of-fields} is [EMAIL PROTECTED],
! then Comint mode uses a regular expression to recognize prompts. In
! general, the variable @code{comint-prompt-regexp} specifies the
! regular expression; Shell mode uses the variable
! @code{shell-prompt-pattern} to set up @code{comint-prompt-regexp} in
! the shell buffer.
@node Directory Tracking
@subsection Directory Tracking
--- 913,920 ----
@key{SPC} perform history expansion by binding @key{SPC} to the
command @code{comint-magic-space}.
Shell mode recognizes history references when they follow a prompt.
! @xref{Shell Prompts}, for how Shell mode recognizes prompts.
@node Directory Tracking
@subsection Directory Tracking
***************
*** 1119,1126 ****
happens automatically; there is no special password processing.)
When you log in to a different machine, you need to specify the type
! of terminal you're using. Terminal types @samp{ansi} or @samp{vt100}
! will work on most systems.
@c If you are talking to a Bourne-compatible
@c shell, and your system understands the @env{TERMCAP} variable,
--- 1145,1155 ----
happens automatically; there is no special password processing.)
When you log in to a different machine, you need to specify the type
! of terminal you're using, by setting the @env{TERM} environment
! variable in the environment for the remote login command. (If you use
! bash, you do that by writing the variable assignment before the remote
! login command, without separating comma.) Terminal types @samp{ansi}
! or @samp{vt100} will work on most systems.
@c If you are talking to a Bourne-compatible
@c shell, and your system understands the @env{TERMCAP} variable,
***************
*** 2078,2084 ****
paste (yank), and @kbd{C-z} undo. Standard Emacs commands like
@kbd{C-x C-c} still work, because @kbd{C-x} and @kbd{C-c} only take
effect when the mark is active. However, if you don't want these
! bindings at all, set @code{cua-enable-cua-keys} to nil.
In CUA mode, using @kbd{Shift} together with the movement keys
activates the region over which they move. The standard (unshifted)
--- 2107,2113 ----
paste (yank), and @kbd{C-z} undo. Standard Emacs commands like
@kbd{C-x C-c} still work, because @kbd{C-x} and @kbd{C-c} only take
effect when the mark is active. However, if you don't want these
! bindings at all, set @code{cua-enable-cua-keys} to @code{nil}.
In CUA mode, using @kbd{Shift} together with the movement keys
activates the region over which they move. The standard (unshifted)
_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-diffs
