mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-26 07:00:35 -08:00
Code Issues Projects Releases Wiki Activity

Don't define QPRIMARY twice.

Browse source 
* keyboard.h (QPRIMARY): Declare (Bug#6864).

* xselect.c: Remove declaration of QPRIMARY (Bug#6864).
This commit is contained in:
Jan Djärv 2010-08-16 09:52:32 +02:00
parent 8f10c93712
commit e45a249b8a
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -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,

3
src/keyboard.h
View file

@ -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;

2
src/xselect.c
View file

@ -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;