From: Glenn Morris <rgm@gnu.org>
Date: Sun, 9 Dec 2018 23:54:35 +0000 (-0800)
Subject: * test/lisp/eshell/eshell-tests.el (with-temp-eshell):
X-Git-Tag: emacs-27.0.90~4012
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=87bc518afcc3adc23762944ef49f89d375f90260;p=emacs.git

* 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 cefbeef5677..330dd87ae4c 100644
--- 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