diff options
| author | Vitalie Spinu | 2013-01-06 17:06:39 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-01-06 17:06:39 -0800 |
| commit | 236a8f0cc08f7393b606e31041e12f04c8d4b517 (patch) | |
| tree | f08ce2a48f12a8daa9d97b1df9fc81d5483f1079 | |
| parent | 605f02eea950716821f474ea60f7b78b9962665e (diff) | |
| download | emacs-236a8f0cc08f7393b606e31041e12f04c8d4b517.tar.gz emacs-236a8f0cc08f7393b606e31041e12f04c8d4b517.zip | |
comint-send-input tiny change
* lisp/comint.el (comint-send-input): Check size of buffer before
waiting for process output, in case already accepted.
Fixes: debbugs:13290
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/comint.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 86cd55c6c36..54ce07b1fb2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-01-07 Vitalie Spinu <spinuvit@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * comint.el (comint-send-input): Check size of buffer before | ||
| 4 | waiting for process output, in case already accepted. (Bug#13290) | ||
| 5 | |||
| 1 | 2013-01-04 Michael Albinus <michael.albinus@gmx.de> | 6 | 2013-01-04 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * net/tramp-sh.el (tramp-set-file-uid-gid): UID and GID must be | 8 | * net/tramp-sh.el (tramp-set-file-uid-gid): UID and GID must be |
diff --git a/lisp/comint.el b/lisp/comint.el index 7bdf67f8503..eda73af3501 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 |