aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-10-04 20:31:33 +0000
committerGlenn Morris2008-10-04 20:31:33 +0000
commitf8dce815d096990f4be2d1b9e9b80da506d25836 (patch)
tree4aff226bcc9281529ccc54b53d95e5f5a8a664ad
parenta80a6b030822c104b89d36106b2bbabf74b62c60 (diff)
downloademacs-f8dce815d096990f4be2d1b9e9b80da506d25836.tar.gz
emacs-f8dce815d096990f4be2d1b9e9b80da506d25836.zip
(make-temp-file): Handle empty `prefix'. (Bug#1081)
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/files.el6
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61004dcc163..550d787c753 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12008-10-04 Glenn Morris <rgm@gnu.org> 12008-10-04 Glenn Morris <rgm@gnu.org>
2 2
3 * files.el (make-temp-file): Handle empty `prefix'. (Bug#1081)
4
3 * vc-svn.el (vc-svn-after-dir-status): Handle `svn status -u' output. 5 * vc-svn.el (vc-svn-after-dir-status): Handle `svn status -u' output.
4 (vc-svn-dir-status): Respect vc-stay-local-p. (Bug#1046) 6 (vc-svn-dir-status): Respect vc-stay-local-p. (Bug#1046)
5 7
diff --git a/lisp/files.el b/lisp/files.el
index 439223e1f09..10c4574cb53 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -976,7 +976,11 @@ If SUFFIX is non-nil, add that at the end of the file name."
976 (progn 976 (progn
977 (setq file 977 (setq file
978 (make-temp-name 978 (make-temp-name
979 (expand-file-name prefix temporary-file-directory))) 979 (if (zerop (length prefix))
980 (file-name-as-directory
981 temporary-file-directory)
982 (expand-file-name prefix
983 temporary-file-directory))))
980 (if suffix 984 (if suffix
981 (setq file (concat file suffix))) 985 (setq file (concat file suffix)))
982 (if dir-flag 986 (if dir-flag