* test/lisp/eshell/eshell-tests.el (with-temp-eshell):

Avoid permanently changing HISTFILE.

diff --git a/test/lisp/eshell/eshell-tests.el b/test/lisp/eshell/eshell-tests.el
index cefbeef5677c3ba26d36bd2b4b517ebef7448e4f..330dd87ae4cc82b367cc09ef8f3db2977dbfcd8e 100644 (file)
--- a/test/lisp/eshell/eshell-tests.el
+++ b/test/lisp/eshell/eshell-tests.el
@@ -33,7 +33,7 @@
   `(let* ((eshell-directory-name (make-temp-file "eshell" t))
           ;; We want no history file, so prevent Eshell from falling
           ;; back on $HISTFILE.
-          (_ (setenv "HISTFILE"))
+          (process-environment (cons "HISTFILE" process-environment))
           (eshell-history-file-name nil)
           (eshell-buffer (eshell t)))
      (unwind-protect