Merge from emacs-24; up to 2014-04-17T02:05:48Z!eggert@cs.ucla.edu

diff --cc lisp/ChangeLog
Simple merge

diff --cc src/ChangeLog
index 34ae84c788fa1068d9ba94270d5c8bf177d1f9c9,c42679d54f4d516a23d41e19f1e169ee604d1ba1..bb05be04d3e5673e7565fa37d47e4023059b0ecd
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,15 +1,9 @@@
 -2014-04-18  Eli Zaretskii  <eliz@gnu.org>
 -
 -      * xdisp.c (insert_left_trunc_glyphs): Ensure the left truncation
 -      glyph is written to TEXT_AREA of the temporary glyph_row.
 -      (Bug#17288)
 -
+ 2014-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * intervals.c (rotate_right, rotate_left): Fix up length computation.
+       Also change identifiers to match the comments, and add more assertions
+       (bug#16234).
+ 
  2014-04-18  Paul Eggert  <eggert@cs.ucla.edu>
  
        * emacs.c (close_output_streams): Don't clear and restore errno.

diff --cc test/ChangeLog
Simple merge