Mercurial > emacs
changeset 109804:25de0a80ce75
Don't define QPRIMARY twice.
* keyboard.h (QPRIMARY): Declare (Bug#6864).
* xselect.c: Remove declaration of QPRIMARY (Bug#6864).
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Mon, 16 Aug 2010 09:52:32 +0200 |
| parents | 2e3c8eb668ba |
| children | 8d09f7d877e7 |
| files | src/ChangeLog src/keyboard.h src/xselect.c |
| diffstat | 3 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Aug 15 23:34:10 2010 -0400 +++ b/src/ChangeLog Mon Aug 16 09:52:32 2010 +0200 @@ -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,
--- a/src/keyboard.h Sun Aug 15 23:34:10 2010 -0400 +++ b/src/keyboard.h Mon Aug 16 09:52:32 2010 +0200 @@ -440,6 +440,9 @@ extern Lisp_Object Vdouble_click_time; +/* The primary selection. */ +extern Lisp_Object QPRIMARY; + /* Forward declaration for prototypes. */ struct input_event;
--- a/src/xselect.c Sun Aug 15 23:34:10 2010 -0400 +++ b/src/xselect.c Mon Aug 16 09:52:32 2010 +0200 @@ -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;