diff options
| author | Jan D | 2010-08-16 10:03:27 +0200 |
|---|---|---|
| committer | Jan D | 2010-08-16 10:03:27 +0200 |
| commit | 921242c6f478be3c024935587877f9b6602b1c19 (patch) | |
| tree | af43351ae37a16dc3d92469e5834913cda7b35a8 /src | |
| parent | e45a249b8a63188dd59176ceba94455d8dac4d9c (diff) | |
| download | emacs-921242c6f478be3c024935587877f9b6602b1c19.tar.gz emacs-921242c6f478be3c024935587877f9b6602b1c19.zip | |
nsselect.m: include keyboard.h for QPRIMARY, remove its declaration (Bug#6863).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/nsselect.m | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 901adadda06..3feeb5c9a72 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-08-16 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2010-08-16 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * nsselect.m: include keyboard.h for QPRIMARY, remove its | ||
| 4 | declaration (Bug#6863). | ||
| 5 | |||
| 3 | * xselect.c: Remove declaration of QPRIMARY (Bug#6864). | 6 | * xselect.c: Remove declaration of QPRIMARY (Bug#6864). |
| 4 | 7 | ||
| 5 | * keyboard.h (QPRIMARY): Declare (Bug#6864). | 8 | * keyboard.h (QPRIMARY): Declare (Bug#6864). |
diff --git a/src/nsselect.m b/src/nsselect.m index 23dede9c38e..fb1998a9799 100644 --- a/src/nsselect.m +++ b/src/nsselect.m | |||
| @@ -33,10 +33,11 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) | |||
| 33 | #include "lisp.h" | 33 | #include "lisp.h" |
| 34 | #include "nsterm.h" | 34 | #include "nsterm.h" |
| 35 | #include "termhooks.h" | 35 | #include "termhooks.h" |
| 36 | #include "keyboard.h" | ||
| 36 | 37 | ||
| 37 | #define CUT_BUFFER_SUPPORT | 38 | #define CUT_BUFFER_SUPPORT |
| 38 | 39 | ||
| 39 | Lisp_Object QPRIMARY, QSECONDARY, QTEXT, QFILE_NAME; | 40 | Lisp_Object QSECONDARY, QTEXT, QFILE_NAME; |
| 40 | 41 | ||
| 41 | static Lisp_Object Vns_sent_selection_hooks; | 42 | static Lisp_Object Vns_sent_selection_hooks; |
| 42 | static Lisp_Object Vns_lost_selection_hooks; | 43 | static Lisp_Object Vns_lost_selection_hooks; |