Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
6e9f7997
Commit
6e9f7997
authored
Nov 18, 2012
by
Daniel Colascione
Browse files
Rename cygwin_convert_path* to cygwin_convert_file_name*
parent
031b541f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
17 deletions
+34
-17
etc/NEWS
etc/NEWS
+4
-3
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/term/w32-win.el
lisp/term/w32-win.el
+2
-2
src/ChangeLog
src/ChangeLog
+9
-0
src/cygw32.c
src/cygw32.c
+11
-9
src/w32fns.c
src/w32fns.c
+3
-3
No files found.
etc/NEWS
View file @
6e9f7997
...
...
@@ -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
...
...
lisp/ChangeLog
View file @
6e9f7997
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.
...
...
lisp/term/w32-win.el
View file @
6e9f7997
...
...
@@ -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
)))
...
...
src/ChangeLog
View file @
6e9f7997
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.
...
...
src/cygw32.c
View file @
6e9f7997
...
...
@@ -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 i
f
non-nil, return an absolute path.*/
)
doc
:
/* Convert PATH to a Windows path. If ABSOLUTE-P i
s
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
);
}
src/w32fns.c
View file @
6e9f7997
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment