summaryrefslogtreecommitdiff
path: root/lisp/shell.el
diff options
context:
space:
mode:
authorLuc Teirlinck <teirllm@auburn.edu>2005-04-26 23:16:20 +0000
committerLuc Teirlinck <teirllm@auburn.edu>2005-04-26 23:16:20 +0000
commite03035e3528c0dac8baae005554a677aed6d4cb4 (patch)
treeb8863243538826b6095f9e3ab1b8a823530bcc93 /lisp/shell.el
parent980cc24722e345b6f79a287957efaec4cf42c25c (diff)
downloademacs-e03035e3528c0dac8baae005554a677aed6d4cb4.tar.gz
(shell-prompt-pattern): Doc fix.
(shell-mode): Set paragraph-separate buffer locally to "\\'".
Diffstat (limited to 'lisp/shell.el')
-rw-r--r--lisp/shell.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index 1817a1fd3b4..354ed88f80f 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -136,8 +136,9 @@ Defaults to \"^[^#$%>\\n]*[#$%>] *\", which works pretty well.
This variable is used to initialise `comint-prompt-regexp' in the
shell buffer.
-This variable is only used if the variable
-`comint-use-prompt-regexp-instead-of-fields' is non-nil.
+If `comint-use-prompt-regexp' is nil, then this variable is only used
+to determine paragraph boundaries. See Info node `Shell Prompts' for
+how Shell mode treats paragraphs.
The pattern should probably not match more than one line. If it does,
Shell mode may become confused trying to distinguish prompt from input
@@ -422,6 +423,7 @@ buffer."
(setq comint-file-name-chars shell-file-name-chars)
(setq comint-file-name-quote-list shell-file-name-quote-list)
(setq comint-dynamic-complete-functions shell-dynamic-complete-functions)
+ (set (make-local-variable 'paragraph-separate) "\\'")
(make-local-variable 'paragraph-start)
(setq paragraph-start comint-prompt-regexp)
(make-local-variable 'font-lock-defaults)