diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-02-01 19:38:21 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-02-01 19:38:21 -0800 |
| commit | 94fbc901707d7c1fd7ec0471d288e585caf59b34 (patch) | |
| tree | 6d1d48970b231f2ccd2f7c36e4c7298302c00e93 /lisp/net | |
| parent | 98da8c0f542465341b930d36db8000b5bb2c77c4 (diff) | |
| parent | 13841bfcc20881a268e3c853f65312390c589700 (diff) | |
| download | emacs-94fbc901707d7c1fd7ec0471d288e585caf59b34.tar.gz | |
Merge from emacs-24; up to 2012-12-13T09:45:54Z!lekktu@gmail.com
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 4f31e95aeff..1dee9e89676 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3413,7 +3413,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 |