From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Repeated entries in src/Changelog. Date: Mon, 19 Apr 2010 20:33:23 +0300 Message-ID: <837ho3bb4s.fsf@gnu.org> References: <4BCC9010.1060605@swipnet.se> Reply-To: Eli Zaretskii 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 1271698485 9937 80.91.229.12 (19 Apr 2010 17:34:45 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 19 Apr 2010 17:34:45 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?ISO-8859-1?Q?Jan_Dj=E4rv?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 19 19:34:44 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 1O3urp-0005fb-Lp for ged-emacs-devel@m.gmane.org; Mon, 19 Apr 2010 19:34:42 +0200 Original-Received: from localhost ([127.0.0.1]:32989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O3urm-0004S3-Ou for ged-emacs-devel@m.gmane.org; Mon, 19 Apr 2010 13:34:38 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O3uqc-0003A0-0R for emacs-devel@gnu.org; Mon, 19 Apr 2010 13:33:26 -0400 Original-Received: from [140.186.70.92] (port=51370 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O3uqX-00032l-4S for emacs-devel@gnu.org; Mon, 19 Apr 2010 13:33:25 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O3uqV-0003iy-He for emacs-devel@gnu.org; Mon, 19 Apr 2010 13:33:21 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:33874) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O3uqV-0003iO-8r for emacs-devel@gnu.org; Mon, 19 Apr 2010 13:33:19 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0L1400K00WPY1F00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Mon, 19 Apr 2010 20:33:18 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.127.69.249]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L1400GISWRHSQC0@a-mtaout20.012.net.il>; Mon, 19 Apr 2010 20:33:18 +0300 (IDT) In-reply-to: <4BCC9010.1060605@swipnet.se> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:123884 Archived-At: > Date: Mon, 19 Apr 2010 19:17:04 +0200 > From: Jan Dj=E4rv >=20 > Why is this entry in src/Changelog: >=20 > 2010-04-19 Jan Dj=E4rv >=20 > * frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use > FRAME_LINE_TO_PIXEL_Y. >=20 > * xterm.c (x_set_window_size_1): Don't add border_width/he= ight to > pixelwidth/height. >=20 > ? >=20 > That change was made in 2010-04-07 and the same entry appears on th= at date in=20 > the same Changelog. Did a merge go bad? Did you make the change both on the trunk and on emacs-23 branch?