From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Fri, 25 Mar 2016 12:50:00 +0100 Message-ID: <87a8lmrd3r.fsf@linux-m68k.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> <83oaa30wjs.fsf@gnu.org> <83fuve25qp.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1458906626 14252 80.91.229.3 (25 Mar 2016 11:50:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Mar 2016 11:50:26 +0000 (UTC) Cc: johnw@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 25 12:50:18 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 1ajQFt-0003sB-Vk for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 12:50:18 +0100 Original-Received: from localhost ([::1]:55614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajQFo-0007Wg-AH for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 07:50:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajQFk-0007Vx-Vk for emacs-devel@gnu.org; Fri, 25 Mar 2016 07:50:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajQFk-0001t2-8h for emacs-devel@gnu.org; Fri, 25 Mar 2016 07:50:08 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:59435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajQFf-0001ol-FO; Fri, 25 Mar 2016 07:50:03 -0400 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3qWhSB0sR1z3hjN3; Fri, 25 Mar 2016 12:50:01 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3qWhS95rYLzvhNC; Fri, 25 Mar 2016 12:50:01 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id LMSz1FAFfOxf; Fri, 25 Mar 2016 12:50:00 +0100 (CET) X-Auth-Info: BbsDGCpddhyufzijV0adgx6equwrHqs0IOkAR/YMnqB+uugoEhJjsNCC/L5MzjkZ Original-Received: from igel.home (ppp-88-217-21-10.dynamic.mnet-online.de [88.217.21.10]) by mail.mnet-online.de (Postfix) with ESMTPA; Fri, 25 Mar 2016 12:50:00 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 523772C1DD9; Fri, 25 Mar 2016 12:50:00 +0100 (CET) X-Yow: I have many CHARTS and DIAGRAMS.. In-Reply-To: <83fuve25qp.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 25 Mar 2016 13:48:14 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.9 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:202221 Archived-At: Eli Zaretskii writes: > They were supposed to be skipped during merging They cannot be "skipped". Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."