procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename cygwin_convert_path* to cygwin_convert_file_name*

Browse source
This commit is contained in:
Daniel Colascione 2012-11-18 17:39:37 -08:00
parent 031b541f19
commit 6e9f7997b3
6 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
etc/NEWS
View file

@ -1034,9 +1034,10 @@ takes precedence over most other maps for a short while (normally one key).
Pass --with-w32 to configure. The default remains the X11 interface.
** Two new functions are available in Cygwin builds:
`cygwin-convert-path-from-windows' and `cygwin-convert-path-to-windows'.
These functions allow Lisp code to access the Cygwin file-name mapping
machinery to convert between Cygwin and Windows-native file names.
`cygwin-convert-file-name-from-windows' and
`cygwin-convert-file-name-to-windows'. These functions allow Lisp
code to access the Cygwin file-name mapping machinery to convert
between Cygwin and Windows-native file and directory names.
** When invoked with the -nw switch to run on the Windows text-mode terminal,
Emacs now supports mouse highlight, help-echo (in the echo area), and

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-11-19 Daniel Colascione <dancol@dancol.org>
* term/w32-win.el (cygwin-convert-path-from-windows): Accomodate
rename of cygwin_convert_path* to cygwin_convert_file_name*.
2012-11-18 Chong Yidong <cyd@gnu.org>
* filecache.el (file-cache--read-list): New function.

4
lisp/term/w32-win.el
View file

@ -91,7 +91,7 @@
(declare-function w32-send-sys-command "w32fns.c")
(declare-function set-message-beep "w32fns.c")
(declare-function cygwin-convert-path-from-windows "cygw32.c"
(declare-function cygwin-convert-file-name-from-windows "cygw32.c"
(path &optional absolute_p))
;; Conditional on new-fontset so bootstrapping works on non-GUI compiles
@ -108,7 +108,7 @@
(defun w32-handle-dropped-file (window file-name)
(let ((f (if (eq system-type 'cygwin)
(cygwin-convert-path-from-windows file-name t)
(cygwin-convert-file-name-from-windows file-name t)
(subst-char-in-string ?\\ ?/ file-name)))
(coding (or file-name-coding-system
default-file-name-coding-system)))

9
src/ChangeLog
View file

@ -1,3 +1,12 @@
2012-11-19 Daniel Colascione <dancol@dancol.org>
* w32fns.c (Fx_file_dialog):
(Fx_file_dialog): Accomodate rename of cygwin_convert_path* to
cygwin_convert_file_name*.
* cygw32.c (Fcygwin_convert_path_to_windows, syms_of_cygw32):
Rename cygwin_convert_path* to cygwin_convert_file_name*.
2012-11-18 Paul Eggert <eggert@cs.ucla.edu>
* nsterm.m (ns_select): Send SIGIO only to self, not to process group.

20
src/cygw32.c
View file

@ -106,22 +106,24 @@ conv_filename_from_w32_unicode (const wchar_t* in, int absolute_p)
return unbind_to (count, DECODE_FILE (converted));
}
DEFUN ("cygwin-convert-path-to-windows",
Fcygwin_convert_path_to_windows, Scygwin_convert_path_to_windows,
DEFUN ("cygwin-convert-file-name-to-windows",
Fcygwin_convert_file_name_to_windows,
Scygwin_convert_file_name_to_windows,
1, 2, 0,
doc: /* Convert PATH to a Windows path. If ABSOLUTE-P if
non-nil, return an absolute path.*/)
doc: /* Convert PATH to a Windows path. If ABSOLUTE-P is
non-nil, return an absolute path.*/)
(Lisp_Object path, Lisp_Object absolute_p)
{
return from_unicode (
conv_filename_to_w32_unicode (path, EQ (absolute_p, Qnil) ? 0 : 1));
}
DEFUN ("cygwin-convert-path-from-windows",
Fcygwin_convert_path_from_windows, Scygwin_convert_path_from_windows,
DEFUN ("cygwin-convert-file-name-from-windows",
Fcygwin_convert_file_name_from_windows,
Scygwin_convert_file_name_from_windows,
1, 2, 0,
doc: /* Convert a Windows path to a Cygwin path. If ABSOLUTE-P
if non-nil, return an absolute path.*/)
is non-nil, return an absolute path.*/)
(Lisp_Object path, Lisp_Object absolute_p)
{
return conv_filename_from_w32_unicode (to_unicode (path, &path),
@ -131,6 +133,6 @@ DEFUN ("cygwin-convert-path-from-windows",
void
syms_of_cygw32 (void)
{
defsubr (&Scygwin_convert_path_from_windows);
defsubr (&Scygwin_convert_path_to_windows);
defsubr (&Scygwin_convert_file_name_from_windows);
defsubr (&Scygwin_convert_file_name_to_windows);
}

6
src/w32fns.c
View file

@ -6167,9 +6167,9 @@ Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories. */)
filename = empty_unibyte_string;
#ifdef CYGWIN
dir = Fcygwin_convert_path_to_windows (dir, Qt);
dir = Fcygwin_convert_file_name_to_windows (dir, Qt);
if (SCHARS (filename) > 0)
filename = Fcygwin_convert_path_to_windows (filename, Qnil);
filename = Fcygwin_convert_file_name_to_windows (filename, Qnil);
#endif
CHECK_STRING (dir);
@ -6270,7 +6270,7 @@ Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories. */)
#endif /* NTGUI_UNICODE */
#ifdef CYGWIN
filename = Fcygwin_convert_path_from_windows (filename, Qt);
filename = Fcygwin_convert_file_name_from_windows (filename, Qt);
#endif /* CYGWIN */
/* Strip the dummy filename off the end of the string if we