diff options
| author | Glenn Morris | 2013-01-09 00:30:21 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-01-09 00:30:21 -0800 |
| commit | fb9f7146677ca0d6f03ca88dd8cd39bc3733682d (patch) | |
| tree | b143c50ce4497c0a4b518ce859fc7b93eadf3f88 /lisp/comint.el | |
| parent | 454fa9b7ea69d459d65643e7bae84b3a95dce44e (diff) | |
| parent | ebb965fcf860516c7ec8de351cda8d18811283c1 (diff) | |
| download | emacs-fb9f7146677ca0d6f03ca88dd8cd39bc3733682d.tar.gz emacs-fb9f7146677ca0d6f03ca88dd8cd39bc3733682d.zip | |
Merge from emacs-24; up to 2012-12-08T12:11:29Z!eliz@gnu.org
Diffstat (limited to 'lisp/comint.el')
| -rw-r--r-- | lisp/comint.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/comint.el b/lisp/comint.el index e797fe841d3..42ac08a9ecc 100644 --- a/lisp/comint.el +++ b/lisp/comint.el | |||
| @@ -1847,9 +1847,9 @@ Similarly for Soar, Scheme, etc." | |||
| 1847 | (let ((echo-len (- comint-last-input-end | 1847 | (let ((echo-len (- comint-last-input-end |
| 1848 | comint-last-input-start))) | 1848 | comint-last-input-start))) |
| 1849 | ;; Wait for all input to be echoed: | 1849 | ;; Wait for all input to be echoed: |
| 1850 | (while (and (accept-process-output proc) | 1850 | (while (and (> (+ comint-last-input-end echo-len) |
| 1851 | (> (+ comint-last-input-end echo-len) | ||
| 1852 | (point-max)) | 1851 | (point-max)) |
| 1852 | (accept-process-output proc) | ||
| 1853 | (zerop | 1853 | (zerop |
| 1854 | (compare-buffer-substrings | 1854 | (compare-buffer-substrings |
| 1855 | nil comint-last-input-start | 1855 | nil comint-last-input-start |