Commit e45a249b authored by Jan Djärv's avatar Jan Djärv
Browse files

Don't define QPRIMARY twice.

* keyboard.h (QPRIMARY): Declare (Bug#6864).

* xselect.c: Remove declaration of QPRIMARY (Bug#6864).
parent 8f10c937
2010-08-16 Jan Djärv <jan.h.d@swipnet.se>
* xselect.c: Remove declaration of QPRIMARY (Bug#6864).
* keyboard.h (QPRIMARY): Declare (Bug#6864).
2010-08-16 Chong Yidong <cyd@stupidchicken.com>
 
* keyboard.c (command_loop_1): Avoid setting selection twice,
......
......@@ -440,6 +440,9 @@ extern int ignore_mouse_drag_p;
extern Lisp_Object Vdouble_click_time;
/* The primary selection. */
extern Lisp_Object QPRIMARY;
/* Forward declaration for prototypes. */
struct input_event;
......
......@@ -107,7 +107,7 @@ static void initialize_cut_buffers (Display *, Window);
#define CUT_BUFFER_SUPPORT
Lisp_Object QPRIMARY, QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP,
Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP,
QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL,
QATOM_PAIR;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment