X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/2c82deee7fbb951a90ed3246350fbf9390af038a..0a2aedfe6d650e825a50f25f972bac20d669f5cb:/src/w32select.c?ds=sidebyside
diff --git a/src/w32select.c b/src/w32select.c
index 3c554c622a..a38a42ca05 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -1,13 +1,13 @@
/* Selection processing for Emacs on the Microsoft Windows API.
-Copyright (C) 1993-1994, 2001-2015 Free Software Foundation, Inc.
+Copyright (C) 1993-1994, 2001-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -76,11 +76,10 @@ along with GNU Emacs. If not, see . */
#include "lisp.h"
#include "w32common.h" /* os_subtype */
#include "w32term.h" /* for all of the w32 includes */
-#include "keyboard.h"
+#include "w32select.h"
+#include "keyboard.h" /* for waiting_for_input */
#include "blockinput.h"
-#include "charset.h"
#include "coding.h"
-#include "composite.h"
#ifdef CYGWIN
#include
@@ -258,7 +257,7 @@ render (Lisp_Object oformat)
switch (format)
{
case CF_UNICODETEXT:
- htext = convert_to_handle_as_coded (QUNICODE);
+ htext = convert_to_handle_as_coded (Qutf_16le_dos);
break;
case CF_TEXT:
case CF_OEMTEXT:
@@ -513,7 +512,7 @@ setup_config (void)
cfg_clipboard_type = CF_TEXT;
/* Interpret the coding system symbol name */
- coding_name = SDATA (SYMBOL_NAME (cfg_coding_system));
+ coding_name = SSDATA (SYMBOL_NAME (cfg_coding_system));
/* "(.*-)?utf-16.*" -> CF_UNICODETEXT */
cp = strstr (coding_name, "utf-16");
@@ -857,7 +856,7 @@ DEFUN ("w32-get-clipboard-data", Fw32_get_clipboard_data,
{
int i;
- nbytes = strlen (src);
+ nbytes = strlen ((char *)src);
for (i = 0; i < nbytes; i++)
{
@@ -1111,7 +1110,7 @@ After the communication, this variable is set to nil. */);
current_text = Qnil; staticpro (¤t_text);
current_coding_system = Qnil; staticpro (¤t_coding_system);
- DEFSYM (QUNICODE, "utf-16le-dos");
+ DEFSYM (Qutf_16le_dos, "utf-16le-dos");
QANSICP = Qnil; staticpro (&QANSICP);
QOEMCP = Qnil; staticpro (&QOEMCP);
}
@@ -1134,7 +1133,7 @@ globals_of_w32select (void)
QOEMCP = coding_from_cp (OEMCP);
if (os_subtype == OS_NT)
- Vselection_coding_system = QUNICODE;
+ Vselection_coding_system = Qutf_16le_dos;
else if (inhibit_window_system)
Vselection_coding_system = QOEMCP;
else