diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2018-12-09 09:45:40 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-12-09 09:45:40 +0200 |
| commit | c2fdd50c3cb0b03d2414370c58c1aa2a6ec3311d (patch) | |
| tree | 158297af74fff2668369ef405a66e667aae9a36f /lisp/eshell | |
| parent | 7515a1d493f8f0f6f009b50c99cc5e27824bd6b3 (diff) | |
| download | emacs-c2fdd50c3cb0b03d2414370c58c1aa2a6ec3311d.tar.gz | |
Fix resolving symlinks in Eshell history file names
* lisp/eshell/em-dirs.el (eshell-write-last-dir-ring):
* lisp/eshell/em-hist.el (eshell-write-history): Don't call
file-truename with argument of nil. (Bug#33477)
* test/lisp/eshell/eshell-tests.el (with-temp-eshell): Remove
HISTFILE from the environment, to make sure the Eshell history
file is nil.
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/em-dirs.el | 2 | ||||
| -rw-r--r-- | lisp/eshell/em-hist.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index c16a5ac6e07..853382888c9 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -553,7 +553,7 @@ in the minibuffer: (defun eshell-write-last-dir-ring () "Write the buffer's `eshell-last-dir-ring' to a history file." (let* ((file eshell-last-dir-ring-file-name) - (resolved-file (file-truename file))) + (resolved-file (if (stringp file) (file-truename file)))) (cond ((or (null file) (equal file "") diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el index f866dfd7276..1b240c0460f 100644 --- a/lisp/eshell/em-hist.el +++ b/lisp/eshell/em-hist.el @@ -467,7 +467,7 @@ Useful within process sentinels. See also `eshell-read-history'." (let* ((file (or filename eshell-history-file-name)) - (resolved-file (file-truename file))) + (resolved-file (if (stringp file) (file-truename file)))) (cond ((or (null file) (equal file "") |