aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2005-04-24 13:24:29 +0000
committerEli Zaretskii2005-04-24 13:24:29 +0000
commit5eb20bca14dde4f968cff06e8e40664bc3a7e29f (patch)
tree7117ae938fa9345d2180042fd8171a69c0fb0fe1
parent45d2f8e82c8b00a9c6cb436ee6f99400e474c032 (diff)
downloademacs-5eb20bca14dde4f968cff06e8e40664bc3a7e29f.tar.gz
emacs-5eb20bca14dde4f968cff06e8e40664bc3a7e29f.zip
(Unique File Names): Don't mention "numbers" in the documentation
of make-temp-file and make-temp-name.
-rw-r--r--lispref/ChangeLog2
-rw-r--r--lispref/files.texi25
2 files changed, 16 insertions, 11 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index cdf2ed0da87..fc17818888d 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,6 +1,8 @@
12005-04-24 Eli Zaretskii <eliz@gnu.org> 12005-04-24 Eli Zaretskii <eliz@gnu.org>
2 2
3 * files.texi (Changing Files): Fix last change's cross-reference. 3 * files.texi (Changing Files): Fix last change's cross-reference.
4 (Unique File Names): Don't mention "numbers" in the documentation
5 of make-temp-file and make-temp-name.
4 6
52005-04-23 Richard M. Stallman <rms@gnu.org> 72005-04-23 Richard M. Stallman <rms@gnu.org>
6 8
diff --git a/lispref/files.texi b/lispref/files.texi
index e7574ec4682..0b6e7a2832d 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -2028,10 +2028,13 @@ two different jobs from trying to use the exact same file name.
2028 2028
2029@defun make-temp-file prefix &optional dir-flag suffix 2029@defun make-temp-file prefix &optional dir-flag suffix
2030@tindex make-temp-file 2030@tindex make-temp-file
2031This function creates a temporary file and returns its name. 2031This function creates a temporary file and returns its name. Emacs
2032The name starts with @var{prefix}; it also contains a number that is 2032creates the temporary file's name by adding to @var{prefix} some
2033different in each Emacs job. If @var{prefix} is a relative file name, 2033random characters that are different in each Emacs job. The result is
2034it is expanded against @code{temporary-file-directory}. 2034guaranteed to be a newly created empty file. On MS-DOS, this function
2035can truncate the @var{string} prefix to fit into the 8+3 file-name
2036limits. If @var{prefix} is a relative file name, it is expanded
2037against @code{temporary-file-directory}.
2035 2038
2036@example 2039@example
2037@group 2040@group
@@ -2076,13 +2079,13 @@ you should use @code{make-temp-name} instead:
2076@end example 2079@end example
2077 2080
2078@defun make-temp-name string 2081@defun make-temp-name string
2079This function generates a string that can be used as a unique file name. 2082This function generates a string that can be used as a unique file
2080The name starts with @var{string}, and contains a number that is 2083name. The name starts with @var{string}, and has several random
2081different in each Emacs job. It is like @code{make-temp-file} except 2084characters appended to it, which are different in each Emacs job. It
2082that it just constructs a name, and does not create a file. Another 2085is like @code{make-temp-file} except that it just constructs a name,
2083difference is that @var{string} should be an absolute file name. On 2086and does not create a file. Another difference is that @var{string}
2084MS-DOS, this function can truncate the @var{string} prefix to fit into 2087should be an absolute file name. On MS-DOS, this function can
2085the 8+3 file-name limits. 2088truncate the @var{string} prefix to fit into the 8+3 file-name limits.
2086@end defun 2089@end defun
2087 2090
2088@defvar temporary-file-directory 2091@defvar temporary-file-directory