blocks|key|1178096|text|在git-config中，将core.autocrlf设置为true，以使git自动为您的平台正确转换行尾，例如，针对全局设置运行以下命令：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1178097|git+config+--global+core.autocrlf+true|code-block|syntax|javascript|1178098|entityMap|0|LINK|mutability|MUTABLE|url|http://git-scm.com/docs/git-config^0|E|D|U|4|1|A|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@$9|T|A|U|B|C]|$9|V|A|W|B|C]]|D|@$9|X|A|Y|1|Z]]|E|$]]|$1|F|3|G|5|H|7|10|8|@]|D|@]|E|$I|J]]|$1|K|3|-4|5|6|7|11|8|@]|D|@]|E|$]]]|L|$M|$5|N|O|P|E|$Q|R]]]]

In <a href="http://git-scm.com/docs/git-config" rel="noreferrer">git-config</a>, set <code>core.autocrlf</code> to <code>true</code> to make git automatically convert line endings correctly for your platform, e.g. run this command for a global setting:

<pre><code>git config --global core.autocrlf true
</code></pre>

blocks|key|1393541|text|Someone+is+not+converting+their+line-ending+characters+correctly。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1393542|我猜是Windows的人，因为他们喜欢他们的CRLF。Unix喜欢LF，Mac喜欢CR，直到它以Unix的方式展示出来。|1393543|entityMap|0|LINK|mutability|MUTABLE|url|http://aruljohn.com/info/ctrlm/^0|0|1S|0|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@$A|O|B|P|1|Q]]|C|$]]|$1|D|3|E|5|6|7|R|8|@]|9|@]|C|$]]|$1|F|3|-4|5|6|7|S|8|@]|9|@]|C|$]]]|G|$H|$5|I|J|K|C|$L|M]]]]

<a href="http://aruljohn.com/info/ctrlm/" rel="noreferrer">Someone is not converting their line-ending characters correctly</a>.

I assume it's the Windows folk as they love their CRLF. Unix loves LF and Mac loved CR until it was shown the Unix way.

blocks|key|1393985|text|要使%5EM在git中消失，请键入：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1393986|git+config+--global+core.whitespace+cr-at-eol|code-block|syntax|javascript|1393987|致词：https://lostechies.com/keithdahlby/2011/04/06/windows-git-tip-hide-carriage-return-in-diff/|offset|length|1393988|entityMap|0|LINK|mutability|MUTABLE|url|https://lostechies.com/keithdahlby/2011/04/06/windows-git-tip-hide-carriage-return-in-diff/^0|0|0|3|2J|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|U|8|@]|9|@$I|V|J|W|1|X]]|A|$]]|$1|K|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]]|L|$M|$5|N|O|P|A|$Q|R]]]]

To make the ^M disappear in git, type:

<pre><code>git config --global core.whitespace cr-at-eol
</code></pre>

Credits:
<a href="https://lostechies.com/keithdahlby/2011/04/06/windows-git-tip-hide-carriage-return-in-diff/" rel="noreferrer">https://lostechies.com/keithdahlby/2011/04/06/windows-git-tip-hide-carriage-return-in-diff/</a>

blocks|key|1393801|text|除了查询替换，您还可以使用M-x+delete-trailing-whitespace|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1393802|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

instead of query-replace you may also use
M-x delete-trailing-whitespace

blocks|key|1178293|text|将以下内容放入你的~/.emacs中(或等效)|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1178294|(defun+dos2unix+()
++"Replace+DOS+eolns+CR+LF+with+Unix+eolns+CR"
++(interactive)
++++(goto-char+(point-min))
++++++(while+(search-forward+"\r"+nil+t)+(replace-match+"")))|code-block|syntax|javascript|1178295|然后你就可以简单地使用M-x+dos2unix了。|1178296|entityMap^0|9|8|0|0|B|C|0^^$0|@$1|2|3|4|5|6|7|O|8|@$9|P|A|Q|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|R|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|S|8|@$9|T|A|U|B|C]]|D|@]|E|$]]|$1|M|3|-4|5|6|7|V|8|@]|D|@]|E|$]]]|N|$]]

Pot the following in your <code>~/.emacs</code> (or eqiuvalent)

<pre><code>(defun dos2unix ()
 "Replace DOS eolns CR LF with Unix eolns CR"
 (interactive)
 (goto-char (point-min))
 (while (search-forward "\r" nil t) (replace-match "")))
