* net/tramp.el (tramp-check-for-regexp): Avoid "Args out of range"

error when buffer in question is narrowed so position 1 is out of
visible part.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88fdf7ac1ac18c331382b7c7a4c5a4603ee96c6c..df19277bb3a6f0edab4c44f8d029313718cd32fb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-01  Andrew W. Nosenko  <andrew.w.nosenko@gmail.com>  (tiny change)
+
+       * net/tramp.el (tramp-check-for-regexp): Avoid "Args out of range"
+       error when buffer in question is narrowed so position 1 is out of
+       visible part.
+
 2013-01-31  Glenn Morris  <rgm@gnu.org>
 
        * textmodes/remember.el (remember-clipboard): Doc fix.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c29879691d742aa3e4e6e541c2cd5b1b94d18d6d..6710c8a521144f6fd45f2d38afc8084e6a621b91 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3359,7 +3359,9 @@ Erase echoed commands if exists."
                     0 (min tramp-echo-mark-marker-length (1- (point-max))))
                    (tramp-compat-funcall
                     'buffer-substring-no-properties
-                    1 (min (1+ tramp-echo-mark-marker-length) (point-max))))))
+                    (point-min)
+                    (min (+ (point-min) tramp-echo-mark-marker-length)
+                         (point-max))))))
       ;; No echo to be handled, now we can look for the regexp.
       ;; Sometimes, lines are much to long, and we run into a "Stack
       ;; overflow in regexp matcher".  For example, //DIRED// lines of