diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:11 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:11 +0000 |
commit | c8a87639c7cb7aef72630978a0e5a0d92618140c (patch) | |
tree | 862068307dff135870c4ae58be677408c4942a39 /lisp/compile.c | |
parent | 0a193e032ba1ecf3f003e027e833dc9d274cb740 (diff) |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'lisp/compile.c')
-rw-r--r-- | lisp/compile.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/compile.c b/lisp/compile.c index f699f39..b7c83f9 100644 --- a/lisp/compile.c +++ b/lisp/compile.c @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/compile.c,v 1.14 2003/01/30 02:46:25 paulo Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/compile.c,v 1.16 2003/10/24 20:38:16 tsi Exp $ */ #define VARIABLE_USED 0x0001 #define VARIABLE_ARGUMENT 0x0002 @@ -1672,7 +1672,7 @@ rest_label: /* The last argument is not saved in the stack */ ComEval(com, CAR(values)); values = NIL; - com_Bytecode(com, XBC_BCONS + (count - 1)); + com_Bytecode(com, (LispByteOpcode)(XBC_BCONS + (count - 1))); } } else { @@ -2142,7 +2142,7 @@ ComMacroExpandEval(LispCom *com, LispObj *object) static LispObj * ComMacroExpand(LispCom *com, LispObj *lambda) { - LispObj *result, **presult = &result, **plambda; + LispObj *result, **presult = &result; int jumped, *pjumped = &jumped, backquote, *pbackquote = &backquote; LispBlock *block; @@ -2154,7 +2154,6 @@ ComMacroExpand(LispCom *com, LispObj *lambda) interpreter_lex = lisp__data.env.lex; /* Use the variables */ - plambda = λ *presult = NIL; *pjumped = 1; *pbackquote = !CONSP(lambda); |