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: Merging the xwidget branch Date: Mon, 18 Jan 2016 17:39:10 +0200 Message-ID: <83h9iaew2p.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1453131575 4992 80.91.229.3 (18 Jan 2016 15:39:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 18 Jan 2016 15:39:35 +0000 (UTC) Cc: emacs-devel@gnu.org To: joakim@verona.se Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 18 16:39:26 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 1aLBtt-0006YG-BX for ged-emacs-devel@m.gmane.org; Mon, 18 Jan 2016 16:39:25 +0100 Original-Received: from localhost ([::1]:60367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLBtp-0008Dx-Hy for ged-emacs-devel@m.gmane.org; Mon, 18 Jan 2016 10:39:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLBtb-0008Dn-PT for emacs-devel@gnu.org; Mon, 18 Jan 2016 10:39:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLBtY-0006of-Jm for emacs-devel@gnu.org; Mon, 18 Jan 2016 10:39:07 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLBtY-0006ob-GA; Mon, 18 Jan 2016 10:39:04 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1200 helo=HOME-C4E4A596F7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aLBtX-0007Lh-Nx; Mon, 18 Jan 2016 10:39:04 -0500 In-reply-to: (joakim@verona.se) 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:198252 Archived-At: > From: joakim@verona.se > Cc: emacs-devel@gnu.org > Date: Mon, 18 Jan 2016 08:28:58 +0100 > > >> 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? Yes. But the conventions for formatting the commit log are almost the same as for ChangeLog entries. So this shouldn't be very different from what you already knew. > * 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. For a significant feature such as this one, the NEWS entry should mention the main variables/functions/commands provided by the feature. > > * lisp/Changelog > #+BEGIN_SRC change-log > 2015-02-01 Grégoire Jadi > > * xwidget.el: Improvements to the Xwidget feature. No need to say anything about a new file except that it's new. > Various improvements to the Xwidget feature. > * xwidgets.c: Likewise here. > * 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: These, however, need to mention the functions where you made changes, at least. (You can invoke "C-x 4 a" from a buffer that visits the diffs, which should avoid manual work to come up with the list of the functions.) Thanks.