diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:41:30 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:41:30 -0800 |
commit | 37ad855a38786722833d06dfe78786acc7e9f412 (patch) | |
tree | de0f0c7aac92eb2c321c1d6ec3254250316d1035 /src/fileio.c | |
parent | 36a50f38fbbcf5cc0cafc44af9d1bfcd6c13fc25 (diff) | |
parent | f1601063f29c99be77d2513320ed6d2494926c1d (diff) | |
download | emacs-37ad855a38786722833d06dfe78786acc7e9f412.tar.gz |
Merge from origin/emacs-24
f160106 Avoid assertion violations in Rmail due to newline cache
1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote
1817892 Avoid erratic behavior of menu-bar tooltips on w32 (Bug#19925)
0260932 Bump python.el version
b0adfc7 Spelling fixes
35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks.
6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching
65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged.
86fe750 # Remove NEWS temporary markup
4fa778b erc.el: Add old version header for package.el compatibilty
9366f05 Tramp: Disable paging with PAGER=cat
Conflicts:
admin/notes/repo
etc/NEWS
lisp/ChangeLog
lisp/erc/ChangeLog
src/ChangeLog
Diffstat (limited to 'src/fileio.c')
-rw-r--r-- | src/fileio.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/fileio.c b/src/fileio.c index 43ab456d813..d4e12cbe277 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -724,20 +724,16 @@ make_temp_name (Lisp_Object prefix, bool base64_p) DEFUN ("make-temp-name", Fmake_temp_name, Smake_temp_name, 1, 1, 0, doc: /* Generate temporary file name (string) starting with PREFIX (a string). -The Emacs process number forms part of the result, -so there is no danger of generating a name being used by another process. +The Emacs process number forms part of the result, so there is no +danger of generating a name being used by another Emacs process +\(so long as only a single host can access the containing directory...). -In addition, this function makes an attempt to choose a name -which has no existing file. To make this work, -PREFIX should be an absolute file name. +This function tries to choose a name that has no existing file. +For this to work, PREFIX should be an absolute file name. There is a race condition between calling `make-temp-name' and creating the -file which opens all kinds of security holes. For that reason, you should -probably use `make-temp-file' instead, except in three circumstances: - -* If you are creating the file in the user's home directory. -* If you are creating a directory rather than an ordinary file. -* If you are taking special precautions as `make-temp-file' does. */) +file, which opens all kinds of security holes. For that reason, you should +normally use `make-temp-file' instead. */) (Lisp_Object prefix) { return make_temp_name (prefix, 0); |