From: Kenichi Handa <handa@m17n.org>
Date: Mon, 19 Mar 2012 04:17:50 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.05~85
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4ebb358f29e64094871ad6d35fb365d77c17047d;p=emacs.git

merge trunk
---

4ebb358f29e64094871ad6d35fb365d77c17047d
diff --cc src/ChangeLog
index 80bc42fa8c6,adfa363e253..8b1221ab6d8
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,15 +1,20 @@@
 +2012-03-19  Kenichi Handa  <handa@m17n.org>
 +
 +	* ftfont.c (ftfont_drive_otf): Mask bits of character code to make
 +	it fit in a valid range (Bug#11003).
 +
+ 2012-03-18  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* xdisp.c (cursor_row_p): Even if the glyph row ends in a string
+ 	that is not from display property, accept the row as a "cursor
+ 	row" if one of the string's character has a non-nil `cursor'
+ 	property.  Fixes cursor positioning when there are newlines in
+ 	overlay strings, e.g. in icomplete.el.  (Bug#11035)
+ 
+ 2012-03-12  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	* buffer.c (compare_overlays): Don't assume args differ (Bug#6830).
+ 
  2012-03-12  Chong Yidong  <cyd@gnu.org>
  
  	* eval.c (inhibit_lisp_code): Rename from