aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-07-21 08:56:55 -0700
committerPaul Eggert2013-07-21 08:56:55 -0700
commitf4e891b5a89a773600a329bae75cd615f3c8e0a2 (patch)
treec2034968999cbebd4f796e3203a55bd4d5ec02a5
parent96c8b65ebd79360fdcf81786461805bb4377ca11 (diff)
downloademacs-f4e891b5a89a773600a329bae75cd615f3c8e0a2.tar.gz
emacs-f4e891b5a89a773600a329bae75cd615f3c8e0a2.zip
* alloc.c (make_save_ptr_ptr): Define this function.
It was inadvertently omitted. It's needed only if HAVE_MENUS && ! (USE_X_TOOLKIT || USE_GTK).
-rw-r--r--src/ChangeLog6
-rw-r--r--src/alloc.c13
2 files changed, 19 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fb2d875eb26..d3c5ffaff58 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12013-07-21 Paul Eggert <eggert@cs.ucla.edu>
2
3 * alloc.c (make_save_ptr_ptr): Define this function.
4 It was inadvertently omitted. It's needed only if
5 HAVE_MENUS && ! (USE_X_TOOLKIT || USE_GTK).
6
12013-07-21 Jan Djärv <jan.h.d@swipnet.se> 72013-07-21 Jan Djärv <jan.h.d@swipnet.se>
2 8
3 * nsterm.m (sendEvent:): Skip mouse moved if no dialog and no Emacs 9 * nsterm.m (sendEvent:): Skip mouse moved if no dialog and no Emacs
diff --git a/src/alloc.c b/src/alloc.c
index 4c924f72384..e6e06794dbc 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3394,6 +3394,19 @@ make_save_ptr_int (void *a, ptrdiff_t b)
3394 return val; 3394 return val;
3395} 3395}
3396 3396
3397#if defined HAVE_MENUS && ! (defined USE_X_TOOLKIT || defined USE_GTK)
3398Lisp_Object
3399make_save_ptr_ptr (void *a, void *b)
3400{
3401 Lisp_Object val = allocate_misc (Lisp_Misc_Save_Value);
3402 struct Lisp_Save_Value *p = XSAVE_VALUE (val);
3403 p->save_type = SAVE_TYPE_PTR_PTR;
3404 p->data[0].pointer = a;
3405 p->data[1].pointer = b;
3406 return val;
3407}
3408#endif
3409
3397Lisp_Object 3410Lisp_Object
3398make_save_funcptr_ptr_obj (void (*a) (void), void *b, Lisp_Object c) 3411make_save_funcptr_ptr_obj (void (*a) (void), void *b, Lisp_Object c)
3399{ 3412{