[Emacs-diffs] /srv/bzr/emacs/trunk r101096: Don't define QPRIMARY twice.

[Jan D.]

------------------------------------------------------------
revno: 101096
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Mon 2010-08-16 09:52:32 +0200
message:
  Don't define QPRIMARY twice.
  
  * keyboard.h (QPRIMARY): Declare (Bug#6864).
  
  * xselect.c: Remove declaration of QPRIMARY (Bug#6864).
modified:
  src/ChangeLog
  src/keyboard.h
  src/xselect.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-16 02:33:17 +0000
+++ b/src/ChangeLog     2010-08-16 07:52:32 +0000
@@ -1,3 +1,9 @@
+2010-08-16  Jan Djärv  <address@hidden>
+
+       * xselect.c: Remove declaration of QPRIMARY (Bug#6864).
+
+       * keyboard.h (QPRIMARY): Declare (Bug#6864).
+
 2010-08-16  Chong Yidong  <address@hidden>
 
        * keyboard.c (command_loop_1): Avoid setting selection twice,

=== modified file 'src/keyboard.h'
--- a/src/keyboard.h    2010-08-11 12:34:46 +0000
+++ b/src/keyboard.h    2010-08-16 07:52:32 +0000
@@ -440,6 +440,9 @@
 
 extern Lisp_Object Vdouble_click_time;
 
+/* The primary selection.  */
+extern Lisp_Object QPRIMARY;
+
 /* Forward declaration for prototypes.  */
 struct input_event;
 

=== modified file 'src/xselect.c'
--- a/src/xselect.c     2010-08-11 12:34:46 +0000
+++ b/src/xselect.c     2010-08-16 07:52:32 +0000
@@ -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;