Mercurial > emacs
changeset 109805:8d09f7d877e7
nsselect.m: include keyboard.h for QPRIMARY, remove its declaration (Bug#6863).
| author | Jan D <jan.h.d@swipnet.se> |
|---|---|
| date | Mon, 16 Aug 2010 10:03:27 +0200 |
| parents | 25de0a80ce75 |
| children | e4d8eb8030c0 |
| files | src/ChangeLog src/nsselect.m |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Aug 16 09:52:32 2010 +0200 +++ b/src/ChangeLog Mon Aug 16 10:03:27 2010 +0200 @@ -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).
--- a/src/nsselect.m Mon Aug 16 09:52:32 2010 +0200 +++ b/src/nsselect.m Mon Aug 16 10:03:27 2010 +0200 @@ -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;