diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-11-07 00:41:14 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-11-07 01:54:31 +0100 |
| commit | 0cac4598a77028a64dde9df74c76549cf48a19f2 (patch) | |
| tree | 0cf39903659055ec7f375db2cbcac5c07f42f105 /lisp | |
| parent | 385741fae276c7cfe2975e8a64cf084e0f63cf3d (diff) | |
| download | emacs-0cac4598a77028a64dde9df74c76549cf48a19f2.tar.gz emacs-0cac4598a77028a64dde9df74c76549cf48a19f2.tar.bz2 emacs-0cac4598a77028a64dde9df74c76549cf48a19f2.zip | |
Ensure return value of ert-with-temp-directory
* lisp/emacs-lisp/ert-x.el (ert-with-temp-file): Ensure return
value when :directory is t is the directory name.
* test/lisp/emacs-lisp/ert-x-tests.el
(ert-x-tests-with-temp-directory): Extend test for the above.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/ert-x.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el index 752ac3bfdd4..ffeead4179d 100644 --- a/lisp/emacs-lisp/ert-x.el +++ b/lisp/emacs-lisp/ert-x.el @@ -445,7 +445,9 @@ See also `ert-with-temp-directory'." (or (macroexp-file-name) buffer-file-name))))) `(let* ((,temp-file (,(if directory 'file-name-as-directory 'identity) (make-temp-file ,prefix ,directory ,suffix ,text))) - (,name ,temp-file)) + (,name ,(if directory + `(file-name-as-directory ,temp-file) + temp-file))) (unwind-protect (progn ,@body) (ignore-errors |