From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kenichi Handa Newsgroups: gmane.emacs.devel Subject: Re: ^M in the info files Date: Wed, 09 Jul 2008 11:44:14 +0900 Message-ID: References: <484F1FAB.6070005@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya") Content-Type: text/plain; charset=US-ASCII X-Trace: ger.gmane.org 1215571486 6553 80.91.229.12 (9 Jul 2008 02:44:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 9 Jul 2008 02:44:46 +0000 (UTC) Cc: emacs-devel@gnu.org To: "Juanma Barranquero" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jul 09 04:45: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 1KGPgM-0002Q8-0Q for ged-emacs-devel@m.gmane.org; Wed, 09 Jul 2008 04:45:26 +0200 Original-Received: from localhost ([127.0.0.1]:36167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KGPfU-0007so-Kc for ged-emacs-devel@m.gmane.org; Tue, 08 Jul 2008 22:44:32 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KGPfO-0007s1-Tk for emacs-devel@gnu.org; Tue, 08 Jul 2008 22:44:26 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KGPfO-0007rl-1t for emacs-devel@gnu.org; Tue, 08 Jul 2008 22:44:26 -0400 Original-Received: from [199.232.76.173] (port=37810 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KGPfN-0007rd-Ov for emacs-devel@gnu.org; Tue, 08 Jul 2008 22:44:25 -0400 Original-Received: from mx1.aist.go.jp ([150.29.246.133]:53830) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KGPfN-0004xu-2A for emacs-devel@gnu.org; Tue, 08 Jul 2008 22:44:25 -0400 Original-Received: from rqsmtp2.aist.go.jp (rqsmtp2.aist.go.jp [150.29.254.123]) by mx1.aist.go.jp with ESMTP id m692iIg1015550; Wed, 9 Jul 2008 11:44:19 +0900 (JST) env-from (handa@m17n.org) Original-Received: from smtp4.aist.go.jp by rqsmtp2.aist.go.jp with ESMTP id m692iIC5015020; Wed, 9 Jul 2008 11:44:18 +0900 (JST) env-from (handa@m17n.org) Original-Received: by smtp4.aist.go.jp with ESMTP id m692iENe018769; Wed, 9 Jul 2008 11:44:16 +0900 (JST) env-from (handa@m17n.org) Original-Received: from handa by etlken.m17n.org with local (Exim 4.69) (envelope-from ) id 1KGPfC-0005Vh-0e; Wed, 09 Jul 2008 11:44:14 +0900 In-reply-to: (lekktu@gmail.com) User-Agent: SEMI/1.14.3 (Ushinoya) FLIM/1.14.2 (Yagi-Nishiguchi) APEL/10.2 Emacs/23.0.60 (i686-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) X-detected-kernel: by monty-python.gnu.org: Solaris 9 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:100473 Archived-At: In article , "Juanma Barranquero" writes: > Has this one been forgotten? No, but I haven't had a time to work on it. As I've just committed a change about font selection, I started to work on it. I've just installed the latest Emacs on Windows with cygwin, and done this: > 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: But, I can't reproduce the bug. The diff of the step 4 above shows only the entry I added. What was the coding system of your ChangeLog file when you first visitted it? --- Kenichi Handa handa@ni.aist.go.jp > On Wed, Jun 11, 2008 at 17:56, Juanma Barranquero wrote: > > On Wed, Jun 11, 2008 at 06:42, dhruva wrote: > > >>> Same here, I kept quiet as I am using GIT and thought I had messed >>> around with something! >>> >>> On Wed, Jun 11, 2008 at 6:13 AM, Lennart Borgman (gmail) >>> wrote: >>>> I see a lot of ^M in the info files on w32, CVS from today. For example in >>>> these files > > > > Apparently related to these changes: > > > > 2008-06-05 Kenichi Handa > > > > * coding.c (detect_coding): Fix previous change. > > (detect_coding_system): Likewise. > > > > 2008-06-04 Kenichi Handa > > > > * coding.c (detect_coding): Fix handling of coding->head_ascii. > > Be sure to call setup_coding_system when we find a proper coding system. > > (detect_coding_system): Fix handling of coding->head_ascii. > > > > Removing them fixes the problem for me. > > > > Juanma