From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: trunk r115910: Fix previous change Date: Tue, 07 Jan 2014 18:19:31 +0100 Message-ID: <87bnzng15o.fsf@bzg.ath.cx> References: <87k3ebg1p7.fsf@bzg.ath.cx> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389115184 31884 80.91.229.3 (7 Jan 2014 17:19:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 17:19:44 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 07 18:19:51 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1W0aJh-0007q2-I0 for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 18:19:49 +0100 Original-Received: from localhost ([::1]:42002 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0aJh-0002MH-2E for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 12:19:49 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0aJY-0002Fb-J2 for emacs-devel@gnu.org; Tue, 07 Jan 2014 12:19:46 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0aJT-0001kX-7r for emacs-devel@gnu.org; Tue, 07 Jan 2014 12:19:40 -0500 Original-Received: from mail-wg0-x230.google.com ([2a00:1450:400c:c00::230]:40271) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0aJT-0001kM-11; Tue, 07 Jan 2014 12:19:35 -0500 Original-Received: by mail-wg0-f48.google.com with SMTP id x13so428356wgg.27 for ; Tue, 07 Jan 2014 09:19:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=cdsaJm4x8Ey7s+f4HVrd926et27oduUaMjtAD2NdJEU=; b=owngg8G2A/7XplhO043t0zGHOh3DNKmG38sjqkLJjPcr/x2MoQfPrC7nRBkIEojEk0 R9+vqKXQz8x2L98X//wsoYFMp+uFwYJWeJ7796Mpzw2CIqno7AuU/p4EkGGMIVB3Ksrl Txm+8cbgYmlSpfGNKlGATYrjelI+vPjkhFiYDEDQDhv4vGRCIrbbTcCVpwun/enQaM7P ivOdGr/Kkpkvjx2LEWDCbLnzy7jqG9VRgz7vJItRBnnVqF2nKqDQzmdRZDTL4APgfoLA rJCiy8oJ0EYl2CNa1+WbEyilWXBf15QkvyF33sP3t1trxld9kptDbpGiTkbxzks0Ll+B JPhg== X-Received: by 10.194.82.68 with SMTP id g4mr6182396wjy.85.1389115173863; Tue, 07 Jan 2014 09:19:33 -0800 (PST) Original-Received: from bzg.localdomain (AMontsouris-651-1-93-112.w82-123.abo.wanadoo.fr. [82.123.216.112]) by mx.google.com with ESMTPSA id po3sm45928988wjc.3.2014.01.07.09.19.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jan 2014 09:19:32 -0800 (PST) Original-Received: by bzg.localdomain (Postfix, from userid 1000) id 512681C20717; Tue, 7 Jan 2014 18:19:31 +0100 (CET) In-Reply-To: (Glenn Morris's message of "Tue, 07 Jan 2014 12:15:48 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::230 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:167633 Archived-At: Glenn Morris writes: > Some of the things I fixed make me think this is still not a merge, but > rather a copying of one file on top of another. This is going to keep > causing problems every time. Yes, I'm still copying. Sorry for those problems and thanks for fixing them. Too much work and no play makes me a dull boy :) I never found the time to learn how to setup a proper merge system, and with bzr being replaced soonish, I'll wait until then to see how I can merge the clean way. (If Org becomes a submodule, that'll be even easier.) > PS Notice the Mail-Followup-To of emacs-diffs postings points to > emacs-devel. Noticed, thanks! -- Bastien