diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-01-14 13:55:21 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-01-14 13:55:21 +0400 |
| commit | 73ebd38f16c4799b657e501f188e9f3a3eca7805 (patch) | |
| tree | 2584576d6931b14b336ac4ed3eb9eb513892da2c /src/nsmenu.m | |
| parent | d6d02e06ee135655b604a12b0c53987988277a16 (diff) | |
| download | emacs-73ebd38f16c4799b657e501f188e9f3a3eca7805.tar.gz | |
Make Lisp_Save_Value more versatile storage for up to four objects.
* lisp.h (toplevel): Enumeration to describe types of saved objects.
(struct Lisp_Save_Value): New layout. Adjust comments.
(XSAVE_POINTER): New macro.
(XSAVE_INTEGER): Likewise.
(allocate_misc): Add prototype.
(free_misc): Likewise.
* alloc.c (allocate_misc): Now global.
(free_misc): Likewise. Adjust comment.
(make_save_value): Use new Lisp_Save_Value layout. Adjust comment.
(free_save_value): Likewise.
(mark_object): Likewise.
* editfns.c (save_excursion_save): Pack everything within
Lisp_Save_Value and so avoid xmalloc.
(save_excursion_restore): Adjust to match new layout. Use free_misc
because we do not allocate extra memory any more. Add eassert.
* print.c (print_object): New code to print Lisp_Save_Value. Do not
rely on valid_lisp_object_p if !GC_MARK_STACK. Adjust comments.
* dired.c, fileio.c, font.c, ftfont.c, gtkutil.c, keymap.c,
* lread.c, nsmenu.m, nsterm.h, xfns.c, xmenu.c, xselect.c:
Use XSAVE_POINTER and XSAVE_INTEGER where appropriate.
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 39797d414f0..4e81b3201c8 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -1347,8 +1347,7 @@ struct Popdown_data static Lisp_Object pop_down_menu (Lisp_Object arg) { - struct Lisp_Save_Value *p = XSAVE_VALUE (arg); - struct Popdown_data *unwind_data = (struct Popdown_data *) p->pointer; + struct Popdown_data *unwind_data = (struct Popdown_data *) XSAVE_POINTER (arg); block_input (); if (popup_activated_flag) |