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: imagemagick branch Date: Tue, 15 Jun 2010 21:00:21 +0200 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1276628437 478 80.91.229.12 (15 Jun 2010 19:00:37 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 15 Jun 2010 19:00:37 +0000 (UTC) To: Emacs development discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jun 15 21:00:34 2010 connect(): No such file or directory Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OObNB-0002te-PA for ged-emacs-devel@m.gmane.org; Tue, 15 Jun 2010 21:00:34 +0200 Original-Received: from localhost ([127.0.0.1]:42453 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OObNB-0003Jr-A6 for ged-emacs-devel@m.gmane.org; Tue, 15 Jun 2010 15:00:33 -0400 Original-Received: from [140.186.70.92] (port=49446 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OObN5-0003Jm-KD for emacs-devel@gnu.org; Tue, 15 Jun 2010 15:00:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OObN4-0002xl-5B for emacs-devel@gnu.org; Tue, 15 Jun 2010 15:00:27 -0400 Original-Received: from iwfs.imcode.com ([82.115.149.64]:41470 helo=gate.verona.se) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OObN3-0002xL-Rc for emacs-devel@gnu.org; Tue, 15 Jun 2010 15:00:26 -0400 Original-Received: from localhost.localdomain (IDENT:1005@localhost [127.0.0.1]) by gate.verona.se (8.13.4/8.11.4) with ESMTP id o5FJ0L72014508 for ; Tue, 15 Jun 2010 21:00:22 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:125964 Archived-At: Stefan Monnier writes: >> Yes, the code could probably safely be added to trunk. Even if one >> activates imagemagick with "configure --with-imagemagick=yes" >> imagemagick wont kick in unless you execute (imagemagick-register-types) > > I just took a quick look at the code and I see the following nits to fix: > - obviously a merge will have to come with a good ChangeLog. > - also the merge will need to come with documentation. Maybe not in the > Texinfo form yet, but at least in the etc/NEWS with enough info that > describes the `scale' and other such arguments that someone can start > using them. > - the README talks about naming inconsistencies, I think these should be > fixed before a first commit (should be straightforward). > - the "let" in image.el should not be followed by a line break and the while > should be replaced by a dolist. > - the prototype of imagemagick_load_image has some odd indentation in > its args, not sure what happened. > - a few lines in the C code break the 80columns limit. > - please use ANSI style function declarations rather than K&R for new code. > - you can get rid of the prototypes by reordering the code. > - the docstrings in DEFUN should not be indented (they'll display > weirdly otherwise in C-h f). > - Some "{" are at the end of a for/if rather than on their own line. > - why use "*( imtypes + i)" rather than "imtypes[i]"? > - some "," lack a space after them. > - several "=" and "==" lack spaces around them. I refreshed the branch and tried to address the issues you raised. Could you have a look again to see if its merge-worthy? > >> Another question then, how do I merge best to trunk? I'm reading: >> http://www.emacswiki.org/emacs/BzrForEmacsDevs#MergeToUpstream> but it suggests removing my local branch after merging. > > The branch's history is not really interesting it seems, so you might as > well do the first commit on trunk as a separate commit rather as a merge. > > But if you prefer a merge, see Eli's answer. > >> I would like to continue to add some more experimental functions to >> the branch, and later merge these to trunk. Would that also be ok? >> Or would it be better to create a new branch for this purpose? > > No need for a new branch. > > > Stefan -- Joakim Verona