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, 18 Jan 2016 08:28:58 +0100 Message-ID: References: <83d1ud8gl0.fsf@gnu.org> <83oadx6jtl.fsf@gnu.org> <83k2ok7s4p.fsf@gnu.org> <8560yzewpg.fsf@iznogoud.viz> <83ziw6dj4v.fsf@gnu.org> <83k2n8dj8q.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1453102207 16653 80.91.229.3 (18 Jan 2016 07:30:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 18 Jan 2016 07:30:07 +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 18 08:29:55 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 1aL4GB-00034H-69 for ged-emacs-devel@m.gmane.org; Mon, 18 Jan 2016 08:29:55 +0100 Original-Received: from localhost ([::1]:58122 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aL4G7-0004bP-6U for ged-emacs-devel@m.gmane.org; Mon, 18 Jan 2016 02:29:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aL4Fs-0004bF-PR for emacs-devel@gnu.org; Mon, 18 Jan 2016 02:29:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aL4Fr-0002D7-F2 for emacs-devel@gnu.org; Mon, 18 Jan 2016 02:29:36 -0500 Original-Received: from mx1.bahnhof.se ([213.80.101.11]:34560) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aL4Fl-0002Aj-BS; Mon, 18 Jan 2016 02:29:29 -0500 Original-Received: from localhost (mf.bahnhof.se [213.80.101.20]) by mx1-reinject (Postfix) with ESMTP id 6EEA240D68; Mon, 18 Jan 2016 08:29:25 +0100 (CET) X-Virus-Scanned: by amavisd-new using ClamAV at bahnhof.se (MF1) Original-Received: from mf1.bahnhof.se ([127.0.0.1]) by localhost (mf1.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WGOPE-sdTD-s; Mon, 18 Jan 2016 08:29:18 +0100 (CET) Original-Received: from mta.verona.se (h-235-62.a149.priv.bahnhof.se [85.24.235.62]) by mf1.bahnhof.se (Postfix) with ESMTP id A4FC8330AE2; Mon, 18 Jan 2016 08:29:16 +0100 (CET) Original-Received: from localhost (unknown [127.0.0.1]) by mta.verona.se (Postfix) with ESMTP id 27F1B4E8DD7; Mon, 18 Jan 2016 07:29:16 +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 8qAJIh8ugWYI; Mon, 18 Jan 2016 08:28:58 +0100 (CET) Original-Received: from exodia.verona.se (www.verona.se [192.168.200.15]) by mta.verona.se (Postfix) with ESMTP id 5C6FA4E8DD6; Mon, 18 Jan 2016 08:28:58 +0100 (CET) In-Reply-To: <83k2n8dj8q.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 17 Jan 2016 22:49:25 +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:198237 Archived-At: Eli Zaretskii writes: >> From: joakim@verona.se >> Cc: emacs-devel@gnu.org >> Date: Sun, 17 Jan 2016 21:03:12 +0100 >>=20 >> I have made a patch to be applied to emacs-25. >> http://www.verona.se/xwidget_mvp.diff>=20 >> 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. >>=20 >> I tried building withouth xwidget enabled, and with. >>=20 >> Could you help with applying the patch, or otherwise state how we should= proceed? > > What kind of help do you need with the patch? If it applies cleanly > to the emacs-25 branch, just apply it, make sure you write a good > commit log message that describes the changes, and push. > > If anything else is needed, please tell. I'm not familiar enough with the new commit log conventions. I'm supposed to write a commit log entry rather than changelog entries right? If I can just have some suport regarding the commit message, I think I can just push. I have the tentative changelog messages included below. * NEWS ** Xwidgets : A new feature for embedding native widgets inside Emacs buffers. If you have gtk3 and webkit-devel installed, you can try the embedded webkit browser with m-x xwidget-webkit-browse-url. * lisp/Changelog #+BEGIN_SRC change-log 2015-02-01 Gr=E9goire Jadi * xwidget.el: Improvements to the Xwidget feature. 2015-02-01 Joakim Verona * xwidget.el: New file with support for the new Xwidget feature. #+END_SRC * src/Changelog #+BEGIN_SRC change-log 2015-02-01 Gr=E9goire Jadi Various improvements to the Xwidget feature. * xwidgets.c: * emacsgtkfixed.c: 2015-02-01 Joakim Verona New files for xwidgets: * xwidget.c, xwidget.h: Support for the new Xwidget feature. * window.c, Makefile.in, buffer.c, dispextern.h, dispnew.c, emacs.c: * emacsgtkfixed.c, emacsgtkfixed.h, keyboard.c, lisp.h, print.c: * termhooks.h, window.c, xdisp.c, xterm.c #+END_SRC * Changelog #+BEGIN_SRC change-log 2015-02-01 Joakim Verona Support for the new Xwidget feature. * configure.ac: #+END_SRC > > Thanks. --=20 Joakim Verona