diff options
| author | Miles Bader | 2006-10-15 02:54:13 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-10-15 02:54:13 +0000 |
| commit | bb9c4b4f8b3dcd1b5fc96d2d0275cc532832fbd6 (patch) | |
| tree | 8c4ae9640abcb8f33326e96e661f711417e5307c /src/eval.c | |
| parent | 5be4d5336db8be316100a5b80ee8c5e428438b9e (diff) | |
| parent | 92edaeeda5c362acf2c7e7f72b3666ab7673699a (diff) | |
| download | emacs-bb9c4b4f8b3dcd1b5fc96d2d0275cc532832fbd6.tar.gz emacs-bb9c4b4f8b3dcd1b5fc96d2d0275cc532832fbd6.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 460-475)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 145-152)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-118
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index dbd30eac201..4e04422d2d6 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -28,6 +28,10 @@ Boston, MA 02110-1301, USA. */ | |||
| 28 | #include "dispextern.h" | 28 | #include "dispextern.h" |
| 29 | #include <setjmp.h> | 29 | #include <setjmp.h> |
| 30 | 30 | ||
| 31 | #if HAVE_X_WINDOWS | ||
| 32 | #include "xterm.h" | ||
| 33 | #endif | ||
| 34 | |||
| 31 | /* This definition is duplicated in alloc.c and keyboard.c */ | 35 | /* This definition is duplicated in alloc.c and keyboard.c */ |
| 32 | /* Putting it in lisp.h makes cc bomb out! */ | 36 | /* Putting it in lisp.h makes cc bomb out! */ |
| 33 | 37 | ||