From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: joakim@verona.se Newsgroups: gmane.emacs.devel Subject: Re: Merging the xwidget branch Date: Mon, 11 Jan 2016 20:43:37 +0100 Message-ID: References: <83d1ud8gl0.fsf@gnu.org> <83oadx6jtl.fsf@gnu.org> <83k2ok7s4p.fsf@gnu.org> <8560yzewpg.fsf@iznogoud.viz> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1452541485 7654 80.91.229.3 (11 Jan 2016 19:44:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 Jan 2016 19:44:45 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 11 20:44:34 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 1aIiOI-0006SK-Iv for ged-emacs-devel@m.gmane.org; Mon, 11 Jan 2016 20:44:34 +0100 Original-Received: from localhost ([::1]:56585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIiOI-0008Fg-12 for ged-emacs-devel@m.gmane.org; Mon, 11 Jan 2016 14:44:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIiO1-0008Ah-T1 for emacs-devel@gnu.org; Mon, 11 Jan 2016 14:44:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIiO0-0007wL-KS for emacs-devel@gnu.org; Mon, 11 Jan 2016 14:44:17 -0500 Original-Received: from mx6.bahnhof.se ([213.80.101.16]:49209) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIiNv-0007rj-PZ; Mon, 11 Jan 2016 14:44:11 -0500 Original-Received: from localhost (mf.bahnhof.se [213.80.101.20]) by mx6-reinject (Postfix) with ESMTP id 24B554179A; Mon, 11 Jan 2016 20:44:05 +0100 (CET) X-Virus-Scanned: by amavisd-new using ClamAV at bahnhof.se (MF2) Original-Received: from mf2.bahnhof.se ([127.0.0.1]) by localhost (mf2.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jCLP6P-dSQhg; Mon, 11 Jan 2016 20:43:57 +0100 (CET) Original-Received: from mta.verona.se (h-235-62.a149.priv.bahnhof.se [85.24.235.62]) by mf2.bahnhof.se (Postfix) with ESMTP id 28D7594022A; Mon, 11 Jan 2016 20:43:56 +0100 (CET) Original-Received: from localhost (unknown [127.0.0.1]) by mta.verona.se (Postfix) with ESMTP id 972D94E8304; Mon, 11 Jan 2016 19:43:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at verona.se Original-Received: from mta.verona.se ([127.0.0.1]) by localhost (exodia.verona.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C2G1fUg--B3s; Mon, 11 Jan 2016 20:43:37 +0100 (CET) Original-Received: from exodia.verona.se (www.verona.se [192.168.200.15]) by mta.verona.se (Postfix) with ESMTP id B02774E8301; Mon, 11 Jan 2016 20:43:37 +0100 (CET) In-Reply-To: <8560yzewpg.fsf@iznogoud.viz> (Wolfgang Jenkner's message of "Mon, 11 Jan 2016 20:34:04 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 213.80.101.16 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:198046 Archived-At: Wolfgang Jenkner writes: > On Sat, Jan 09 2016, joakim@verona.se wrote: > >> - xwidget_mvp is the branch we are talking about. I updated it recently >> from master > > And there were merges from master before that. Perhaps I'm missing > something but doesn't that pretty much preclude merging xwidget_mpv into > emacs-25? I will have to rework the patch on top of emacs-25 instead. > >> - There are maybe some spurious diffs in there somewhere. I can have a >> look. >> >> - I'm not sure which branch we are going to merge this to, I'll leave >> that to Eli -- Joakim Verona