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/ChangeLog | |
| 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/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e5bb506931d..901adadda06 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2010-08-16 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * xselect.c: Remove declaration of QPRIMARY (Bug#6864). | ||
| 4 | |||
| 5 | * keyboard.h (QPRIMARY): Declare (Bug#6864). | ||
| 6 | |||
| 1 | 2010-08-16 Chong Yidong <cyd@stupidchicken.com> | 7 | 2010-08-16 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 8 | ||
| 3 | * keyboard.c (command_loop_1): Avoid setting selection twice, | 9 | * keyboard.c (command_loop_1): Avoid setting selection twice, |