Now on revision 107630.
------------------------------------------------------------
revno: 107630
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2012-03-19 14:44:14 +0000
message:
  shr.el (shr-insert): Minor shr white space rendering tweak
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2012-03-14 22:15:04 +0000
+++ lisp/gnus/ChangeLog	2012-03-19 14:44:14 +0000
@@ -1,3 +1,8 @@
+2012-03-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* shr.el (shr-insert): Update the text state properly to avoid
+	inserting spurious paragraph starts.
+
 2012-03-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-sum.el (gnus-update-marks): Don't propagate marks unless

=== modified file 'lisp/gnus/shr.el'
--- lisp/gnus/shr.el	2012-03-14 22:15:04 +0000
+++ lisp/gnus/shr.el	2012-03-19 14:44:14 +0000
@@ -332,6 +332,7 @@
       (unless shr-start
 	(setq shr-start (point)))
       (insert elem)
+      (setq shr-state nil)
       (let (found)
 	(while (and (> (current-column) shr-width)
 		    (progn
------------------------------------------------------------
revno: 107629 [merge]
committer: Kenichi Handa <handa@m17n.org>
branch nick: trunk
timestamp: Mon 2012-03-19 13:18:26 +0900
message:
  ftfont.c (ftfont_drive_otf): Mask bits of character code to make it fit in a valid range (Bug#11003).
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2012-03-18 16:57:39 +0000
+++ src/ChangeLog	2012-03-19 04:17:50 +0000
@@ -1,3 +1,8 @@
+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

=== modified file 'src/ftfont.c'
--- src/ftfont.c	2012-01-19 07:21:25 +0000
+++ src/ftfont.c	2012-03-19 04:08:07 +0000
@@ -1856,7 +1856,7 @@
   setup_otf_gstring (len);
   for (i = 0; i < len; i++)
     {
-      otf_gstring.glyphs[i].c = in->glyphs[from + i].c;
+      otf_gstring.glyphs[i].c = in->glyphs[from + i].c & 0x11FFFF;
       otf_gstring.glyphs[i].glyph_id = in->glyphs[from + i].code;
     }
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.