diff options
| author | Stefan Monnier | 2006-01-23 22:08:13 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2006-01-23 22:08:13 +0000 |
| commit | e5e26d8f7df1d5a8b4b2c431015f202324f3ec3b (patch) | |
| tree | eb83600ae731319bce2a3d46a9d71527311e27d4 /src | |
| parent | 1e3b6bec727d28a561c86945a018416dd99fe2e2 (diff) | |
| download | emacs-e5e26d8f7df1d5a8b4b2c431015f202324f3ec3b.tar.gz emacs-e5e26d8f7df1d5a8b4b2c431015f202324f3ec3b.zip | |
(x_catch_errors_unwind): Yet another int/Lisp_Object mixup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xterm.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 66dcf16adb9..7a652d04049 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-01-23 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * xterm.c (x_catch_errors_unwind): Yet another int/Lisp_Object mixup. | ||
| 4 | |||
| 1 | 2006-01-23 Kim F. Storm <storm@cua.dk> | 5 | 2006-01-23 Kim F. Storm <storm@cua.dk> |
| 2 | 6 | ||
| 3 | * xdisp.c (handle_single_display_spec): Fix handling of space | 7 | * xdisp.c (handle_single_display_spec): Fix handling of space |
diff --git a/src/xterm.c b/src/xterm.c index 9b19dbb0f5e..114a7f12459 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -7543,7 +7543,8 @@ x_catch_errors_unwind (dummy) | |||
| 7543 | x_error_message = x_error_message->prev; | 7543 | x_error_message = x_error_message->prev; |
| 7544 | free (tmp); | 7544 | free (tmp); |
| 7545 | 7545 | ||
| 7546 | eassert (dummy == make_number ((EMACS_INT)dpy + (EMACS_INT)x_error_message)); | 7546 | eassert (EQ (dummy, |
| 7547 | make_number ((EMACS_INT)dpy + (EMACS_INT)x_error_message))); | ||
| 7547 | 7548 | ||
| 7548 | return Qnil; | 7549 | return Qnil; |
| 7549 | } | 7550 | } |