merge from trunk

test/ChangeLog

@@ -1,3 +1,8 @@
+2013-09-13  Glenn Morris  <rgm@gnu.org>
+
+	* automated/eshell.el (with-temp-eshell):
+	Use a temp directory for eshell-directory-name.
+
 2013-09-12  Glenn Morris  <rgm@gnu.org>
 
 	* automated/eshell.el (with-temp-eshell): Avoid hangs in batch mode

test/automated/eshell.el

@@ -30,12 +30,15 @@
 
 (defmacro with-temp-eshell (&rest body)
   "Evaluate BODY in a temporary Eshell buffer."
-  `(let ((eshell-buffer (eshell t)))
+  `(let* ((eshell-directory-name (make-temp-file "eshell" t))
+          (eshell-history-file-name nil)
+          (eshell-buffer (eshell t)))
      (unwind-protect
          (with-current-buffer eshell-buffer
            ,@body)
        (let (kill-buffer-query-functions)
-         (kill-buffer eshell-buffer)))))
+         (kill-buffer eshell-buffer)
+         (delete-directory eshell-directory-name t)))))
 
 (defun eshell-insert-command (text &optional func)
   "Insert a command at the end of the buffer."