summaryrefslogtreecommitdiff
path: root/src/dired.c
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2013-01-14 13:55:21 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2013-01-14 13:55:21 +0400
commit73ebd38f16c4799b657e501f188e9f3a3eca7805 (patch)
tree2584576d6931b14b336ac4ed3eb9eb513892da2c /src/dired.c
parentd6d02e06ee135655b604a12b0c53987988277a16 (diff)
downloademacs-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/dired.c')
-rw-r--r--src/dired.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dired.c b/src/dired.c
index b4dc702112e..77e89c6e6b3 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -78,7 +78,7 @@ directory_files_internal_w32_unwind (Lisp_Object arg)
static Lisp_Object
directory_files_internal_unwind (Lisp_Object dh)
{
- DIR *d = (DIR *) XSAVE_VALUE (dh)->pointer;
+ DIR *d = (DIR *) XSAVE_POINTER (dh);
block_input ();
closedir (d);
unblock_input ();