From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero 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:04:04 +0200 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1282219484 28066 80.91.229.12 (19 Aug 2010 12:04:44 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 19 Aug 2010 12:04:44 +0000 (UTC) Cc: Emacs developers To: Joakim Verona Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 19 14:04:41 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 1Om3rF-0002uh-41 for ged-emacs-devel@m.gmane.org; Thu, 19 Aug 2010 14:04:33 +0200 Original-Received: from localhost ([127.0.0.1]:48142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Om3rE-0007YV-I3 for ged-emacs-devel@m.gmane.org; Thu, 19 Aug 2010 08:04:32 -0400 Original-Received: from [140.186.70.92] (port=52465 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Om3r9-0007YQ-9u for emacs-devel@gnu.org; Thu, 19 Aug 2010 08:04:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Om3r7-0005JW-OO for emacs-devel@gnu.org; Thu, 19 Aug 2010 08:04:27 -0400 Original-Received: from mail-iw0-f169.google.com ([209.85.214.169]:42432) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Om3r7-0005JK-K9 for emacs-devel@gnu.org; Thu, 19 Aug 2010 08:04:25 -0400 Original-Received: by iwn2 with SMTP id 2so1820368iwn.0 for ; Thu, 19 Aug 2010 05:04:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:in-reply-to :references:from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=Nvl40qq8JnNln1t+xWLBIJCp03u4p+vKQQTn3Epn7yc=; b=WrrYhRNpiIZ6XzJQcUbV+NUTHRCYUwGnknf90exGOKMgQ89KfyZplnqukLaO8VfSNa H5NVpVMoEgmm/brfvYtSnlT31N5GD13KuGDFBmKS3MUK0+fMnbq3jPtuC+eQ6OzsxmdI RCKADPMVtW9RGRIWdovEJZWBD8oo8oHzgjJ3w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=OK73W2iyFNMocpxwJF1CPQQgYE8TmqRb/mqZae33jezlXJtr/UQGYAatHzadlGwmzP bnJGnldC1gs//XQ5iVvn3nxB3LnYwzVJxta77u7JRiBr2UzSRBtoaEDQhzTfRwlxn46t yWxnocp46d1DWom+H+pZsCbLzTwMMm/4G0ZhM= Original-Received: by 10.231.13.130 with SMTP id c2mr11306923iba.24.1282219464207; Thu, 19 Aug 2010 05:04:24 -0700 (PDT) Original-Received: by 10.231.151.132 with HTTP; Thu, 19 Aug 2010 05:04:04 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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:128867 Archived-At: A few nitpicks (not related to code, just the merge). On Thu, Aug 19, 2010 at 09:35, Joakim wrote: > modified: > =C2=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.). > =C2=A0configure > =C2=A0doc/lispref/display.texi > =C2=A0etc/NEWS > =C2=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). > + =C2=A0 =C2=A0 =C2=A0 =C2=A0* image.c: Add support for ImageMagick. When= HAVE_IMAGEMAGICK is > + =C2=A0 =C2=A0 =C2=A0 =C2=A0defined: Usually that information is conveyed by "[HAVE_IMAGEMAGICK]". > + =C2=A0 =C2=A0 =C2=A0 =C2=A0* config.in, Makefile.in, configure.in These files do not have a change description in the entry. =C2=A0 =C2=A0 Juanma