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: Fri, 4 Jul 2008 13:50:58 +0200 Message-ID: References: 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 1215172277 7899 80.91.229.12 (4 Jul 2008 11:51:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 4 Jul 2008 11:51:17 +0000 (UTC) Cc: emacs-devel@gnu.org To: "Eli Zaretskii" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jul 04 13:52:02 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 1KEjpa-0005k5-3V for ged-emacs-devel@m.gmane.org; Fri, 04 Jul 2008 13:52:02 +0200 Original-Received: from localhost ([127.0.0.1]:34539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KEjoj-00022V-B3 for ged-emacs-devel@m.gmane.org; Fri, 04 Jul 2008 07:51:09 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KEjod-000216-V9 for emacs-devel@gnu.org; Fri, 04 Jul 2008 07:51:04 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KEjoa-00020l-94 for emacs-devel@gnu.org; Fri, 04 Jul 2008 07:51:03 -0400 Original-Received: from [199.232.76.173] (port=59832 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KEjoa-00020i-2u for emacs-devel@gnu.org; Fri, 04 Jul 2008 07:51:00 -0400 Original-Received: from nf-out-0910.google.com ([64.233.182.188]:51394) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KEjoZ-00083A-LL for emacs-devel@gnu.org; Fri, 04 Jul 2008 07:51:00 -0400 Original-Received: by nf-out-0910.google.com with SMTP id c7so328368nfi.26 for ; Fri, 04 Jul 2008 04:50:58 -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=16zLhT2cgl+9r1q9xpxPRSK5J0VFm4MSchUbPFeNBpM=; b=Lppx19izTf2pnpDpuhg/Qt6iaSDpP1ObauiZSPNviGXHBnsILS5+ObQVOXH9AQfnBi M+Cp3LrzvHaGpl+3KBhcp2sWf/IB1+eTSHOGGHWB+QDo7RszLZ/XWSHYzbBeRbWmr0QZ jTBTysyDkJlO0/uzR7nmjbjDIdwng/pcv1D3Q= 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=pE5k9CeZWsC0M7maYw+7W0RarKVP1s1OPx10AQGnMRU9yE6/2AhfDAeCjPw+GRLV9k ER6Bn+kTp84aeEYGJ+kxV5GuTkwxYhAdmwRHI6eQM9AfxUqqvCtM4EeUOHoNNQkLxIwu CA0+6aFPwxN8Y18qpA5/CyZoXJNxZUbHWSGiI= Original-Received: by 10.210.92.11 with SMTP id p11mr273501ebb.175.1215172258269; Fri, 04 Jul 2008 04:50:58 -0700 (PDT) Original-Received: by 10.210.71.14 with HTTP; Fri, 4 Jul 2008 04:50:58 -0700 (PDT) In-Reply-To: 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:100340 Archived-At: On Fri, Jul 4, 2008 at 11:56, Eli Zaretskii wrote: > Are you saying that the problem happens when "cvs up" applies the > patches sent to it by the server? Really, I don't know. The sequence is this: - I have a ChangeLog, apparently correct, up-to-date with the repository. - I modify it, typically by adding a new ChangeLog entry. - I commit in from inside Emacs, with vc-next-action followed by log-edit-done. - I see the diff in emacs-diffs and notice that an empty line has been deleted. This seems to happen more to empty lines that separate paragraphs from date/author lines (as opposed to empty space between paragraphs), but I have no hard data, just a feeling. - I edit the ChangeLog to see what's happened. All the lines end in ^M. - I remove the ^M (with replace-string ^M^J ^J) [I don't write the ChangeLog, it's just to make it easier spot problems.] - At that point (after removing the ^Ms) the line with the problem has this aspect: this is the last line of the previous paragraph. ^MYYYY-MM-DD This is the * This is the correct paragraph of the following entry. Juanma