diff options
| author | Jan Djärv | 2010-08-16 09:52:32 +0200 |
|---|---|---|
| committer | Jan Djärv | 2010-08-16 09:52:32 +0200 |
| commit | e45a249b8a63188dd59176ceba94455d8dac4d9c (patch) | |
| tree | 7b1f14963fbdf1e54b1222134642ab61b516f528 /src/keyboard.h | |
| parent | 8f10c937124072c04a70664204a1846cf24ecc0d (diff) | |
| download | emacs-e45a249b8a63188dd59176ceba94455d8dac4d9c.tar.gz emacs-e45a249b8a63188dd59176ceba94455d8dac4d9c.zip | |
Don't define QPRIMARY twice.
* keyboard.h (QPRIMARY): Declare (Bug#6864).
* xselect.c: Remove declaration of QPRIMARY (Bug#6864).
Diffstat (limited to 'src/keyboard.h')
| -rw-r--r-- | src/keyboard.h | 3 |
1 files changed, 3 insertions, 0 deletions
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; | |||
| 440 | 440 | ||
| 441 | extern Lisp_Object Vdouble_click_time; | 441 | extern Lisp_Object Vdouble_click_time; |
| 442 | 442 | ||
| 443 | /* The primary selection. */ | ||
| 444 | extern Lisp_Object QPRIMARY; | ||
| 445 | |||
| 443 | /* Forward declaration for prototypes. */ | 446 | /* Forward declaration for prototypes. */ |
| 444 | struct input_event; | 447 | struct input_event; |
| 445 | 448 | ||