[Emacs-diffs] /srv/bzr/emacs/trunk r111913: Revert last commit; fixed on emacs-24 branch instead.

[Eli Zaretskii]

------------------------------------------------------------
revno: 111913
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-03-02 11:02:12 +0200
message:
  Revert last commit; fixed on emacs-24 branch instead.
modified:
  src/ChangeLog
  src/lisp.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-02 08:19:45 +0000
+++ b/src/ChangeLog     2013-03-02 09:02:12 +0000
@@ -1,7 +1,3 @@
-2013-03-02  Eli Zaretskii  <address@hidden>
-
-       * lisp.h (XPNTR) [!USE_LSB_TAG]: Fix parentheses nesting.  (Bug#13734)
-
 2013-02-28  Eli Zaretskii  <address@hidden>
 
        * w32.c (sys_open): Don't reset the flags for FD in fd_info[].

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2013-03-02 08:19:45 +0000
+++ b/src/lisp.h        2013-03-02 09:02:12 +0000
@@ -507,7 +507,7 @@
 
 /* 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 */