</code></pre>

and then you would be able to simply use <code>M-x dos2unix</code>.

blocks|key|1178159|text|Emacs中行末尾的%5EM表示回车(\r)后跟换行符(\n)。如果一个人在Windows上编辑文件(其中行尾是回车符和换行符的组合)，而您在Unix或Linux中编辑(其中行尾只是一个换行符)，您经常会看到这种情况。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1178160|字符的组合通常是无害的。如果你正在使用源代码控制，你可以配置文本文件签入格式，这样就可以神奇地为你调整代码行了。或者，您也可以使用签入和签出触发器，它们将自动为您“修复”文件。或者，您可以只使用dos2unix之类的工具来手动调整。|1178161|entityMap|0|LINK|mutability|MUTABLE|url|http://linuxcommand.org/man_pages/dos2unix1.html^0|A|2|0|2P|8|0|0^^$0|@$1|2|3|4|5|6|7|P|8|@$9|Q|A|R|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|S|8|@]|D|@$9|T|A|U|1|V]]|E|$]]|$1|H|3|-4|5|6|7|W|8|@]|D|@]|E|$]]]|I|$J|$5|K|L|M|E|$N|O]]]]

<code>^M</code> at the end of line in Emacs is indicating a carriage return (\r) followed by a line feed (\n). You'll often see this if one person edits files on Windows (where end of line is the combination of carriage return and newline characters) and you edit in Unix or Linux (where end of line is only a newline character).

The combination of characters is usually not harmful. If you're using source control, you may be able to configure the text file checkin format so that lines are magically adjusted for you. Alternatively, you may be able to use checkin and checkout triggers that will automatically "fix" the files for you. Or, you might just use a tool like <a href="http://linuxcommand.org/man_pages/dos2unix1.html" rel="nofollow noreferrer">dos2unix</a> to manually adjust things.

blocks|key|1393757|text|正如每个人都提到的。这是不同的行尾样式。MacOSX使用Unix行结尾-即LF+(换行符)。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1393758|Windows同时使用CR+(回车)和LF+(换行符)作为行尾。由于你同时使用windows和mac，这就是问题的根源。|1393759|如果您在windows中创建了一个文件，然后将其带到mac上，您可能会在行尾看到这些%5EM字符。|1393760|如果你想删除它们，你可以在emacs中很容易的做到。只需突出显示并复制%5EM字符，然后执行查询-将%5EM替换为，即可完成。|1393761|编辑:其他一些可能会有帮助的链接。http://xahlee.org/emacs/emacs_adv_tips.html|offset|length|1393762|这将帮助您配置emacs以使用特定类型的行尾样式。http://www.emacswiki.org/emacs/EndOfLineTips|1393763|entityMap|0|LINK|mutability|MUTABLE|url|http://xahlee.org/emacs/emacs_adv_tips.html|1|http://www.emacswiki.org/emacs/EndOfLineTips^0|0|0|0|0|H|17|0|0|P|18|1|0^^$0|@$1|2|3|4|5|6|7|X|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Y|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|Z|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|10|8|@]|9|@]|A|$]]|$1|H|3|I|5|6|7|11|8|@]|9|@$J|12|K|13|1|14]]|A|$]]|$1|L|3|M|5|6|7|15|8|@]|9|@$J|16|K|17|1|18]]|A|$]]|$1|N|3|-4|5|6|7|19|8|@]|9|@]|A|$]]]|O|$P|$5|Q|R|S|A|$T|U]]|V|$5|Q|R|S|A|$T|W]]]]

As everyone has mentioned. It's different line ending style.
MacOSX uses Unix line endings - i.e. LF (line feed).

Windows uses both CR (carriage return) &amp; LF (line feed) as a line ending. 
Since you're using both windows and mac thats where the problem stems from.

If you create a file in windows and then bring it onto the mac you might see these ^M characters at the end of the lines.

If you want to remove them you can do this very easily in emacs. Just highlight and copy the ^M character and do a query-replace ^M with and you'e done.

EDIT:
Some other links that may be of help.
<a href="http://xahlee.org/emacs/emacs_adv_tips.html" rel="nofollow noreferrer">http://xahlee.org/emacs/emacs_adv_tips.html</a>

