diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/eval.c | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index aa603feab4..0c9e2272ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2006-10-10 Stefan Monnier <[email protected]> + * eval.c: Include xterm.h for x_fully_uncatch_errors and friends. + + * dispextern.h: Declare x_create_bitmap_from_xpm_data. + + * xterm.c (x_check_expected_move): Remove unused var `count'. + * xmenu.c (syms_of_xmenu): Use Ffset rather than Fdefalias, since Fdefalias is not declared in any *.h file. @@ -1540,7 +1546,7 @@ (x_set_offset, x_check_fullscreen): Extensive changes to make frame positioning deterministic under X. - * xterm.h (x_output): Added members left_before_move and + * xterm.h (x_output): Add members left_before_move and top_before_move. Removed members expected_left and expected_top. 2006-06-16 Kim F. Storm <[email protected]> diff --git a/src/eval.c b/src/eval.c index dbd30eac20..4e04422d2d 100644 --- a/src/eval.c +++ b/src/eval.c @@ -28,6 +28,10 @@ Boston, MA 02110-1301, USA. */ #include "dispextern.h" #include <setjmp.h> +#if HAVE_X_WINDOWS +#include "xterm.h" +#endif + /* This definition is duplicated in alloc.c and keyboard.c */ /* Putting it in lisp.h makes cc bomb out! */ |