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: Sun, 17 Jan 2016 21:03:12 +0100 Message-ID: References: <83d1ud8gl0.fsf@gnu.org> <83oadx6jtl.fsf@gnu.org> <83k2ok7s4p.fsf@gnu.org> <8560yzewpg.fsf@iznogoud.viz> <83ziw6dj4v.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1453061056 27784 80.91.229.3 (17 Jan 2016 20:04:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 17 Jan 2016 20:04:16 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 17 21:04:05 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 1aKtYQ-0005m2-M9 for ged-emacs-devel@m.gmane.org; Sun, 17 Jan 2016 21:04:02 +0100 Original-Received: from localhost ([::1]:55758 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aKtYM-0004IQ-Ku for ged-emacs-devel@m.gmane.org; Sun, 17 Jan 2016 15:03:58 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aKtYJ-0004IF-2N for emacs-devel@gnu.org; Sun, 17 Jan 2016 15:03:56 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aKtYI-0000Ew-3T for emacs-devel@gnu.org; Sun, 17 Jan 2016 15:03:55 -0500 Original-Received: from mx1.bahnhof.se ([213.80.101.11]:51372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aKtYC-0000Dv-HH; Sun, 17 Jan 2016 15:03:48 -0500 Original-Received: from localhost (mf.bahnhof.se [213.80.101.20]) by mx1-reinject (Postfix) with ESMTP id 0EC7340C83; Sun, 17 Jan 2016 21:03:43 +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 cLhvD7skc+I5; Sun, 17 Jan 2016 21:03:32 +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 883C794022C; Sun, 17 Jan 2016 21:03:30 +0100 (CET) Original-Received: from localhost (unknown [127.0.0.1]) by mta.verona.se (Postfix) with ESMTP id DB7DF4E8D2E; Sun, 17 Jan 2016 20:03:29 +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 y8c-WUJYRz80; Sun, 17 Jan 2016 21:03:13 +0100 (CET) Original-Received: from exodia.verona.se (www.verona.se [192.168.200.15]) by mta.verona.se (Postfix) with ESMTP id 1F5B94E8D2D; Sun, 17 Jan 2016 21:03:13 +0100 (CET) In-Reply-To: <83ziw6dj4v.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 16 Jan 2016 10:27:12 +0200") 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.11 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:198208 Archived-At: Eli Zaretskii writes: >> From: joakim@verona.se >> Date: Mon, 11 Jan 2016 20:43:37 +0100 >> Cc: emacs-devel@gnu.org >> >> 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. > > How is that going? We should have this on emacs-25 before the first > pretest, otherwise it will have to wait for the next release, which > IMO would be a shame. > > If you need any help, just ask. > > Thanks. I have made a patch to be applied to emacs-25. http://www.verona.se/xwidget_mvp.diff Basically I just made a diff between master and xwidget_mvp, and ignored whitespace diffs. To test it I applied it to emacs-25 using patch. It applied cleanly, except for a trivial rejected hunk in keyboard.c, which I fixed in the patch. I then retested. I tried building withouth xwidget enabled, and with. Could you help with applying the patch, or otherwise state how we should proceed? -- Joakim Verona