diff options
| author | Glenn Morris | 2013-03-02 12:10:05 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-03-02 12:10:05 -0800 |
| commit | 06b583dec7cbde714c8fb991a1e123f612b66e3a (patch) | |
| tree | afd7b125be231e2c4234f32220f84bdd4e25b50e /src | |
| parent | 81c23309e40ca529714e765b4534d6a1f4634887 (diff) | |
| parent | b270d11649521531b4b51df937149b463b8d61a8 (diff) | |
| download | emacs-06b583dec7cbde714c8fb991a1e123f612b66e3a.tar.gz emacs-06b583dec7cbde714c8fb991a1e123f612b66e3a.zip | |
Merge from emacs-24; up to 2012-12-23T17:06:58Z!eliz@gnu.org
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lisp.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a68b16f862c..d8b2833b2fa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-03-02 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * lisp.h (XPNTR) [!USE_LSB_TAG]: Remove extra paren. (Bug#13734) | ||
| 4 | |||
| 1 | 2013-03-02 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-03-02 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * textprop.c: Use bool for booleans. | 7 | * textprop.c: Use bool for booleans. |
diff --git a/src/lisp.h b/src/lisp.h index e696371c58b..01574a5fe03 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -507,7 +507,7 @@ static EMACS_INT const VALMASK | |||
| 507 | 507 | ||
| 508 | /* DATA_SEG_BITS forces extra bits to be or'd in with any pointers | 508 | /* DATA_SEG_BITS forces extra bits to be or'd in with any pointers |
| 509 | which were stored in a Lisp_Object. */ | 509 | which were stored in a Lisp_Object. */ |
| 510 | #define XPNTR(a) ((uintptr_t) ((XLI (a) & VALMASK)) | DATA_SEG_BITS)) | 510 | #define XPNTR(a) ((uintptr_t) ((XLI (a) & VALMASK) | DATA_SEG_BITS)) |
| 511 | 511 | ||
| 512 | #endif /* not USE_LSB_TAG */ | 512 | #endif /* not USE_LSB_TAG */ |
| 513 | 513 | ||