Backport: Rename cygwin_convert_path* to cygwin_convert_file_name*

6 files changed, 37 insertions, 16 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 43e760ba330..d9efc57b907 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -988,9 +988,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
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 225f296e135..8502cd477e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-20  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*.
+        This change is a backport from trunk.
+
 2012-11-20  Eli Zaretskii  <eliz@gnu.org>
 
         * simple.el (line-move): Don't call line-move-partial if
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index ad6e1125027..3f8a66843e4 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -91,6 +91,9 @@
 (declare-function w32-send-sys-command "w32fns.c")
 (declare-function set-message-beep "w32fns.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
 (if (fboundp 'new-fontset)
     (require 'fontset))
@@ -105,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)))
diff --git a/src/ChangeLog b/src/ChangeLog
index 3836e32fdbc..f7cb0fe850f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2012-11-20  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-20  Ken Brown  <kbrown@cornell.edu>
 
         * emacs.c (main): Set the G_SLICE environment variable for all
diff --git a/src/cygw32.c b/src/cygw32.c
index 54f2076a891..d9777d5e22e 100644
--- a/src/cygw32.c
+++ b/src/cygw32.c
@@ -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);
 }
diff --git a/src/w32fns.c b/src/w32fns.c
index aa120d59ce5..d598d66b3a5 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6151,9 +6151,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);
@@ -6254,7 +6254,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