diff options
| author | hut <hut@lavabit.com> | 2011-10-24 01:56:01 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2011-10-24 01:56:01 +0200 |
| commit | 989013dcb7fcd9ff5d03608283acd8da27ca3238 (patch) | |
| tree | b29534ec5b1185581596fee058c79d5dbc8afab2 | |
| parent | 98f6125513be5b83814a5b1894014bccd3edd547 (diff) | |
| parent | 7ab36832af358bc6564e834549166b67927ebc84 (diff) | |
| download | ranger-989013dcb7fcd9ff5d03608283acd8da27ca3238.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | doc/ranger.1 | 2 | ||||
| -rw-r--r-- | ranger/__init__.py | 2 | ||||
| -rw-r--r-- | ranger/gui/curses_shortcuts.py | 18 | ||||
| -rw-r--r-- | ranger/gui/widgets/console.py | 4 |
6 files changed, 19 insertions, 13 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1da6d855..f2e14831 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ This log documents changes between stable versions. +2011-10-23: Version 1.5.2 +* Fixed graphical bug that appears in certian cases when drawing + characters at the right edge. + 2011-10-23: Version 1.5.1 * Added fm.select_file(path) * Added --choosefiles option (like --choosefile, but chooses multiple files) diff --git a/README b/README index c5bed949..84bf30a3 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -ranger v.1.5.1 +ranger v.1.5.2 ============== ranger is a console file manager with VI key bindings. It provides a minimalistic and nice curses interface with a view on the directory hierarchy. diff --git a/doc/ranger.1 b/doc/ranger.1 index 45c420fd..e9f00501 100644 --- a/doc/ranger.1 +++ b/doc/ranger.1 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "RANGER 1" -.TH RANGER 1 "ranger-1.5.1" "10/24/2011" "ranger manual" +.TH RANGER 1 "ranger-1.5.2" "10/24/2011" "ranger manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/ranger/__init__.py b/ranger/__init__.py index 487145b2..df759dc8 100644 --- a/ranger/__init__.py +++ b/ranger/__init__.py @@ -25,7 +25,7 @@ import os # Information __license__ = 'GPL3' -__version__ = '1.5.1' +__version__ = '1.5.2' __author__ = __maintainer__ = 'Roman Zimbelmann' __email__ = 'romanz@lavabit.com' diff --git a/ranger/gui/curses_shortcuts.py b/ranger/gui/curses_shortcuts.py index 4a3bb4b9..10a159a1 100644 --- a/ranger/gui/curses_shortcuts.py +++ b/ranger/gui/curses_shortcuts.py @@ -39,19 +39,21 @@ class CursesShortcuts(SettingsAware): try: self.win.addstr(*args) except: - try: - self.win.addstr(*_fix_surrogates(args)) - except: - pass + if len(args) > 1: + try: + self.win.addstr(*_fix_surrogates(args)) + except: + pass def addnstr(self, *args): try: self.win.addnstr(*args) except: - try: - self.win.addnstr(*_fix_surrogates(args)) - except: - pass + if len(args) > 2: + try: + self.win.addnstr(*_fix_surrogates(args)) + except: + pass def addch(self, *args): try: diff --git a/ranger/gui/widgets/console.py b/ranger/gui/widgets/console.py index 406a2fe9..2376ba5a 100644 --- a/ranger/gui/widgets/console.py +++ b/ranger/gui/widgets/console.py @@ -79,9 +79,9 @@ class Console(Widget): line = WideString(self.line) overflow = -self.wid + len(self.prompt) + len(line) + 1 if overflow > 0: - self.addstr(str(line[overflow:])) + self.addstr(0, len(self.prompt), str(line[overflow:])) else: - self.addstr(self.line) + self.addstr(0, len(self.prompt), self.line) def finalize(self): try: |