* keymap.c (map_keymap_internal): Use format_save_value.

(map_keymap_char_table_item): Adjust accordingly.
* fileio.c (non_regular_fd, non_regular_inserted)
(non_regular_nbytes): Remove.
(Finsert_file_contents): Convert trytry to ptrdiff_t.  Use
format_save_value to pass parameters to read_non_regular.
(read_non_regular): Use XSAVE_ macros to extract parameters.
Adjust comment.
* xmenu.c (xmenu_show) [!USE_X_TOOLKIT && !USE_GTK]: Use
format_save_value.
(pop_down_menu) [!USE_X_TOOLKIT && !USE_GTK]: Adjust user.

1 files changed, 5 insertions, 10 deletions

diff --git a/src/keymap.c b/src/keymap.c
index f64c8d5a848..a9266120e86 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -565,14 +565,13 @@ map_keymap_char_table_item (Lisp_Object args, Lisp_Object key, Lisp_Object val)
 {
   if (!NILP (val))
     {
-      map_keymap_function_t fun = XSAVE_POINTER (XCAR (args), 0);
-      args = XCDR (args);
+      map_keymap_function_t fun = XSAVE_POINTER (args, 0);
       /* If the key is a range, make a copy since map_char_table modifies
 	 it in place.  */
       if (CONSP (key))
 	key = Fcons (XCAR (key), XCDR (key));
-      map_keymap_item (fun, XCDR (args), key, val,
-		       XSAVE_POINTER (XCAR (args), 0));
+      map_keymap_item (fun, XSAVE_OBJECT (args, 2), key,
+		       val, XSAVE_POINTER (args, 1));
     }
 }
 
@@ -610,12 +609,8 @@ map_keymap_internal (Lisp_Object map,
 	    }
 	}
       else if (CHAR_TABLE_P (binding))
-	{
-	  map_char_table (map_keymap_char_table_item, Qnil, binding,
-			  Fcons (make_save_value ((void *) fun, 0),
-				 Fcons (make_save_value (data, 0),
-					args)));
-	}
+	map_char_table (map_keymap_char_table_item, Qnil, binding,
+			format_save_value ("ppo", fun, data, args));
     }
   UNGCPRO;
   return tail;