[Emacs-diffs] /srv/bzr/emacs/trunk r101097: nsselect.m: include keyboard.h for QPRIMARY, remove its declaration (Bug#6863).

[Jan D]

------------------------------------------------------------
revno: 101097
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Mon 2010-08-16 10:03:27 +0200
message:
  nsselect.m: include keyboard.h for QPRIMARY, remove its declaration 
(Bug#6863).
modified:
  src/ChangeLog
  src/nsselect.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-16 07:52:32 +0000
+++ b/src/ChangeLog     2010-08-16 08:03:27 +0000
@@ -1,5 +1,8 @@
 2010-08-16  Jan Djärv  <address@hidden>
 
+       * nsselect.m: include keyboard.h for QPRIMARY, remove its
+       declaration (Bug#6863).
+
        * xselect.c: Remove declaration of QPRIMARY (Bug#6864).
 
        * keyboard.h (QPRIMARY): Declare (Bug#6864).

=== modified file 'src/nsselect.m'
--- a/src/nsselect.m    2010-07-08 21:25:08 +0000
+++ b/src/nsselect.m    2010-08-16 08:03:27 +0000
@@ -33,10 +33,11 @@
 #include "lisp.h"
 #include "nsterm.h"
 #include "termhooks.h"
+#include "keyboard.h"
 
 #define CUT_BUFFER_SUPPORT
 
-Lisp_Object QPRIMARY, QSECONDARY, QTEXT, QFILE_NAME;
+Lisp_Object QSECONDARY, QTEXT, QFILE_NAME;
 
 static Lisp_Object Vns_sent_selection_hooks;
 static Lisp_Object Vns_lost_selection_hooks;