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: Repeated entries in src/Changelog. Date: Mon, 19 Apr 2010 19:17:04 +0200 Message-ID: <4BCC9010.1060605@swipnet.se> 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 1271697783 7114 80.91.229.12 (19 Apr 2010 17:23:03 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 19 Apr 2010 17:23:03 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 19 19:22:58 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 1O3ugT-0007YI-15 for ged-emacs-devel@m.gmane.org; Mon, 19 Apr 2010 19:22:57 +0200 Original-Received: from localhost ([127.0.0.1]:51127 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O3ugS-0007By-Cg for ged-emacs-devel@m.gmane.org; Mon, 19 Apr 2010 13:22:56 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O3uau-0001mO-BX for emacs-devel@gnu.org; Mon, 19 Apr 2010 13:17:12 -0400 Original-Received: from [140.186.70.92] (port=48657 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O3uas-0001ld-Qu for emacs-devel@gnu.org; Mon, 19 Apr 2010 13:17:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O3uar-0006pj-2V for emacs-devel@gnu.org; Mon, 19 Apr 2010 13:17:10 -0400 Original-Received: from smtprelay-h22.telenor.se ([195.54.99.197]:56938) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O3uaq-0006oe-Sv for emacs-devel@gnu.org; Mon, 19 Apr 2010 13:17:09 -0400 Original-Received: from ipb2.telenor.se (ipb2.telenor.se [195.54.127.165]) by smtprelay-h22.telenor.se (Postfix) with ESMTP id F0E8114A75 for ; Mon, 19 Apr 2010 19:17:05 +0200 (CEST) X-SENDER-IP: [85.225.45.110] X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AohIACctzEtV4S1uPGdsb2JhbACHZogXi3kMAQEBATUtvRyFDgQ X-IronPort-AV: E=Sophos;i="4.52,236,1270418400"; d="scan'208";a="65609741" Original-Received: from c-6e2de155.25-1-64736c10.cust.bredbandsbolaget.se (HELO coolsville.localdomain) ([85.225.45.110]) by ipb2.telenor.se with ESMTP; 19 Apr 2010 19:17:05 +0200 Original-Received: from [172.20.199.13] (zeplin [172.20.199.13]) by coolsville.localdomain (Postfix) with ESMTPSA id 03C6F7FA05A for ; Mon, 19 Apr 2010 19:17:05 +0200 (CEST) User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; sv-SE; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 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:123883 Archived-At: Hi. 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/height t= o pixelwidth/height. ? That change was made in 2010-04-07 and the same entry appears on that dat= e in=20 the same Changelog. Did a merge go bad? Jan D.