From e45a249b8a63188dd59176ceba94455d8dac4d9c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 16 Aug 2010 09:52:32 +0200 Subject: [PATCH] Don't define QPRIMARY twice. * keyboard.h (QPRIMARY): Declare (Bug#6864). * xselect.c: Remove declaration of QPRIMARY (Bug#6864). --- src/ChangeLog | 6 ++++++ src/keyboard.h | 3 +++ src/xselect.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index e5bb506931d..901adadda06 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-08-16 Jan Djärv + + * xselect.c: Remove declaration of QPRIMARY (Bug#6864). + + * keyboard.h (QPRIMARY): Declare (Bug#6864). + 2010-08-16 Chong Yidong * keyboard.c (command_loop_1): Avoid setting selection twice, diff --git a/src/keyboard.h b/src/keyboard.h index 4eb0b654703..a3bb46f4454 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -440,6 +440,9 @@ extern int ignore_mouse_drag_p; extern Lisp_Object Vdouble_click_time; +/* The primary selection. */ +extern Lisp_Object QPRIMARY; + /* Forward declaration for prototypes. */ struct input_event; diff --git a/src/xselect.c b/src/xselect.c index b4b2ab22d6c..21684c83088 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -107,7 +107,7 @@ static void initialize_cut_buffers (Display *, Window); #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; -- 2.39.2