aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-09-12 16:39:13 -0400
committerGlenn Morris2013-09-12 16:39:13 -0400
commit2d5788f46de3758fc468592cb2f17390c5c07db6 (patch)
tree0fb2e32be1849ee7a2d57058fc2fe11ec16b9d9e
parent51e14f13f084bc41b863e5cd0308f5fd7da23fff (diff)
downloademacs-2d5788f46de3758fc468592cb2f17390c5c07db6.tar.gz
emacs-2d5788f46de3758fc468592cb2f17390c5c07db6.zip
* test/automated/eshell.el (with-temp-eshell): Avoid hangs in batch mode
due to "has a running proces; kill it?" prompts.
-rw-r--r--test/ChangeLog5
-rw-r--r--test/automated/eshell.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 3e42e18b2b4..70f9f378d39 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
12013-09-12 Glenn Morris <rgm@gnu.org>
2
3 * automated/eshell.el (with-temp-eshell): Avoid hangs in batch mode
4 due to "has a running proces; kill it?" prompts.
5
12013-09-12 Stefan Monnier <monnier@iro.umontreal.ca> 62013-09-12 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * automated/eshell.el: Rename from eshell.el. 8 * automated/eshell.el: Rename from eshell.el.
diff --git a/test/automated/eshell.el b/test/automated/eshell.el
index a7df2945424..a78c34e4f39 100644
--- a/test/automated/eshell.el
+++ b/test/automated/eshell.el
@@ -34,7 +34,8 @@
34 (unwind-protect 34 (unwind-protect
35 (with-current-buffer eshell-buffer 35 (with-current-buffer eshell-buffer
36 ,@body) 36 ,@body)
37 (kill-buffer eshell-buffer)))) 37 (let (kill-buffer-query-functions)
38 (kill-buffer eshell-buffer)))))
38 39
39(defun eshell-insert-command (text &optional func) 40(defun eshell-insert-command (text &optional func)
40 "Insert a command at the end of the buffer." 41 "Insert a command at the end of the buffer."