This one helps you configure emacs to use a particular type of line-ending style. 
<a href="http://www.emacswiki.org/emacs/EndOfLineTips" rel="nofollow noreferrer">http://www.emacswiki.org/emacs/EndOfLineTips</a>

blocks|key|1393887|text|前段时间我遇到了这个问题。%5EM代表一个回车符，在Ctrl-Q+Ctrl-M上搜索(这将创建一个文字%5EM)将允许您在Emacs中获得此字符的句柄。我按照以下思路做了一些事情：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1393888|M-x+replace-string+[ENTER]+C-q+C-m+[ENTER]+\n+[ENTER]|code-block|syntax|javascript|1393889|entityMap^0|O|D|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@$9|N|A|O|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|P|8|@]|D|@]|E|$I|J]]|$1|K|3|-4|5|6|7|Q|8|@]|D|@]|E|$]]]|L|$]]

I ran into this issue a while back. The ^M represents a Carriage Return, and searching on <code>Ctrl-Q Ctrl-M</code> (This creates a literal ^M) will allow you get a handle on this character within Emacs. I did something along these lines:

<pre><code>M-x replace-string [ENTER] C-q C-m [ENTER] \n [ENTER]
</code></pre>

blocks|key|1394067|text|如果您的系统上没有安装dos2unix实用程序，您可以创建自己的实用程序来删除Windows字符：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1394068|vi+~/dos2unix.bash:|code-block|syntax|javascript|1394069|包含以下内容|1394070|#!/bin/bash
tr+-d+'\r'+<+$1+>+repl.tmp
mv+-f+repl.tmp+$1|1394071|在~/.bashrc中，添加以下行：|1394072|alias+'dos2unix=~/dos2unix.bash'|1394073|正在申请|1394074|dos2unix+file_from_PC.txt|1394075|将删除以file_from_PC.txt结尾的%5EM个字符。您可以使用cat来检查您是否具有这些功能：|1394076|cat+-v+file_from_PC.txt|1394077|entityMap^0|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|Z|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|10|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|11|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|12|8|@]|9|@]|A|$]]|$1|M|3|N|5|D|7|13|8|@]|9|@]|A|$E|F]]|$1|O|3|P|5|6|7|14|8|@]|9|@]|A|$]]|$1|Q|3|R|5|D|7|15|8|@]|9|@]|A|$E|F]]|$1|S|3|T|5|6|7|16|8|@]|9|@]|A|$]]|$1|U|3|V|5|D|7|17|8|@]|9|@]|A|$E|F]]|$1|W|3|-4|5|6|7|18|8|@]|9|@]|A|$]]]|X|$]]

If you don't have dos2unix utility installed on your system, you can create your own to get rid of Windows endline characters:

<pre><code>vi ~/dos2unix.bash:
</code></pre>

with the following content

<pre><code>#!/bin/bash
tr -d '\r' &lt; $1 &gt; repl.tmp
mv -f repl.tmp $1
</code></pre>

In your ~/.bashrc, add the line:

<pre><code>alias 'dos2unix=~/dos2unix.bash'
</code></pre>

Applying 

<pre><code>dos2unix file_from_PC.txt
</code></pre>

will remove ^M characters at lines ends in file_from_PC.txt. You can check if you have those or not by using cat:

<pre><code>cat -v file_from_PC.txt
</code></pre>

blocks|key|1393942|text|另请参阅：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1393943|Hiding+%5EM+in+emacs|offset|length|1393944|如果您选择删除%5EM个字符并重新提交给您的团队，请务必小心。之后，他们可能会看到没有回车符的文件。|1393945|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/730751/hiding-m-in-emacs^0|0|0|I|0|0|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Q|8|@]|9|@$D|R|E|S|1|T]]|A|$]]|$1|F|3|G|5|6|7|U|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|I|$J|$5|K|L|M|A|$N|O]]]]

See also:

<a href="https://stackoverflow.com/questions/730751/hiding-m-in-emacs">Hiding ^M in emacs</a>

Be careful if you choose to remove the ^M characters and resubmit to your team. They may see a file without carriage returns afterward.

