summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorDaniel Colascione <dancol@dancol.org>2012-11-18 17:39:37 -0800
committerDaniel Colascione <dancol@dancol.org>2012-11-18 17:39:37 -0800
commit6e9f7997b36d21004794fa2b8a550729cbabd81a (patch)
tree593f2e582974d5fd2157204f1fa6eeef425a2f55 /lisp
parent031b541f1943a49ee06944cc5957dab3f7baedf9 (diff)
downloademacs-6e9f7997b36d21004794fa2b8a550729cbabd81a.tar.gz
Rename cygwin_convert_path* to cygwin_convert_file_name*
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term/w32-win.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca65e431964..26b4e6bb8c7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 42e09b65750..95dab10101b 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -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)))