diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-20 13:56:14 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-20 13:56:46 -0800 |
| commit | 0dd19ac82662c5710e73852f438fd55e1d9225b7 (patch) | |
| tree | 67074879f366306af045d28f68d208fc2cf1a0ff /src/callint.c | |
| parent | 3a8312d00e59b50e76121cd512177e999c18b06d (diff) | |
| download | emacs-0dd19ac82662c5710e73852f438fd55e1d9225b7.tar.gz emacs-0dd19ac82662c5710e73852f438fd55e1d9225b7.tar.bz2 emacs-0dd19ac82662c5710e73852f438fd55e1d9225b7.zip | |
Undo port to hypothetical nonzero Qnil case
This mostly undoes the previous change in this area. See:
http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00570.html
* alloc.c (allocate_pseudovector):
* callint.c (Fcall_interactively):
* dispnew.c (realloc_glyph_pool):
* fringe.c (init_fringe):
* lisp.h (memsetnil):
* xdisp.c (init_iterator):
Simplify by assuming that Qnil is zero, but verify the assumption.
* lisp.h (NIL_IS_ZERO): Revert back to this symbol, removing
NIL_IS_NONZERO. All uses changed.
Diffstat (limited to 'src/callint.c')
| -rw-r--r-- | src/callint.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/callint.c b/src/callint.c index 43566acfbe9..3a595b57d77 100644 --- a/src/callint.c +++ b/src/callint.c @@ -509,9 +509,8 @@ invoke it. If KEYS is omitted or nil, the return value of visargs = args + nargs; varies = (signed char *) (visargs + nargs); + verify (NIL_IS_ZERO); memset (args, 0, nargs * (2 * word_size + 1)); - if (NIL_IS_NONZERO) - memsetnil (args, nargs * 2); GCPRO5 (prefix_arg, function, *args, *visargs, up_event); gcpro3.nvars = nargs; |