fix up more Lisp_Object/int conversion issues

6 files changed, 34 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 292eefd05ce..e5a1569f30b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2000-06-18  Ken Raeburn  <raeburn@gnu.org>
+
+        * charset.c (update_charset_table): Use XINT on "iso_final_char"
+        when treating it as an integer.
+
+        * coding.h (encode_coding_string): Declare.
+
+        * keyboard.c (read_key_sequence): Use XINT on "pos" when treating
+        it as an integer.
+
+        * keymap.c (Fwhere_is_internal): Rename argument "keymap" to
+        "xkeymap" to avoid shadowing the "enum map_type" value that needs
+        to be passed to get_local_map.
+
+        * sound.c (Fplay_sound): Don't call make_number on
+        Frun_hook_with_args count argument.
+
+        * xterm.c (x_send_scroll_bar_event): Fudge lisp object/integer
+        for lisp objects in X event structure data field, when lisp
+        objects are represented with unions.
+        (x_scroll_bar_to_input_event): Ditto.
+
 2000-06-16  Ken Raeburn  <raeburn@gnu.org>
 
         * xdisp.c (decode_mode_spec): In "no_value" case, do NUL
diff --git a/src/charset.c b/src/charset.c
index 2c04743dac6..2ddb1b407dd 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -562,7 +562,7 @@ update_charset_table (charset_id, dimension, chars, width, direction,
     }
 
   /* 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;
 }
diff --git a/src/coding.h b/src/coding.h
index e3643580011..7dd39ee25dd 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -636,6 +636,8 @@ extern Lisp_Object code_convert_string P_ ((Lisp_Object,
 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;
diff --git a/src/keyboard.c b/src/keyboard.c
index fe3da4be8a8..9a2f18f043c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7974,7 +7974,8 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
                       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))
diff --git a/src/sound.c b/src/sound.c
index 52fe1c18bcd..965285a9c5f 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -435,7 +435,7 @@ a system-dependent default device name is used.")
 
   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
diff --git a/src/xterm.c b/src/xterm.c
index ce60fed07ff..ad00a4eccf1 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7445,7 +7445,7 @@ x_send_scroll_bar_event (window, part, portion, whole)
   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 @@ x_scroll_bar_to_input_event (event, ievent)
      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;