9 Jul 04:44
Re: ^M in the info files
Kenichi Handa <handa <at> m17n.org>
2008-07-09 02:44:14 GMT
2008-07-09 02:44:14 GMT
In article <f7ccd24b0807081851j30dd8a61p4f1926dd740f033b <at> mail.gmail.com>, "Juanma Barranquero" <lekktu <at> gmail.com> 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 <ENTER> ^M^J <ENTER> ^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 <at> ni.aist.go.jp > On Wed, Jun 11, 2008 at 17:56, Juanma Barranquero <lekktu <at> gmail.com> wrote: > > On Wed, Jun 11, 2008 at 06:42, dhruva <dhruvakm <at> gmail.com> 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) >>> <lennart.borgman <at> gmail.com> 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 <handa <at> m17n.org> > > > > * coding.c (detect_coding): Fix previous change. > > (detect_coding_system): Likewise. > > > > 2008-06-04 Kenichi Handa <handa <at> m17n.org> > > > > * 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
RSS Feed