summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lepus.uberspace.de>2016-11-04 14:52:19 -0400
committerhut <hut@lepus.uberspace.de>2016-11-04 14:52:19 -0400
commit4d51544a0b5d9172db207944f19ac83150173713 (patch)
treee19f6ab9373562e28c9f7cf664d6c7b9336fc9e0 /ranger
parent612e890af2037f5bb283c636d7f865902c8c9188 (diff)
parent811e8fe58ad5038bddbdac96c0c3cde4e4f7d5e3 (diff)
downloadranger-4d51544a0b5d9172db207944f19ac83150173713.tar.gz
Merge branch 'windows_line_endings' of https://github.com/richboss/ranger
Diffstat (limited to 'ranger')
-rw-r--r--ranger/gui/widgets/pager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ranger/gui/widgets/pager.py b/ranger/gui/widgets/pager.py
index 58b791cd..0c81079b 100644
--- a/ranger/gui/widgets/pager.py
+++ b/ranger/gui/widgets/pager.py
@@ -231,7 +231,7 @@ class Pager(Widget):
                     line = ansi.char_slice(line, startx, self.wid) + ansi.reset
                 else:
                     line = line[startx:self.wid + startx]
-                yield line.rstrip()
+                yield line.rstrip().replace('\r\n', '\n')
             except IndexError:
                 raise StopIteration
             i += 1