From: Daniel Colascione <dancol@dancol.org>
Date: Sat, 19 Apr 2014 20:32:05 +0000 (-0700)
Subject: Merge from emacs-24; up to 2014-04-17T02:05:48Z!eggert@cs.ucla.edu
X-Git-Tag: emacs-25.0.90~2612^2~709^2~1045
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6dfa19c50f75c1892f5c9a48104ddd532796d089;p=emacs.git

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

6dfa19c50f75c1892f5c9a48104ddd532796d089
diff --cc src/ChangeLog
index 34ae84c788f,c42679d54f4..bb05be04d3e
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,15 +1,9 @@@
+ 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  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-18  Paul Eggert  <eggert@cs.ucla.edu>
  
  	* emacs.c (close_output_streams): Don't clear and restore errno.