Don't convert function pointers to void * and back.

It isn't portable C, and it's easy enough to avoid.
* alloc.c: Verify SAVE_FUNCPOINTER bits, too.
(make_save_value): Add support for SAVE_FUNCPOINTER.
* keymap.c (map_keymap_char_table_item, map_keymap_internal):
* print.c (print_object):
Distinguish function from object pointers.
* lisp.h (SAVE_FUNCPOINTER): New constant.
(SAVE_SLOT_BITS): Adjust to it.
(SAVE_TYPE_FUNCPTR_PTR_OBJ): New constant, replacing
SAVE_TYPE_PTR_PTR_OBJ.  Change the only use.
(voidfuncptr): New typedef.
(struct Lisp_Save_Value): New member data[0].funcpointer.
(XSAVE_FUNCPOINTER): New function.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/alloc.c b/src/alloc.c
index eaef0d4b797..b625e1f27e0 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3352,7 +3352,9 @@ free_misc (Lisp_Object misc)
    that are assumed here and elsewhere.  */
 
 verify (SAVE_UNUSED == 0);
-verify ((SAVE_INTEGER | SAVE_POINTER | SAVE_OBJECT) >> SAVE_SLOT_BITS == 0);
+verify (((SAVE_INTEGER | SAVE_POINTER | SAVE_FUNCPOINTER | SAVE_OBJECT)
+         >> SAVE_SLOT_BITS)
+        == 0);
 
 /* Return a Lisp_Save_Value object with the data saved according to
    DATA_TYPE.  DATA_TYPE should be one of SAVE_TYPE_INT_INT, etc.  */
@@ -3379,6 +3381,10 @@ make_save_value (enum Lisp_Save_Type save_type, ...)
         p->data[i].pointer = va_arg (ap, void *);
         break;
 
+      case SAVE_FUNCPOINTER:
+        p->data[i].funcpointer = va_arg (ap, voidfuncptr);
+        break;
+
       case SAVE_INTEGER:
         p->data[i].integer = va_arg (ap, ptrdiff_t);
         break;