添加链接
link之家
链接快照平台
  • 输入网页链接,自动生成快照
  • 标签化管理网页链接
相关文章推荐
温暖的凉面  ·  java ...·  1 年前    · 
魁梧的机器人  ·  centos关闭5353端口·  2 年前    · 

^M in git diff on Ubuntu #2330

@techtonik

Description

I've edited a file with Spyder and now git diff shows red ^M at the end of lines. I am pretty sure that spyderlib/spyder.py has Windows line feeds (why?) and that Spyder shows CRLF mode.

Why the marks? git 1.9.1

diff --git a/spyderlib/spyder.py b/spyderlib/spyder.py
index ddff947..6560250 100644
--- a/spyderlib/spyder.py
+++ b/spyderlib/spyder.py
@@ -2738,6 +2738,15 @@ def initialize():
     return app
+# --- Generic Plugin API^M
+class SpyderWeb(object):^M
+    """^M
+    Wiring internal Spyder components together^M
+    """^M
+    appname = 'spyder'^M
+    version = __version__^M
+    plugins = []^M
 class Spy(object):
@@ -2756,6 +2765,8 @@ class Spy(object):
     def versions(self):
         return get_versions()
+# --/ Generic Plugin API^M
+^M