diff options
| author | Karoly Lorentey <[email protected]> | 2005-03-19 17:55:13 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2005-03-19 17:55:13 +0000 |
| commit | 392711ede18168618ac6eedd4fdf5910d11a2714 (patch) | |
| tree | 29940aa43a5fb4527b4111db7fb7aa2b57b444fd /src/fileio.c | |
| parent | 04e9296582b1bbe7b2c5911691d9fbe4a9581382 (diff) | |
| parent | 951f97e67d904729032b476caf5f7c2e7e303d73 (diff) | |
Merged from [email protected] (patch 39-44, 184-191)
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-184
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-185
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-186
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-187
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-188
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-189
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-190
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-191
Update from CVS
* [email protected]/gnus--rel--5.10--patch-39
Merge from emacs--cvs-trunk--0
* [email protected]/gnus--rel--5.10--patch-40
Update from CVS
* [email protected]/gnus--rel--5.10--patch-41
Update from CVS
* [email protected]/gnus--rel--5.10--patch-42
Update from CVS
* [email protected]/gnus--rel--5.10--patch-43
Update from CVS
* [email protected]/gnus--rel--5.10--patch-44
Merge from emacs--cvs-trunk--0
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-311
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fileio.c b/src/fileio.c index 1eaad3192d..60d9c46b6e 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2380,7 +2380,7 @@ barf_or_query_if_file_exists (absname, querystring, interactive, statptr, quick) } DEFUN ("copy-file", Fcopy_file, Scopy_file, 2, 4, - "fCopy file: \nFCopy %s to file: \np\nP", + "fCopy file: \nGCopy %s to file: \np\nP", doc: /* Copy FILE to NEWNAME. Both args must be strings. If NEWNAME names a directory, copy FILE there. Signals a `file-already-exists' error if file NEWNAME already exists, @@ -2671,7 +2671,7 @@ internal_delete_file (filename) } DEFUN ("rename-file", Frename_file, Srename_file, 2, 3, - "fRename file: \nFRename %s to file: \np", + "fRename file: \nGRename %s to file: \np", doc: /* Rename FILE as NEWNAME. Both args strings. If file has names other than FILE, it continues to have those names. Signals a `file-already-exists' error if a file NEWNAME already exists @@ -2759,7 +2759,7 @@ This is what happens in interactive use with M-x. */) } DEFUN ("add-name-to-file", Fadd_name_to_file, Sadd_name_to_file, 2, 3, - "fAdd name to file: \nFName to add to %s: \np", + "fAdd name to file: \nGName to add to %s: \np", doc: /* Give FILE additional name NEWNAME. Both args strings. Signals a `file-already-exists' error if a file NEWNAME already exists unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. @@ -2826,7 +2826,7 @@ This is what happens in interactive use with M-x. */) #ifdef S_IFLNK DEFUN ("make-symbolic-link", Fmake_symbolic_link, Smake_symbolic_link, 2, 3, - "FMake symbolic link to file: \nFMake symbolic link to file %s: \np", + "FMake symbolic link to file: \nGMake symbolic link to file %s: \np", doc: /* Make a symbolic link to FILENAME, named LINKNAME. Both args strings. Signals a `file-already-exists' error if a file LINKNAME already exists unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. |