Mercurial > emacs
changeset 29717:acaa36b47f50
fix up more Lisp_Object/int conversion issues
| author | Ken Raeburn <raeburn@raeburn.org> |
|---|---|
| date | Sun, 18 Jun 2000 20:14:37 +0000 |
| parents | 8797e25c4231 |
| children | 2cb352360679 |
| files | src/ChangeLog src/charset.c src/coding.h src/keyboard.c src/sound.c src/xterm.c |
| diffstat | 6 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/charset.c Sun Jun 18 20:14:35 2000 +0000 +++ b/src/charset.c Sun Jun 18 20:14:37 2000 +0000 @@ -562,7 +562,7 @@ } /* Update table iso_charset_table. */ - if (iso_final_char >= 0 + if (XINT (iso_final_char) >= 0 && ISO_CHARSET_TABLE (dimension, chars, iso_final_char) < 0) ISO_CHARSET_TABLE (dimension, chars, iso_final_char) = charset; }
--- a/src/coding.h Sun Jun 18 20:14:35 2000 +0000 +++ b/src/coding.h Sun Jun 18 20:14:37 2000 +0000 @@ -636,6 +636,8 @@ extern Lisp_Object code_convert_string_norecord P_ ((Lisp_Object, Lisp_Object, int)); extern void setup_raw_text_coding_system P_ ((struct coding_system *)); +extern Lisp_Object encode_coding_string P_ ((Lisp_Object, + struct coding_system *, int)); extern Lisp_Object Qcoding_system, Qeol_type, Qcoding_category_index; extern Lisp_Object Qraw_text, Qemacs_mule; extern Lisp_Object Qbuffer_file_coding_system;
--- a/src/keyboard.c Sun Jun 18 20:14:35 2000 +0000 +++ b/src/keyboard.c Sun Jun 18 20:14:37 2000 +0000 @@ -7974,7 +7974,8 @@ string = POSN_STRING (EVENT_START (key)); pos = XCDR (string); string = XCAR (string); - if (pos >= 0 && pos < XSTRING (string)->size) + if (XINT (pos) >= 0 + && XINT (pos) < XSTRING (string)->size) { map = Fget_text_property (pos, Qlocal_map, string); if (!NILP (map))
--- a/src/sound.c Sun Jun 18 20:14:35 2000 +0000 +++ b/src/sound.c Sun Jun 18 20:14:37 2000 +0000 @@ -435,7 +435,7 @@ args[0] = Qplay_sound_functions; args[1] = sound; - Frun_hook_with_args (make_number (2), args); + Frun_hook_with_args (2, args); /* There is only one type of device we currently support, the VOX sound driver. Set up the device interface functions for that
--- a/src/xterm.c Sun Jun 18 20:14:35 2000 +0000 +++ b/src/xterm.c Sun Jun 18 20:14:37 2000 +0000 @@ -7445,7 +7445,7 @@ ev->display = FRAME_X_DISPLAY (f); ev->window = FRAME_X_WINDOW (f); ev->format = 32; - ev->data.l[0] = (long) window; + ev->data.l[0] = (long) XFASTINT (window); ev->data.l[1] = (long) part; ev->data.l[2] = (long) 0; ev->data.l[3] = (long) portion; @@ -7472,8 +7472,11 @@ struct input_event *ievent; { XClientMessageEvent *ev = (XClientMessageEvent *) event; - Lisp_Object window = (Lisp_Object) ev->data.l[0]; - struct frame *f = XFRAME (XWINDOW (window)->frame); + Lisp_Object window; + struct frame *f; + + XSETFASTINT (window, ev->data.l[0]); + f = XFRAME (XWINDOW (window)->frame); ievent->kind = scroll_bar_click; ievent->frame_or_window = window;