mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-07 12:20:39 -08:00
Code Issues Projects Releases Wiki Activity

2013-03-10 Daniel Colascione <dancol@dancol.org>

Browse source 
* 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.
This commit is contained in:
Daniel Colascione 2013-03-10 14:55:25 -08:00
parent d2e24f924a
commit 819e2da92a
6 changed files with 114 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/coding.c
View file

@ -286,6 +286,10 @@ encode_coding_XXX (struct coding_system *coding)
#include <config.h>
#include <stdio.h>
#ifdef HAVE_WCHAR_H
#include <wchar.h>
#endif /* HAVE_WCHAR_H */
#include "lisp.h"
#include "character.h"
#include "buffer.h"
@ -8003,6 +8007,16 @@ from_unicode (Lisp_Object str)
return code_convert_string_norecord (str, Qutf_16le, 0);
}
Lisp_Object
from_unicode_buffer (const wchar_t* wstr)
{
return from_unicode (
make_unibyte_string (
(char*) wstr,
/* we get one of the two final 0 bytes for free. */
1 + sizeof (wchar_t) * wcslen (wstr)));
}
wchar_t *
to_unicode (Lisp_Object str, Lisp_Object *buf)
{