From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Merge imagemagick to trunk? Date: Wed, 18 Aug 2010 14:38:03 +0200 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1282135101 19759 80.91.229.12 (18 Aug 2010 12:38:21 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 18 Aug 2010 12:38:21 +0000 (UTC) Cc: Emacs development discussions To: joakim@verona.se Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 18 14:38:19 2010 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 1OlhuM-0000Lh-VY for ged-emacs-devel@m.gmane.org; Wed, 18 Aug 2010 14:38:19 +0200 Original-Received: from localhost ([127.0.0.1]:56690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OlhuL-0004EL-To for ged-emacs-devel@m.gmane.org; Wed, 18 Aug 2010 08:38:17 -0400 Original-Received: from [140.186.70.92] (port=49617 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OlhuD-0004E6-EW for emacs-devel@gnu.org; Wed, 18 Aug 2010 08:38:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OlhuB-0001kf-SM for emacs-devel@gnu.org; Wed, 18 Aug 2010 08:38:09 -0400 Original-Received: from impaqm4.telefonica.net ([213.4.138.4]:62402) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OlhuB-0001jy-Lj for emacs-devel@gnu.org; Wed, 18 Aug 2010 08:38:07 -0400 Original-Received: from IMPmailhost2.adm.correo ([10.20.102.39]) by IMPaqm4.telefonica.net with bizsmtp id vlHb1e00j0r0BT63Qoe4Kk; Wed, 18 Aug 2010 14:38:04 +0200 Original-Received: from ceviche.home ([83.61.35.93]) by IMPmailhost2.adm.correo with BIZ IMP id voe31e00320aCvn1ioe3H3; Wed, 18 Aug 2010 14:38:04 +0200 X-Brightmail-Tracker: AAAAAA== X-TE-authinfo: authemail="monnier$movistar.es" |auth_email="monnier@movistar.es" X-TE-AcuTerraCos: auth_cuTerraCos="cosuitnetc01" Original-Received: by ceviche.home (Postfix, from userid 20848) id 2E272663A7; Wed, 18 Aug 2010 14:38:03 +0200 (CEST) In-Reply-To: (joakim@verona.se's message of "Wed, 18 Aug 2010 13:26:05 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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:128831 Archived-At: > Can I merge the ImageMagick branch to trunk now? Looking at "bzr diff -r ancestor:trunk", I see that you've fixed most problems. I still see a "let*\n" image-transform-properties, as well as an ugly "))" on its own line in lisp/image-mode.el. And also there are comments using the form /* sadgewgf sfgsfg. */ whereas we use /* sadgewgf sfgsfg. */ (with two spaces after the full-stop, of course). And last but not least, the diff for src/image..c shows a lot of unrelated changes, probably result of a "reindent the whole buffer" or something like that. So, once you've fixed those unimportant details, feel free to merge it, Thanks, Stefan