aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2018-05-11 12:39:52 +0300
committerEli Zaretskii2018-05-11 12:39:52 +0300
commitc9c0e40d673a5fc0d24d30ff67ccb7c7f2fb482a (patch)
treea033b776179f2f4ed3162d4722866dae3e2a3a70
parente6bf19cfffaca98da4d8f83fb3675dc972337661 (diff)
downloademacs-c9c0e40d673a5fc0d24d30ff67ccb7c7f2fb482a.tar.gz
emacs-c9c0e40d673a5fc0d24d30ff67ccb7c7f2fb482a.zip
More minor changes in shell-related nodes of Emacs manual
* doc/emacs/misc.texi (Interactive Shell): Clarify how the window that displays "*shell*" is selected. (Shell Prompts): Fix a typo. Reported by Jorge <jorge+list@disroot.org> in emacs-manual-bugs.
-rw-r--r--doc/emacs/misc.texi5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 4aa8e3f700d..cd9b67bcdee 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -784,7 +784,8 @@ text in the buffer. To give input to the subshell, go to the end of
784the buffer and type the input, terminated by @key{RET}. 784the buffer and type the input, terminated by @key{RET}.
785 785
786 By default, when the subshell is invoked interactively, the 786 By default, when the subshell is invoked interactively, the
787@file{*shell*} buffer is displayed in a new window. This behavior can 787@file{*shell*} buffer is displayed in a new window, unless the current
788window already shows the @file{*shell*} buffer. This behavior can
788be customized via @code{display-buffer-alist} (@pxref{Window Choice}). 789be customized via @code{display-buffer-alist} (@pxref{Window Choice}).
789 790
790 While the subshell is waiting or running a command, you can switch 791 While the subshell is waiting or running a command, you can switch
@@ -1071,7 +1072,7 @@ Emacs Lisp Reference Manual}).
1071@vindex comint-use-prompt-regexp 1072@vindex comint-use-prompt-regexp
1072@vindex shell-prompt-pattern 1073@vindex shell-prompt-pattern
1073 If you change the variable @code{comint-use-prompt-regexp} to a 1074 If you change the variable @code{comint-use-prompt-regexp} to a
1074non-@code{nil} value, then Comint mode recognize prompts using a 1075non-@code{nil} value, then Comint mode will recognize prompts using a
1075regular expression (@pxref{Regexps}). In Shell mode, the regular 1076regular expression (@pxref{Regexps}). In Shell mode, the regular
1076expression is specified by the variable @code{shell-prompt-pattern}. 1077expression is specified by the variable @code{shell-prompt-pattern}.
1077The default value of @code{comint-use-prompt-regexp} is @code{nil}, 1078The default value of @code{comint-use-prompt-regexp} is @code{nil},