diff options
| author | Karoly Lorentey | 2004-10-19 17:00:02 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-10-19 17:00:02 +0000 |
| commit | 90b404757b24ea0c88d6ec3ed9c1ccce07bbd19f (patch) | |
| tree | b5cb05f7c5d0c27537362072badf76355d363319 /src/xterm.h | |
| parent | ec16044407f468aacda9eb031fb7267d5ee0f899 (diff) | |
| parent | d4c2c0eff81e7540cbb0a32ef10017285f68e1aa (diff) | |
| download | emacs-90b404757b24ea0c88d6ec3ed9c1ccce07bbd19f.tar.gz emacs-90b404757b24ea0c88d6ec3ed9c1ccce07bbd19f.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-616
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-617
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-618
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-619
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-620
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-621
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-622
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-623
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-624
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-625
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-51
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-52
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-53
Merge from emacs--cvs-trunk--0
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-261
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/xterm.h b/src/xterm.h index 53f0081b215..bb1fe9ddc4c 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -21,8 +21,13 @@ Boston, MA 02111-1307, USA. */ | |||
| 21 | 21 | ||
| 22 | #include <X11/Xlib.h> | 22 | #include <X11/Xlib.h> |
| 23 | #include <X11/cursorfont.h> | 23 | #include <X11/cursorfont.h> |
| 24 | |||
| 25 | /* Include Xutil.h after keysym.h to work around a bug that prevents | ||
| 26 | correct recognition of AltGr key in some X versions. */ | ||
| 27 | |||
| 24 | #include <X11/keysym.h> | 28 | #include <X11/keysym.h> |
| 25 | #include <X11/Xutil.h> | 29 | #include <X11/Xutil.h> |
| 30 | |||
| 26 | #include <X11/Xatom.h> | 31 | #include <X11/Xatom.h> |
| 27 | #include <X11/Xresource.h> | 32 | #include <X11/Xresource.h> |
| 28 | 33 | ||