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: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 16:46:22 +0100 Message-ID: References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <54CE05A0.2090701@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422805622 336 80.91.229.3 (1 Feb 2015 15:47:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 15:47:02 +0000 (UTC) Cc: emacs-devel@gnu.org, Dmitry Gutov To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 16:47:01 2015 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 1YHwjl-0003fe-8e for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 16:47:01 +0100 Original-Received: from localhost ([::1]:50886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHwjk-000563-GU for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 10:47:00 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHwjg-00055v-At for emacs-devel@gnu.org; Sun, 01 Feb 2015 10:46:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHwjc-00025R-BW for emacs-devel@gnu.org; Sun, 01 Feb 2015 10:46:56 -0500 Original-Received: from mx2.bahnhof.se ([213.80.101.12]:33850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHwjc-000256-1V for emacs-devel@gnu.org; Sun, 01 Feb 2015 10:46:52 -0500 Original-Received: from localhost (mf.bahnhof.se [213.80.101.20]) by mx2-reinject (Postfix) with ESMTP id 5C2B8408B3; Sun, 1 Feb 2015 16:46:50 +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 dozb64l3k5c8; Sun, 1 Feb 2015 16:46:44 +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 5CFFA330AF9; Sun, 1 Feb 2015 16:46:43 +0100 (CET) Original-Received: from localhost (unknown [127.0.0.1]) by mta.verona.se (Postfix) with ESMTP id C958B52B485; Sun, 1 Feb 2015 15:46:43 +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 it61hV3sQfKv; Sun, 1 Feb 2015 16:46:22 +0100 (CET) Original-Received: from exodia.verona.se (www.verona.se [192.168.200.15]) by mta.verona.se (Postfix) with ESMTP id A3EFF52B47C; Sun, 1 Feb 2015 16:46:22 +0100 (CET) In-Reply-To: <54CE05A0.2090701@cs.ucla.edu> (Paul Eggert's message of "Sun, 01 Feb 2015 02:53:20 -0800") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.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.12 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:182176 Archived-At: Paul Eggert writes: > joakim@verona.se wrote: >>> Given the above, maybe you should revert the merge. Then squash all >>> >commits in xwidget into one patch, amend it with proper ChangeLog >>> >entries, and then do the merge. >>> > >> Perhaps that would be best. > > Yes, please do that. Here are some other things to do before committing the merge. Ok, so I don't botch it up worse, how would I do the revert exactly? Then, how do I squash the commits properly? For instance, should all commits to a certain directory be grouped, so a changelog can be part of the commit message for that directory? Is it not possible to edit the changelog to fix it? Also parts of the patch was written by Gregoire, can I have 2 changelogs in a commit message? > > * Reindent as per GNU standards. Start with "indent -gnu" but it > won't do a perfect job. E.g., say "char *p" not "char* p". > > * Fit it into 80 columns. > > * Use GNU style for comments. These should typically use complete, > imperative sentences. > > * Configure with "./configure --enable-gcc-warnings --with-xwidgets > --with-x-toolkit=gtk3" and fix all the warnings. > > * It's OK to assume C99 now. > > * Don't make functions extern unless they need to be extern. > Compilers do a better job with static functions, typically. > > * Some of those function names are too long; please shorten them. > > * A lot of the printf statements look like they shouldn't be there. > > * There's some commented-out code that should be removed. > > * Omit pointer casts that aren't needed (when casting to and from void *). > > I started to look into all that and came up with the attached patch, > relative to commit 9fe732a02afbe0b3d4a85d2bcae687900ab881f7; please > have a look. But the result still doesn't compile due to warnings and > I'm sure I missed a lot of things. I hope you can finish the job. > (Also, the ChangeLog entries need to be written -- I started on that > but it's a big job and it's something the author of the patch really > should do.) > > -- Joakim Verona