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, 18 May 2010 12:41:38 +0200 Message-ID: References: <831vd9bmlg.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1274179322 25131 80.91.229.12 (18 May 2010 10:42:02 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 18 May 2010 10:42:02 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 18 12:42:00 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 1OEKFM-0001xO-DD for ged-emacs-devel@m.gmane.org; Tue, 18 May 2010 12:42:00 +0200 Original-Received: from localhost ([127.0.0.1]:59156 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEKFL-0006mP-LU for ged-emacs-devel@m.gmane.org; Tue, 18 May 2010 06:41:59 -0400 Original-Received: from [140.186.70.92] (port=51300 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEKF8-0006mJ-Ol for emacs-devel@gnu.org; Tue, 18 May 2010 06:41:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OEKF7-0006Ht-CP for emacs-devel@gnu.org; Tue, 18 May 2010 06:41:46 -0400 Original-Received: from iwfs.imcode.com ([82.115.149.64]:35219 helo=gate.verona.se) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OEKF3-0006GC-3O; Tue, 18 May 2010 06:41:41 -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 o4IAfcjF001451; Tue, 18 May 2010 12:41:39 +0200 In-Reply-To: <831vd9bmlg.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 18 May 2010 12:11:55 +0300") 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:124887 Archived-At: Eli Zaretskii writes: >> From: joakim@verona.se >> Date: Tue, 18 May 2010 10:22:57 +0200 >> >> I have done some minor improvements to the Imagemagick branch, and it >> would be nice if it could receive some testing. > > Are there any reasons not to merge it with the trunk? If someone > doesn't use Imagemagick, would they sense any difference or execute > any of the code you added? 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) 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. 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? What I would like to do is experiment with some new keybindings in image-mode for zooming, switching the indexed file in a multifile bundle and so on. -- Joakim Verona