From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Juanma Barranquero" Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v Date: Tue, 22 Jul 2008 17:51:05 +0200 Message-ID: References: <4885FFEF.9000409@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1216741905 5553 80.91.229.12 (22 Jul 2008 15:51:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Jul 2008 15:51:45 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: "Jason Rumney" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jul 22 17:52:33 2008 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.50) id 1KLK9q-0003lZ-L2 for ged-emacs-devel@m.gmane.org; Tue, 22 Jul 2008 17:52:10 +0200 Original-Received: from localhost ([127.0.0.1]:41338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KLK8x-0004xR-Gx for ged-emacs-devel@m.gmane.org; Tue, 22 Jul 2008 11:51:15 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KLK8s-0004xC-4h for emacs-devel@gnu.org; Tue, 22 Jul 2008 11:51:10 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KLK8p-0004x0-K1 for emacs-devel@gnu.org; Tue, 22 Jul 2008 11:51:08 -0400 Original-Received: from [199.232.76.173] (port=56087 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KLK8p-0004wx-FY for emacs-devel@gnu.org; Tue, 22 Jul 2008 11:51:07 -0400 Original-Received: from nf-out-0910.google.com ([64.233.182.186]:6590) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KLK8p-0002UB-1h for emacs-devel@gnu.org; Tue, 22 Jul 2008 11:51:07 -0400 Original-Received: by nf-out-0910.google.com with SMTP id c7so6568399nfi.26 for ; Tue, 22 Jul 2008 08:51:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=t4/nhQOxp6XiGAJ+MSM/pXpj6R90Og1f2uvHiL93jbg=; b=DRgI2APLGXKEQl+gbP1znxSese5YVItbiBh6AFsyEEQ+nOS5TJd1RtrBK9k0jtaiY/ s3e498lPWyry4xQ0cZCPyQfWwk6DoUrqUV/r3uNqwGDMepgDlxuJsC4YdZZrCVFEYZzr K4iVkVhLK+47Foug4MBNwKQSy4sXYgZc1Wfu8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=Jy+1smy2+cRbPh4kjdFxBsStYTZw+joQC4AaCCfX0NbLS6PzhKPqg5h/L/lvvbrc6I w7nlLaOFlJeeAor8y/fDHu5M4mBkFufYYcoECOYrSYEQpDlbRR5+4GEa168XAVYyqHju NoU38uqcYFFj8sq2Ri7M7DYKcjfP4QIzTvMnY= Original-Received: by 10.210.67.4 with SMTP id p4mr4600998eba.192.1216741866035; Tue, 22 Jul 2008 08:51:06 -0700 (PDT) Original-Received: by 10.210.71.14 with HTTP; Tue, 22 Jul 2008 08:51:05 -0700 (PDT) In-Reply-To: <4885FFEF.9000409@gnu.org> Content-Disposition: inline X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) 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:101222 Archived-At: On Tue, Jul 22, 2008 at 17:42, Jason Rumney wrote: > I have just had something similar happen. An extra ^M was inserted at > the start of a line well down the ChangeLog file somewhere in the process. Yes! I just watched the diff pass by. Great. > Everything looked fine until I next reopened ChangeLog, where the line > end inconsistency caused the ^Ms to show up. The problem could have > happened at any of these points, but I suspect the second, as that is > the only one that is not part of my normal everyday use of CVS: Hmm. It's highly likely that the same happened in my case(s) and I just didn't notice. > Because the ^M is treated specially by CVS, I'm unable to check in a > corrected version without making some other change to the file. I've checked in a fixed ChangeLog. Juanma