HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use dynwind_begin and dynwind_end
[bpt/emacs.git]
/
src
/
cygw32.c
diff --git
a/src/cygw32.c
b/src/cygw32.c
index
3e0f4ae
..
9808cc6
100644
(file)
--- a/
src/cygw32.c
+++ b/
src/cygw32.c
@@
-1,5
+1,5
@@
/* Cygwin support routines.
/* Cygwin support routines.
- Copyright (C) 2011-201
3
Free Software Foundation, Inc.
+ Copyright (C) 2011-201
4
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-56,7
+56,7
@@
conv_filename_to_w32_unicode (Lisp_Object in, int absolute_p)
ssize_t converted_len;
Lisp_Object converted;
unsigned flags;
ssize_t converted_len;
Lisp_Object converted;
unsigned flags;
-
int count = SPECPDL_INDEX
();
+
dynwind_begin
();
chdir_to_default_directory ();
chdir_to_default_directory ();
@@
-76,7
+76,8
@@
conv_filename_to_w32_unicode (Lisp_Object in, int absolute_p)
SDATA (converted), converted_len))
error ("cygwin_conv_path: %s", strerror (errno));
SDATA (converted), converted_len))
error ("cygwin_conv_path: %s", strerror (errno));
- return unbind_to (count, converted);
+ dynwind_end ();
+ return converted;
}
static Lisp_Object
}
static Lisp_Object
@@
-85,7
+86,7
@@
conv_filename_from_w32_unicode (const wchar_t* in, int absolute_p)
ssize_t converted_len;
Lisp_Object converted;
unsigned flags;
ssize_t converted_len;
Lisp_Object converted;
unsigned flags;
-
int count = SPECPDL_INDEX
();
+
dynwind_begin
();
chdir_to_default_directory ();
chdir_to_default_directory ();
@@
-102,7
+103,9
@@
conv_filename_from_w32_unicode (const wchar_t* in, int absolute_p)
if (cygwin_conv_path (flags, in, SDATA (converted), converted_len))
error ("cygwin_conv_path: %s", strerror (errno));
if (cygwin_conv_path (flags, in, SDATA (converted), converted_len))
error ("cygwin_conv_path: %s", strerror (errno));
- return unbind_to (count, DECODE_FILE (converted));
+ Lisp_Object tem0 = DECODE_FILE (converted);
+ dynwind_end ();
+ return tem0;
}
DEFUN ("cygwin-convert-file-name-to-windows",
}
DEFUN ("cygwin-convert-file-name-to-windows",
@@
-134,6
+137,5
@@
For the reverse operation, see `cygwin-convert-file-name-to-windows'. */)
void
syms_of_cygw32 (void)
{
void
syms_of_cygw32 (void)
{
- defsubr (&Scygwin_convert_file_name_from_windows);
- defsubr (&Scygwin_convert_file_name_to_windows);
+#include "cygw32.x"
}
}