Mercurial > emacs
changeset 4131:c9a0f06110bd
* shell.el (shell-process-pushd): Fix syntax error in
condition-case.
* shell.el (shell-prompt-pattern): Don't match more than one line.
Doc fix.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Sun, 18 Jul 1993 06:20:47 +0000 |
| parents | e5aee6a3bb75 |
| children | e0345afdf64e |
| files | lisp/shell.el |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/shell.el Sun Jul 18 06:20:15 1993 +0000 +++ b/lisp/shell.el Sun Jul 18 06:20:47 1993 +0000 @@ -144,12 +144,16 @@ (require 'comint) ;;;###autoload -(defvar shell-prompt-pattern "^[^#$%>]*[#$%>] *" +(defvar shell-prompt-pattern "^[^#$%>\n]*[#$%>] *" "Regexp to match prompts in the inferior shell. -Defaults to \"^[^#$%>]*[#$%>] *\", which works pretty well. +Defaults to \"^[^#$%>\\n]*[#$%>] *\", which works pretty well. This variable is used to initialise `comint-prompt-regexp' in the shell buffer. +The pattern should probably not match more than one line. If it does, +shell-mode may become confused trying to distinguish prompt from input +on lines which don't start with a prompt. + This is a fine thing to set in your `.emacs' file.") (defvar shell-popd-regexp "popd" @@ -414,7 +418,8 @@ (cons old (cdr shell-dirstack))) (shell-dirstack-message)) (message "Directory stack empty.")) - (message "Couldn't cd.")) + (error + (message "Couldn't cd."))) (let ((num (shell-extract-num arg))) (if num ; pushd +n