Don't define QPRIMARY twice.

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

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

diff --git a/src/ChangeLog b/src/ChangeLog
index e5bb506931dafd81fd46f0c8a2b004e71f6e654f..901adadda0678096c61f60b5b4194f814db8ff7b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/keyboard.h b/src/keyboard.h
index 4eb0b654703264d557cdc83ba90b1c3642fa30e0..a3bb46f4454c5bfb275834594d1e5e421c7c6a46 100644 (file)
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -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;
 

diff --git a/src/xselect.c b/src/xselect.c
index b4b2ab22d6c1ce6255dcb7d19f75fba1c3f905de..21684c83088b84b2af0c0a19f7c7329615e639e2 100644 (file)
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -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;