# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1281945152 -7200
# Node ID 25de0a80ce75908cab95ee18f32f13e43ca4120e
# Parent  2e3c8eb668bafc74ce5808f88d4376c295edeb71
Don't define QPRIMARY twice.

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

* xselect.c: Remove declaration of QPRIMARY (Bug#6864).

diff -r 2e3c8eb668ba -r 25de0a80ce75 src/ChangeLog
--- a/src/ChangeLog	Sun Aug 15 23:34:10 2010 -0400
+++ b/src/ChangeLog	Mon Aug 16 09:52:32 2010 +0200
@@ -1,3 +1,9 @@
+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,
diff -r 2e3c8eb668ba -r 25de0a80ce75 src/keyboard.h
--- a/src/keyboard.h	Sun Aug 15 23:34:10 2010 -0400
+++ b/src/keyboard.h	Mon Aug 16 09:52:32 2010 +0200
@@ -440,6 +440,9 @@
 
 extern Lisp_Object Vdouble_click_time;
 
+/* The primary selection.  */
+extern Lisp_Object QPRIMARY;
+
 /* Forward declaration for prototypes.  */
 struct input_event;
 
diff -r 2e3c8eb668ba -r 25de0a80ce75 src/xselect.c
--- a/src/xselect.c	Sun Aug 15 23:34:10 2010 -0400
+++ b/src/xselect.c	Mon Aug 16 09:52:32 2010 +0200
@@ -107,7 +107,7 @@
 
 #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;