diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/cygw32.c | 18 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c8cc486a9de..fccdc1dfcae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-27 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * cygw32.c (Fcygwin_convert_file_name_to_windows) | ||
| 4 | (Fcygwin_convert_file_name_from_windows): Doc fixes. | ||
| 5 | |||
| 1 | 2012-12-24 Eli Zaretskii <eliz@gnu.org> | 6 | 2012-12-24 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * fileio.c (file_name_as_directory, directory_file_name): Accept | 8 | * fileio.c (file_name_as_directory, directory_file_name): Accept |
diff --git a/src/cygw32.c b/src/cygw32.c index d9777d5e22e..5873a05dcf0 100644 --- a/src/cygw32.c +++ b/src/cygw32.c | |||
| @@ -110,23 +110,25 @@ DEFUN ("cygwin-convert-file-name-to-windows", | |||
| 110 | Fcygwin_convert_file_name_to_windows, | 110 | Fcygwin_convert_file_name_to_windows, |
| 111 | Scygwin_convert_file_name_to_windows, | 111 | Scygwin_convert_file_name_to_windows, |
| 112 | 1, 2, 0, | 112 | 1, 2, 0, |
| 113 | doc: /* Convert PATH to a Windows path. If ABSOLUTE-P is | 113 | doc: /* Convert a Cygwin file name FILE to a Windows-style file name. |
| 114 | non-nil, return an absolute path.*/) | 114 | If ABSOLUTE-P is non-nil, return an absolute file name. |
| 115 | (Lisp_Object path, Lisp_Object absolute_p) | 115 | For the reverse operation, see `cygwin-convert-file-name-from-windows'. */) |
| 116 | (Lisp_Object file, Lisp_Object absolute_p) | ||
| 116 | { | 117 | { |
| 117 | return from_unicode ( | 118 | return from_unicode ( |
| 118 | conv_filename_to_w32_unicode (path, EQ (absolute_p, Qnil) ? 0 : 1)); | 119 | conv_filename_to_w32_unicode (file, EQ (absolute_p, Qnil) ? 0 : 1)); |
| 119 | } | 120 | } |
| 120 | 121 | ||
| 121 | DEFUN ("cygwin-convert-file-name-from-windows", | 122 | DEFUN ("cygwin-convert-file-name-from-windows", |
| 122 | Fcygwin_convert_file_name_from_windows, | 123 | Fcygwin_convert_file_name_from_windows, |
| 123 | Scygwin_convert_file_name_from_windows, | 124 | Scygwin_convert_file_name_from_windows, |
| 124 | 1, 2, 0, | 125 | 1, 2, 0, |
| 125 | doc: /* Convert a Windows path to a Cygwin path. If ABSOLUTE-P | 126 | doc: /* Convert a Windows-style file name FILE to a Cygwin file name. |
| 126 | is non-nil, return an absolute path.*/) | 127 | If ABSOLUTE-P is non-nil, return an absolute file name. |
| 127 | (Lisp_Object path, Lisp_Object absolute_p) | 128 | For the reverse operation, see `cygwin-convert-file-name-to-windows'. */) |
| 129 | (Lisp_Object file, Lisp_Object absolute_p) | ||
| 128 | { | 130 | { |
| 129 | return conv_filename_from_w32_unicode (to_unicode (path, &path), | 131 | return conv_filename_from_w32_unicode (to_unicode (file, &file), |
| 130 | EQ (absolute_p, Qnil) ? 0 : 1); | 132 | EQ (absolute_p, Qnil) ? 0 : 1); |
| 131 | } | 133 | } |
| 132 | 134 | ||