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] /srv/bzr/emacs/trunk r101135: merge the imagemagick branch to trunk Date: Thu, 19 Aug 2010 14:28:40 +0200 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1282220948 4390 80.91.229.12 (19 Aug 2010 12:29:08 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 19 Aug 2010 12:29:08 +0000 (UTC) Cc: Emacs developers To: Juanma Barranquero Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 19 14:29:06 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 1Om4Ey-0006ll-II for ged-emacs-devel@m.gmane.org; Thu, 19 Aug 2010 14:29:04 +0200 Original-Received: from localhost ([127.0.0.1]:60536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Om4Ex-0006O3-GU for ged-emacs-devel@m.gmane.org; Thu, 19 Aug 2010 08:29:03 -0400 Original-Received: from [140.186.70.92] (port=34516 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Om4Em-0006MD-L8 for emacs-devel@gnu.org; Thu, 19 Aug 2010 08:28:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Om4El-0001A1-60 for emacs-devel@gnu.org; Thu, 19 Aug 2010 08:28:52 -0400 Original-Received: from smtprelay-h31.telenor.se ([213.150.131.4]:49960) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Om4El-00018M-0z for emacs-devel@gnu.org; Thu, 19 Aug 2010 08:28:51 -0400 Original-Received: from ipb4.telenor.se (ipb4.telenor.se [195.54.127.167]) by smtprelay-h31.telenor.se (Postfix) with ESMTP id 6F8B6E96F6 for ; Thu, 19 Aug 2010 14:28:43 +0200 (CEST) X-SENDER-IP: [83.227.138.150] X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AugwAC/AbExT44qWPGdsb2JhbACHaphxDAEBAQE1LbxQhTcEiXGCfQ X-IronPort-AV: E=Sophos;i="4.56,233,1280700000"; d="scan'208";a="1661846274" Original-Received: from ua-83-227-138-150.cust.bredbandsbolaget.se (HELO www.verona.se) ([83.227.138.150]) by ipb4.telenor.se with ESMTP; 19 Aug 2010 14:28:42 +0200 Original-Received: from localhost.localdomain (unknown [192.168.201.6]) by www.verona.se (Postfix) with ESMTP id E4B2B712F9F; Thu, 19 Aug 2010 14:28:40 +0200 (CEST) In-Reply-To: (Juanma Barranquero's message of "Thu, 19 Aug 2010 14:04:04 +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:128868 Archived-At: Juanma Barranquero writes: > A few nitpicks (not related to code, just the merge). > > On Thu, Aug 19, 2010 at 09:35, Joakim wrot= e: > >> modified: >> =A0ChangeLog > > There's just a ChangeLog entry, at top level, but the changes should > be documented in the respective ChangeLogs (src/ChangeLog for src/* > changes, etc.). > >> =A0configure >> =A0doc/lispref/display.texi >> =A0etc/NEWS >> =A0lisp/image-mode.el > > These aren't mentioned in any ChangeLog. > >> +2010-06-12 Joakim Verona > > When merging branches, the date of the ChangeLog is the date the merge > is done, not that of the original changes (that information is > preserved by the branch history). > >> + =A0 =A0 =A0 =A0* image.c: Add support for ImageMagick. When HAVE_IMAGE= MAGICK is >> + =A0 =A0 =A0 =A0defined: > > Usually that information is conveyed by "[HAVE_IMAGEMAGICK]". > >> + =A0 =A0 =A0 =A0* config.in, Makefile.in, configure.in > > These files do not have a change description in the entry. Ok, Ill try to fix these issues. > =A0 =A0 Juanma > --=20