blocks|key|1178646|text|最直接的获取%5EMs的方法之一，只需使用emacs命令一行：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1178647|++++C-x+h+C-u+M-%7C+dos2unix++++|code-block|syntax|javascript|1178648|分析：|1178649|++++C-x+h:+select+current+buffer
++++C-u:+apply+following+command+as+a+filter,+redirecting+its+output+to+replace+current+buffer
++++M-%7C+dos2unix:+performs+`dos2unix`+[current+buffer]|1178650|*nix平台具有开箱即用的dos2unix实用程序，包括Mac+(带有brew)。在Windows下，它也被广泛使用(MSYS2，Cygwin，user-contributed，等等)。|offset|length|style|CODE|1178651|entityMap|0|LINK|mutability|MUTABLE|url|https://waterlan.home.xs4all.nl/dos2unix.html^0|0|0|0|0|D|8|Z|4|20|G|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|Z|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|10|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|11|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|12|8|@$M|13|N|14|O|P]|$M|15|N|16|O|P]]|9|@$M|17|N|18|1|19]]|A|$]]|$1|Q|3|-4|5|6|7|1A|8|@]|9|@]|A|$]]]|R|$S|$5|T|U|V|A|$W|X]]]]

One of the most straightforward ways of gettings rid of ^Ms with just an emacs command one-liner:
<pre><code> C-x h C-u M-| dos2unix 
</code></pre>
Analysis:
<pre><code> C-x h: select current buffer
 C-u: apply following command as a filter, redirecting its output to replace current buffer
 M-| dos2unix: performs `dos2unix` [current buffer]
</code></pre>
*nix platforms have the <code>dos2unix</code> utility out-of-the-box, including Mac (with <code>brew</code>). Under Windows, it is widely available too (MSYS2, Cygwin, <a href="https://waterlan.home.xs4all.nl/dos2unix.html" rel="nofollow noreferrer">user-contributed</a>, among others).

blocks|key|1394127|text|我的解决方案是使用在此Emacs+Wiki+Article中找到的以下elisp函数。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1394128|+(defun+dos2unix+()
++++++"Not+exactly+but+it's+easier+to+remember"
++++++(interactive)
++++++(set-buffer-file-coding-system+'unix+'t)+)|code-block|syntax|javascript|1394129|在缓冲区上执行函数M-x+dos2unix并保存文件，所有的%5EM都会消失。|style|CODE|1394130|entityMap|0|LINK|mutability|MUTABLE|url|https://www.emacswiki.org/emacs/DosToUnix^0|B|I|0|0|0|9|C|U|2|0^^$0|@$1|2|3|4|5|6|7|U|8|@]|9|@$A|V|B|W|1|X]]|C|$]]|$1|D|3|E|5|F|7|Y|8|@]|9|@]|C|$G|H]]|$1|I|3|J|5|6|7|Z|8|@$A|10|B|11|K|L]|$A|12|B|13|K|L]]|9|@]|C|$]]|$1|M|3|-4|5|6|7|14|8|@]|9|@]|C|$]]]|N|$O|$5|P|Q|R|C|$S|T]]]]

The solution for me was to use the following elisp function found in this <a href="https://www.emacswiki.org/emacs/DosToUnix" rel="nofollow noreferrer">Emacs Wiki Article</a>.

<pre><code> (defun dos2unix ()
 "Not exactly but it's easier to remember"
 (interactive)
 (set-buffer-file-coding-system 'unix 't) )
</code></pre>

Execute the function <code>M-x dos2unix</code> on the buffer and save the file, all <code>^M</code> will disappear.

So I think it may have to do with textmate, but we work in a small team and are having some issues with full-file conflicts of nearly identical files in git because each line of one branch has a ^M appended to it.

What is this mysterious <code>^M</code> character supposed to do, and where could it be coming from? 

Our developers use emacs on Windows/Mac, TextMate on Mac, coda on Mac, and occasionally the wp-admin text editor.

Anybody ever have this issue stemming from one of those?

What are these ^M's that keep showing up in my files in emacs?

Windows

Linux

Unix

所以我认为这可能与textmate有关，但我们在一个小团队中工作，在git中遇到了一些几乎相同的文件的全文件冲突问题，因为一个分支的每一行都附加了^M。这个神秘的^M角色应该做什么，它可能来自哪里？我们的开发人员在Windows/Mac上使用emacs，在Mac上使用TextMate，在Mac上使用coda，偶尔还使用wp-admin文本编辑器。有没有人因为这样的问题而遇到过这个问题？

问在我的emacs文件中不断显示的这些^M是什么？
EN

回答 12

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问在我的emacs文件中不断显示的这些^M是什么？EN

回答 12

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问在我的emacs文件中不断显示的这些^M是什么？
EN