summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitalie Spinu <spinuvit@gmail.com>2013-01-06 17:06:39 -0800
committerGlenn Morris <rgm@gnu.org>2013-01-06 17:06:39 -0800
commit236a8f0cc08f7393b606e31041e12f04c8d4b517 (patch)
treef08ce2a48f12a8daa9d97b1df9fc81d5483f1079
parent605f02eea950716821f474ea60f7b78b9962665e (diff)
downloademacs-236a8f0cc08f7393b606e31041e12f04c8d4b517.tar.gz
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/ChangeLog5
-rw-r--r--lisp/comint.el4
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 @@
+2013-01-07 Vitalie Spinu <spinuvit@gmail.com> (tiny change)
+
+ * comint.el (comint-send-input): Check size of buffer before
+ waiting for process output, in case already accepted. (Bug#13290)
+
2013-01-04 Michael Albinus <michael.albinus@gmx.de>
* 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."
(let ((echo-len (- comint-last-input-end
comint-last-input-start)))
;; Wait for all input to be echoed:
- (while (and (accept-process-output proc)
- (> (+ comint-last-input-end echo-len)
+ (while (and (> (+ comint-last-input-end echo-len)
(point-max))
+ (accept-process-output proc)
(zerop
(compare-buffer-substrings
nil comint-last-input-start