From e3563fbf5d899bafcbcf1b84a01abb85057c591b Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Sun, 25 Nov 2018 15:11:10 +0000 Subject: [PATCH] Use XLI to correct erroneous uses of Vsymbols_with_pos_enabled in lisp.h * src/lisp.h (lisp_h_EQ, lisp_h_SYMBOLP, lisp_h_XSYMBOL): Use XLI (Vsymbols_with_pos_enabled) with integer binary operations. --- src/lisp.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lisp.h b/src/lisp.h index 4dfd0656293..802c9e4259f 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -395,7 +395,7 @@ typedef EMACS_INT Lisp_Word; /* verify (NIL_IS_ZERO) */ #define lisp_h_EQ(x, y) ((XLI ((x)) == XLI ((y))) \ - || (Vsymbols_with_pos_enabled \ + || (XLI (Vsymbols_with_pos_enabled) \ && (SYMBOL_WITH_POS_P ((x)) \ ? BARE_SYMBOL_P ((y)) \ ? (XSYMBOL_WITH_POS((x)))->sym == (y) \ @@ -424,7 +424,7 @@ typedef EMACS_INT Lisp_Word; #define lisp_h_BARE_SYMBOL_P(x) TAGGEDP ((x), Lisp_Symbol) /* verify (NIL_IS_ZERO) */ #define lisp_h_SYMBOLP(x) ((BARE_SYMBOL_P ((x)) || \ - (Vsymbols_with_pos_enabled && (SYMBOL_WITH_POS_P ((x)))))) + (XLI (Vsymbols_with_pos_enabled) && (SYMBOL_WITH_POS_P ((x)))))) #define lisp_h_TAGGEDP(a, tag) \ (! (((unsigned) (XLI (a) >> (USE_LSB_TAG ? 0 : VALBITS)) \ - (unsigned) (tag)) \ @@ -463,7 +463,7 @@ typedef EMACS_INT Lisp_Word; /* verify (NIL_IS_ZERO) */ # define lisp_h_XSYMBOL(a) \ (eassert (SYMBOLP ((a))), \ - (!Vsymbols_with_pos_enabled \ + (!XLI (Vsymbols_with_pos_enabled) \ ? (XBARE_SYMBOL ((a))) \ : (BARE_SYMBOL_P ((a))) \ ? (XBARE_SYMBOL ((a))) \ -- 2.39.5