Mercurial > emacs
comparison src/fileio.c @ 90127:30ad2795fdab
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-28
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 180-191)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 39-44)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 19 Mar 2005 02:42:17 +0000 |
parents | 8395880305fe 3f5458d947ec |
children | 4da4a09e8b1b |
comparison
equal
deleted
inserted
replaced
90126:8ee106ee2dc8 | 90127:30ad2795fdab |
---|---|
2381 } | 2381 } |
2382 return; | 2382 return; |
2383 } | 2383 } |
2384 | 2384 |
2385 DEFUN ("copy-file", Fcopy_file, Scopy_file, 2, 4, | 2385 DEFUN ("copy-file", Fcopy_file, Scopy_file, 2, 4, |
2386 "fCopy file: \nFCopy %s to file: \np\nP", | 2386 "fCopy file: \nGCopy %s to file: \np\nP", |
2387 doc: /* Copy FILE to NEWNAME. Both args must be strings. | 2387 doc: /* Copy FILE to NEWNAME. Both args must be strings. |
2388 If NEWNAME names a directory, copy FILE there. | 2388 If NEWNAME names a directory, copy FILE there. |
2389 Signals a `file-already-exists' error if file NEWNAME already exists, | 2389 Signals a `file-already-exists' error if file NEWNAME already exists, |
2390 unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil. | 2390 unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil. |
2391 A number as third arg means request confirmation if NEWNAME already exists. | 2391 A number as third arg means request confirmation if NEWNAME already exists. |
2672 return NILP (internal_condition_case_1 (Fdelete_file, filename, | 2672 return NILP (internal_condition_case_1 (Fdelete_file, filename, |
2673 Qt, internal_delete_file_1)); | 2673 Qt, internal_delete_file_1)); |
2674 } | 2674 } |
2675 | 2675 |
2676 DEFUN ("rename-file", Frename_file, Srename_file, 2, 3, | 2676 DEFUN ("rename-file", Frename_file, Srename_file, 2, 3, |
2677 "fRename file: \nFRename %s to file: \np", | 2677 "fRename file: \nGRename %s to file: \np", |
2678 doc: /* Rename FILE as NEWNAME. Both args strings. | 2678 doc: /* Rename FILE as NEWNAME. Both args strings. |
2679 If file has names other than FILE, it continues to have those names. | 2679 If file has names other than FILE, it continues to have those names. |
2680 Signals a `file-already-exists' error if a file NEWNAME already exists | 2680 Signals a `file-already-exists' error if a file NEWNAME already exists |
2681 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. | 2681 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. |
2682 A number as third arg means request confirmation if NEWNAME already exists. | 2682 A number as third arg means request confirmation if NEWNAME already exists. |
2760 UNGCPRO; | 2760 UNGCPRO; |
2761 return Qnil; | 2761 return Qnil; |
2762 } | 2762 } |
2763 | 2763 |
2764 DEFUN ("add-name-to-file", Fadd_name_to_file, Sadd_name_to_file, 2, 3, | 2764 DEFUN ("add-name-to-file", Fadd_name_to_file, Sadd_name_to_file, 2, 3, |
2765 "fAdd name to file: \nFName to add to %s: \np", | 2765 "fAdd name to file: \nGName to add to %s: \np", |
2766 doc: /* Give FILE additional name NEWNAME. Both args strings. | 2766 doc: /* Give FILE additional name NEWNAME. Both args strings. |
2767 Signals a `file-already-exists' error if a file NEWNAME already exists | 2767 Signals a `file-already-exists' error if a file NEWNAME already exists |
2768 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. | 2768 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. |
2769 A number as third arg means request confirmation if NEWNAME already exists. | 2769 A number as third arg means request confirmation if NEWNAME already exists. |
2770 This is what happens in interactive use with M-x. */) | 2770 This is what happens in interactive use with M-x. */) |
2827 return Qnil; | 2827 return Qnil; |
2828 } | 2828 } |
2829 | 2829 |
2830 #ifdef S_IFLNK | 2830 #ifdef S_IFLNK |
2831 DEFUN ("make-symbolic-link", Fmake_symbolic_link, Smake_symbolic_link, 2, 3, | 2831 DEFUN ("make-symbolic-link", Fmake_symbolic_link, Smake_symbolic_link, 2, 3, |
2832 "FMake symbolic link to file: \nFMake symbolic link to file %s: \np", | 2832 "FMake symbolic link to file: \nGMake symbolic link to file %s: \np", |
2833 doc: /* Make a symbolic link to FILENAME, named LINKNAME. Both args strings. | 2833 doc: /* Make a symbolic link to FILENAME, named LINKNAME. Both args strings. |
2834 Signals a `file-already-exists' error if a file LINKNAME already exists | 2834 Signals a `file-already-exists' error if a file LINKNAME already exists |
2835 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. | 2835 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. |
2836 A number as third arg means request confirmation if LINKNAME already exists. | 2836 A number as third arg means request confirmation if LINKNAME already exists. |
2837 This happens for interactive use with M-x. */) | 2837 This happens for interactive use with M-x. */) |