(shell-prompt-pattern): Doc change.

(shell-backward-command): Use line-beginning-position.

diff --git a/lisp/shell.el b/lisp/shell.el
index 13d1d9adb6f4b437f3c1b001a5e90a51e746db40..b93fe57402f3cdcf0bcda4632939e3430aa4d87a 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -127,6 +127,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.
+
 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.
@@ -814,8 +817,8 @@ See `shell-command-regexp'."
 See `shell-command-regexp'."
   (interactive "p")
   (let ((limit (save-excursion (comint-bol nil) (point))))
-    (if (> limit (point))
-       (save-excursion (beginning-of-line) (setq limit (point))))
+    (when (> limit (point))
+      (setq limit (line-beginning-position)))
     (skip-syntax-backward " " limit)
     (if (re-search-backward
         (format "[;&|]+[\t ]*\\(%s\\)" shell-command-regexp) limit 'move arg)