From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Fri, 25 Mar 2016 11:52:07 +0300 Message-ID: <83oaa30wjs.fsf@gnu.org> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> <56EFA47D.8020303@cs.ucla.edu> <83zitr6civ.fsf@gnu.org> <83lh5b66jj.fsf@gnu.org> <8360wf5gmz.fsf@gnu.org> <83wpou4hb4.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458895963 15904 80.91.229.3 (25 Mar 2016 08:52:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Mar 2016 08:52:43 +0000 (UTC) Cc: emacs-devel@gnu.org To: John Wiegley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 25 09:52:42 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ajNU1-0005YR-PF for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 09:52:42 +0100 Original-Received: from localhost ([::1]:54756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajNU0-00038y-WF for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 04:52:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajNTx-000380-G1 for emacs-devel@gnu.org; Fri, 25 Mar 2016 04:52:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajNTs-00067o-1f for emacs-devel@gnu.org; Fri, 25 Mar 2016 04:52:37 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40861) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajNTZ-0005tb-SS; Fri, 25 Mar 2016 04:52:13 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4634 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1ajNTY-0008Qw-QM; Fri, 25 Mar 2016 04:52:13 -0400 In-reply-to: (message from Stefan Monnier on Tue, 22 Mar 2016 12:30:52 -0400) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:202213 Archived-At: There seems to be another issue with merging to master: we get back commits that were cherry-picked from master to the release branch. Here's one example; I don't know whether there are others: commit ad879b7f7e049160c45361fe8a12580801ba035b Author: K. Handa Date: Thu Jan 14 21:48:44 2016 +0900 Backport:fix previous change of src/ftfont.c (ftfont_shape_by_flt) * src/ftfont.c (ftfont_shape_by_flt): Fix previous change. Access the second glyph only when there are enough glyphs. (cherry picked from commit 9835757013569673854b692ccbb58bfb3c3ed1f7)