From: Juri Linkov <juri@jurta.org>
Date: Sat, 2 Sep 2006 23:30:21 +0000 (+0000)
Subject: (shell-filter-ctrl-a-ctrl-b): Check if `comint-last-output-start' is
X-Git-Tag: emacs-pretest-22.0.90~785
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc6e650ef588019f55df553efeae6b29de1fa9d8;p=emacs.git

(shell-filter-ctrl-a-ctrl-b): Check if `comint-last-output-start' is
a marker by using `markerp' and check if it has a position by using
`marker-position', and use this position for `goto-char'.
---

diff --git a/lisp/shell.el b/lisp/shell.el
index 6a145ae1569..d4791821b5b 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -483,7 +483,9 @@ This function can be put on `comint-output-filter-functions'.
 The argument STRING is ignored."
   (let ((pmark (process-mark (get-buffer-process (current-buffer)))))
     (save-excursion
-      (goto-char (or comint-last-output-start (point-min)))
+      (goto-char (or (and (markerp comint-last-output-start)
+			  (marker-position comint-last-output-start))
+		     (point-min)))
       (while (re-search-forward "[\C-a\C-b]" pmark t)
         (replace-match "")))))