From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Katsumi Yamaoka Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master 8f1df3c: nnimap.el: Fix IMAP message size parsing Date: Thu, 16 Jul 2015 07:34:23 +0900 Organization: Emacsen advocacy group Message-ID: References: <20150711060305.12855.2975@vcs.savannah.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1436999696 3817 80.91.229.3 (15 Jul 2015 22:34:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 15 Jul 2015 22:34:56 +0000 (UTC) Cc: Nikolaus Rath , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 16 00:34:51 2015 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 1ZFVGK-0004wf-WD for ged-emacs-devel@m.gmane.org; Thu, 16 Jul 2015 00:34:49 +0200 Original-Received: from localhost ([::1]:37713 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFVGK-0002ba-2E for ged-emacs-devel@m.gmane.org; Wed, 15 Jul 2015 18:34:48 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFVG8-0002bV-Oi for emacs-devel@gnu.org; Wed, 15 Jul 2015 18:34:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFVG5-0002R4-HW for emacs-devel@gnu.org; Wed, 15 Jul 2015 18:34:36 -0400 Original-Received: from memphis-mail.hostforweb.net ([216.246.47.48]:48304 helo=memphis.hostforweb.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFVG5-0002QB-DS for emacs-devel@gnu.org; Wed, 15 Jul 2015 18:34:33 -0400 Original-Received: from localhost ([127.0.0.1]:39806) by memphis.hostforweb.net with smtp (Exim 4.85) (envelope-from ) id 1ZFVFz-004LXN-V3; Wed, 15 Jul 2015 17:34:28 -0500 X-Face: #kKnN,xUnmKia.'[pp`; Omh}odZK)?7wQSl"4o04=EixTF+V[""w~iNbM9ZL+.b*_CxUmFk B#Fu[*?MZZH@IkN:!"\w%I_zt>[$nm7nQosZ<3eu; B:$Q_:p!',P.c0-_Cy[dz4oIpw0ESA^D*1Lw= L&i*6&( User-Agent: Gnus/5.130014 (=?iso-2022-jp?B?GyRCPz8bKEI=?= Gnus v0.14) Emacs/25.0.50 (i686-pc-cygwin) Cancel-Lock: sha1:mQhSFXCxLJm1Y/56V8TOYzXRqh4= X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - memphis.hostforweb.net X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - jpl.org X-Get-Message-Sender-Via: memphis.hostforweb.net: acl_c_authenticated_local_user: yamaokac X-Source: X-Source-Args: X-Source-Dir: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.246.47.48 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:187891 Archived-At: On Sat, 11 Jul 2015 10:52:50 -0400, Stefan Monnier wrote: > Looks like you messed up the merge: instead of merging with my change, > you just overwrote my change. Could you try and fix it? Oops, sorry for my mistake. I'll fix it asap. (I was back from the trip.)