HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* chartab.c (ASET_RANGE, GET_SUB_CHAR_TABLE): Remove unused macros.
[bpt/emacs.git]
/
src
/
w32select.c
diff --git
a/src/w32select.c
b/src/w32select.c
index
18694d2
..
23d5fb6
100644
(file)
--- a/
src/w32select.c
+++ b/
src/w32select.c
@@
-1,7
+1,6
@@
/* Selection processing for Emacs on the Microsoft W32 API.
/* Selection processing for Emacs on the Microsoft W32 API.
-Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 1993-1994, 2001-2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-111,13
+110,6
@@
static void setup_windows_coding_system (Lisp_Object coding_system,
PRIMARY and SECONDARY. */
Lisp_Object QCLIPBOARD;
PRIMARY and SECONDARY. */
Lisp_Object QCLIPBOARD;
-/* Coding system for communicating with other programs via the
- clipboard. */
-static Lisp_Object Vselection_coding_system;
-
-/* Coding system for the next communication with other programs. */
-static Lisp_Object Vnext_selection_coding_system;
-
/* Internal pseudo-constants, initialized in globals_of_w32select()
based on current system parameters. */
static LCID DEFAULT_LCID;
/* Internal pseudo-constants, initialized in globals_of_w32select()
based on current system parameters. */
static LCID DEFAULT_LCID;
@@
-1068,7
+1060,7
@@
syms_of_w32select (void)
defsubr (&Sw32_get_clipboard_data);
defsubr (&Sx_selection_exists_p);
defsubr (&Sw32_get_clipboard_data);
defsubr (&Sx_selection_exists_p);
- DEFVAR_LISP ("selection-coding-system",
&
Vselection_coding_system,
+ DEFVAR_LISP ("selection-coding-system", Vselection_coding_system,
doc: /* Coding system for communicating with other programs.
For MS-Windows and MS-DOS:
doc: /* Coding system for communicating with other programs.
For MS-Windows and MS-DOS:
@@
-1102,7
+1094,7
@@
The default value is nil. */);
below. */
Vselection_coding_system = Qnil;
below. */
Vselection_coding_system = Qnil;
- DEFVAR_LISP ("next-selection-coding-system",
&
Vnext_selection_coding_system,
+ DEFVAR_LISP ("next-selection-coding-system", Vnext_selection_coding_system,
doc: /* Coding system for the next communication with other programs.
Usually, `selection-coding-system' is used for communicating with
other programs (X Windows clients or MS Windows programs). But, if this
doc: /* Coding system for the next communication with other programs.
Usually, `selection-coding-system' is used for communicating with
other programs (X Windows clients or MS Windows programs). But, if this