Revert last commit; fixed on emacs-24 branch instead.

diff --git a/src/ChangeLog b/src/ChangeLog
index f3ded8e3986abe7acbbae09982fb127724c197f4..1b8b3c560048b2fc2dc17e95767e9994b86a9b79 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,3 @@
-2013-03-02  Eli Zaretskii  <eliz@gnu.org>
-
-       * lisp.h (XPNTR) [!USE_LSB_TAG]: Fix parentheses nesting.  (Bug#13734)
-
 2013-02-28  Eli Zaretskii  <eliz@gnu.org>
 
        * w32.c (sys_open): Don't reset the flags for FD in fd_info[].

diff --git a/src/lisp.h b/src/lisp.h
index 01574a5fe03f4cc8030cc4479460bf51925d8f67..e696371c58bd7be82265b68bcc1189e6663ed6c5 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -507,7 +507,7 @@ static EMACS_INT const VALMASK
 
 /* DATA_SEG_BITS forces extra bits to be or'd in with any pointers
    which were stored in a Lisp_Object.  */
-#define XPNTR(a) ((uintptr_t) ((XLI (a) & VALMASK) | DATA_SEG_BITS))
+#define XPNTR(a) ((uintptr_t) ((XLI (a) & VALMASK)) | DATA_SEG_BITS))
 
 #endif /* not USE_LSB_TAG */