1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-03 08:30:09 +00:00

* net/tramp.el (tramp-check-for-regexp): Search from buffer end,

in order to avoid "Stack overflow in regexp matcher".
This commit is contained in:
Michael Albinus 2012-06-01 15:23:26 +02:00
parent 4e8fa7d308
commit 046e38ce2b
2 changed files with 13 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2012-06-01 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-check-for-regexp): Search from buffer end,
in order to avoid "Stack overflow in regexp matcher".
2012-05-31 Glenn Morris <rgm@gnu.org>
* image.el: For clarity, call imagemagick-register-types at

View File

@ -3315,8 +3315,14 @@ Erase echoed commands if exists."
'buffer-substring-no-properties
1 (min (1+ tramp-echo-mark-marker-length) (point-max))))))
;; No echo to be handled, now we can look for the regexp.
(goto-char (point-min))
(re-search-forward regexp nil t))))
;; Sometimes, the buffer is much to huge, and we run into a
;; "Stack overflow in regexp matcher". For example, directory
;; listings with some thousand files. Therefore, we look from
;; the end for the last line. We ignore also superlong lines,
;; like created with "//DIRED//".
(goto-char (point-max))
(unless (> (- (point) (point-at-bol)) 128)
(re-search-backward regexp (point-at-bol) t)))))
(defun tramp-wait-for-regexp (proc timeout regexp)
"Wait for a REGEXP to appear from process PROC within TIMEOUT seconds.
@ -3857,9 +3863,6 @@ Only works for Bourne-like shells."
;; * Run emerge on two remote files. Bug is described here:
;; <http://www.mail-archive.com/tramp-devel@nongnu.org/msg01041.html>.
;; (Bug#6850)
;; * It would be very useful if it were possible to load or save a
;; buffer using Tramp in a non-blocking way so that use of Emacs on
;; other buffers could continue. (Bug#9617)
;;; tramp.el ends here