]> git.eshelyaron.com Git - emacs.git/commitdiff
nsselect.m: include keyboard.h for QPRIMARY, remove its declaration (Bug#6863).
authorJan D <jan.h.d@swipnet.se>
Mon, 16 Aug 2010 08:03:27 +0000 (10:03 +0200)
committerJan D <jan.h.d@swipnet.se>
Mon, 16 Aug 2010 08:03:27 +0000 (10:03 +0200)
src/ChangeLog
src/nsselect.m

index 901adadda0678096c61f60b5b4194f814db8ff7b..3feeb5c9a724eecc2eb172ff69d42e43fff1e219 100644 (file)
@@ -1,5 +1,8 @@
 2010-08-16  Jan Djärv  <jan.h.d@swipnet.se>
 
+       * 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).
index 23dede9c38e3222a129dad4a9f80d5e349ae83c0..fb1998a9799b3e3412ec81f85b1101b5088f53d2 100644 (file)
@@ -33,10 +33,11 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
 #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;