# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 742976447 0
# Node ID c9a0f06110bde357214242a33e6c279b05ea0144
# Parent  e5aee6a3bb75f6e27b7d80043f12d8cc029cb12e
	* 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.

diff -r e5aee6a3bb75 -r c9a0f06110bd lisp/shell.el
--- 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