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/xselect.c | |
| 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/xselect.c')
| -rw-r--r-- | src/xselect.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); | |||
| 107 | 107 | ||
| 108 | #define CUT_BUFFER_SUPPORT | 108 | #define CUT_BUFFER_SUPPORT |
| 109 | 109 | ||
| 110 | Lisp_Object QPRIMARY, QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, | 110 | Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, |
| 111 | QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL, | 111 | QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL, |
| 112 | QATOM_PAIR; | 112 | QATOM_PAIR; |
| 113 | 113 | ||