diff options
| author | Glenn Morris | 2015-02-19 21:42:22 -0800 |
|---|---|---|
| committer | Glenn Morris | 2015-02-19 21:42:22 -0800 |
| commit | 35f047c06603ce2e549e43ba38de0e61083b0311 (patch) | |
| tree | a225d6945a1efcd4dfdba6a33fd7513ba520f7d9 /src | |
| parent | 6f2971ab761e62e649892bd3fe5c08983420c5ae (diff) | |
| download | emacs-35f047c06603ce2e549e43ba38de0e61083b0311.tar.gz emacs-35f047c06603ce2e549e43ba38de0e61083b0311.zip | |
* src/fileio.c (Fmake_temp_name): Doc tweaks.
Fixes: debbugs:19858
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fileio.c | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 52be915ecb9..8bffdadf66c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2015-02-20 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * fileio.c (Fmake_temp_name): Doc tweaks. (Bug#19858) | ||
| 4 | |||
| 1 | 2015-02-14 Eli Zaretskii <eliz@gnu.org> | 5 | 2015-02-14 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call | 7 | * menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call |
diff --git a/src/fileio.c b/src/fileio.c index fb1fe28aca2..c87a87ca7c6 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -828,20 +828,16 @@ make_temp_name (Lisp_Object prefix, bool base64_p) | |||
| 828 | 828 | ||
| 829 | DEFUN ("make-temp-name", Fmake_temp_name, Smake_temp_name, 1, 1, 0, | 829 | DEFUN ("make-temp-name", Fmake_temp_name, Smake_temp_name, 1, 1, 0, |
| 830 | doc: /* Generate temporary file name (string) starting with PREFIX (a string). | 830 | doc: /* Generate temporary file name (string) starting with PREFIX (a string). |
| 831 | The Emacs process number forms part of the result, | 831 | The Emacs process number forms part of the result, so there is no |
| 832 | so there is no danger of generating a name being used by another process. | 832 | danger of generating a name being used by another Emacs process |
| 833 | \(so long as only a single host can access the containing directory...). | ||
| 833 | 834 | ||
| 834 | In addition, this function makes an attempt to choose a name | 835 | This function tries to choose a name that has no existing file. |
| 835 | which has no existing file. To make this work, | 836 | For this to work, PREFIX should be an absolute file name. |
| 836 | PREFIX should be an absolute file name. | ||
| 837 | 837 | ||
| 838 | There is a race condition between calling `make-temp-name' and creating the | 838 | There is a race condition between calling `make-temp-name' and creating the |
| 839 | file which opens all kinds of security holes. For that reason, you should | 839 | file, which opens all kinds of security holes. For that reason, you should |
| 840 | probably use `make-temp-file' instead, except in three circumstances: | 840 | normally use `make-temp-file' instead. */) |
| 841 | |||
| 842 | * If you are creating the file in the user's home directory. | ||
| 843 | * If you are creating a directory rather than an ordinary file. | ||
| 844 | * If you are taking special precautions as `make-temp-file' does. */) | ||
| 845 | (Lisp_Object prefix) | 841 | (Lisp_Object prefix) |
| 846 | { | 842 | { |
| 847 | return make_temp_name (prefix, 0); | 843 | return make_temp_name (prefix, 0); |