diff options
| author | Daniel Colascione | 2013-03-10 14:55:25 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2013-03-10 14:55:25 -0800 |
| commit | 819e2da92a18d7af03ccd9cf0a2e5b940eb7b54f (patch) | |
| tree | 99d41020f39fd757e30622c6437e99902785a371 /src/coding.h | |
| parent | d2e24f924a37982172ec0708369570a0af315c7e (diff) | |
| download | emacs-819e2da92a18d7af03ccd9cf0a2e5b940eb7b54f.tar.gz emacs-819e2da92a18d7af03ccd9cf0a2e5b940eb7b54f.zip | |
2013-03-10 Daniel Colascione <dancol@dancol.org>
* w32term.h (GUISTR, GUI_ENCODE_FILE, GUI_ENCODE_SYSTEM, GUI_FN)
(GUI_SDATA, guichar_t): Macros to abstract out differences between
NTGUI_UNICODE and !NTGUI_UNICODE builds, some moved out of
w32fns.c.
* w32term.c (construct_drag_n_drop): Use the above macros to make
drag-and-drop work for non-ASCII filenames in cygw32 builds.
* w32fns.c (x_set_name, x_set_title): Use the above macros to
properly display non-ASCII frame titles in cygw32 builds.
* w32fns.c (Fw32_shell_execute): Use the above macros to properly
call ShellExecute in cygw32 builds.
* w32fn.c (Fx_file_dialog): Use the above macros to simplify the
common file dialog code.
* w32fns.c (Ffile_system_info): Remove from cygw32 builds, which
can just use du like other systems.
* coding.c (from_unicode_buffer): Declare.
* coding.c (from_unicode_buffer): Implement.
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/coding.h b/src/coding.h index 28a7d776b63..c13567c3d53 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -715,6 +715,9 @@ extern wchar_t *to_unicode (Lisp_Object str, Lisp_Object *buf); | |||
| 715 | failure modes. STR itself is not modified. */ | 715 | failure modes. STR itself is not modified. */ |
| 716 | extern Lisp_Object from_unicode (Lisp_Object str); | 716 | extern Lisp_Object from_unicode (Lisp_Object str); |
| 717 | 717 | ||
| 718 | /* Convert WSTR to an Emacs string. */ | ||
| 719 | extern Lisp_Object from_unicode_buffer (const wchar_t* wstr); | ||
| 720 | |||
| 718 | #endif /* WINDOWSNT || CYGWIN */ | 721 | #endif /* WINDOWSNT || CYGWIN */ |
| 719 | 722 | ||
| 720 | /* Macros for backward compatibility. */ | 723 | /* Macros for backward compatibility. */ |