From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?ISO-8859-1?Q?Jan_Dj=E4rv?= Newsgroups: gmane.emacs.devel Subject: Re: Repeated entries in src/Changelog. Date: Tue, 20 Apr 2010 08:19:19 +0200 Message-ID: <4BCD4767.60402@swipnet.se> References: <4BCC9010.1060605@swipnet.se> <837ho3bb4s.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1271744376 19212 80.91.229.12 (20 Apr 2010 06:19:36 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 20 Apr 2010 06:19:36 +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 Apr 20 08:19:35 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 1O46o2-0000I4-C2 for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 08:19:34 +0200 Original-Received: from localhost ([127.0.0.1]:36757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O46o1-0005oO-PD for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 02:19:33 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O46nw-0005oJ-4Z for emacs-devel@gnu.org; Tue, 20 Apr 2010 02:19:28 -0400 Original-Received: from [140.186.70.92] (port=40301 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O46nv-0005o8-3G for emacs-devel@gnu.org; Tue, 20 Apr 2010 02:19:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O46nu-0005jR-88 for emacs-devel@gnu.org; Tue, 20 Apr 2010 02:19:27 -0400 Original-Received: from smtprelay-b11.telenor.se ([62.127.194.20]:46286) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O46nq-0005hx-Ka; Tue, 20 Apr 2010 02:19:22 -0400 Original-Received: from ipb2.telenor.se (ipb2.telenor.se [195.54.127.165]) by smtprelay-b11.telenor.se (Postfix) with ESMTP id 0FAE4144CA; Tue, 20 Apr 2010 08:19:20 +0200 (CEST) X-SENDER-IP: [85.225.45.110] X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AkZPAADkzEtV4S1uPGdsb2JhbACHZpQaDAEBAQE1LbwEhQ8E X-IronPort-AV: E=Sophos;i="4.52,240,1270418400"; d="scan'208";a="65828203" Original-Received: from c-6e2de155.25-1-64736c10.cust.bredbandsbolaget.se (HELO coolsville.localdomain) ([85.225.45.110]) by ipb2.telenor.se with ESMTP; 20 Apr 2010 08:19:20 +0200 Original-Received: from [172.20.199.2] (gaffa [172.20.199.2]) by coolsville.localdomain (Postfix) with ESMTP id 23F3A7FA05A; Tue, 20 Apr 2010 08:19:20 +0200 (CEST) User-Agent: Thunderbird 2.0.0.24 (X11/20100411) In-Reply-To: <837ho3bb4s.fsf@gnu.org> 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:123898 Archived-At: Eli Zaretskii skrev: >> Date: Mon, 19 Apr 2010 19:17:04 +0200 >> From: Jan Dj=E4rv >> >> Why is this entry in src/Changelog: >> >> 2010-04-19 Jan Dj=E4rv >> >> * frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use >> FRAME_LINE_TO_PIXEL_Y. >> >> * xterm.c (x_set_window_size_1): Don't add border_width/heigh= t to >> pixelwidth/height. >> >> ? >> >> That change was made in 2010-04-07 and the same entry appears on that = date in=20 >> the same Changelog. Did a merge go bad? >=20 > Did you make the change both on the trunk and on emacs-23 branch? >=20 Yes, thanks for clearing that up. Jan D.