diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-03-02 11:02:12 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-03-02 11:02:12 +0200 |
| commit | c856b8d4679fe4b75f925c9e87eacf9456398090 (patch) | |
| tree | c6ff1d0ea02b3f26763e5b38cd4ee5598b02a311 | |
| parent | 474b43d90fdc3135aa4f277a1b64281f1d3b24a6 (diff) | |
| download | emacs-c856b8d4679fe4b75f925c9e87eacf9456398090.tar.gz | |
Revert last commit; fixed on emacs-24 branch instead.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lisp.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f3ded8e3986..1b8b3c56004 100644 --- 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 01574a5fe03..e696371c58b 100644 --- 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 */ |