Merge from emacs-24; up to 2012-12-23T17:06:58Z!eliz@gnu.org

diff --cc etc/NEWS
Simple merge

diff --cc src/ChangeLog
index a68b16f862c99f436ec7b300ccb62cbbf7d00acb,25a0a100c681591ba9f48046b787a2c48689b91f..d8b2833b2fa79050012017d099670c7389e2a9de
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,17 -1,8 +1,21 @@@
 -2013-02-27  Eli Zaretskii  <eliz@gnu.org>
+ 2013-03-02  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * lisp.h (XPNTR) [!USE_LSB_TAG]: Remove extra paren.  (Bug#13734)
+ 
 +2013-03-02  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * textprop.c: Use bool for booleans.
 +      (validate_interval_range, Fadd_text_properties)
 +      (Fremove_text_properties): Prefer bool to int when either works.
 +
 +2013-03-02  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * textprop.c (Fadd_text_properties, Fremove_text_properties): If
 +      the interval tree changes as a side effect of calling
 +      modify_region, re-do processing starting from the call to
 +      validate_interval_range.  (Bug#13743)
 +
 +2013-02-28  Eli Zaretskii  <eliz@gnu.org>
  
        * w32.c (sys_open): Don't reset the flags for FD in fd_info[].
        (Bug#13546).

diff --cc src/lisp.h
Simple merge