diff options
| author | hut <hut@lavabit.com> | 2011-10-01 22:20:11 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2011-10-01 22:20:11 +0200 |
| commit | 524cbddab36206d3e6f13d50d30c2289bfcde722 (patch) | |
| tree | 76a8abd6dd39b7b0fedb9a869bc01513ed5c8618 | |
| parent | 180c06ffc85989f5911e1495ffd7cf13cd7da525 (diff) | |
| download | ranger-524cbddab36206d3e6f13d50d30c2289bfcde722.tar.gz | |
widgets.pager: fixed some problems with pager/embedded_pager
| -rw-r--r-- | ranger/api/commands.py | 15 | ||||
| -rw-r--r-- | ranger/defaults/commands.py | 2 | ||||
| -rw-r--r-- | ranger/gui/widgets/pager.py | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/ranger/api/commands.py b/ranger/api/commands.py index 759d4a37..9d2e60e9 100644 --- a/ranger/api/commands.py +++ b/ranger/api/commands.py @@ -265,7 +265,10 @@ class FunctionCommand(Command): if not self._based_function: return if len(self.args) == 1: - return self._based_function(**{'narg':self.quantifier}) + try: + return self._based_function(**{'narg':self.quantifier}) + except TypeError: + return self._based_function() args, keywords = list(), dict() for arg in self.args[1:]: @@ -293,6 +296,10 @@ class FunctionCommand(Command): try: return self._based_function(*args, **keywords) except TypeError: - self.fm.notify("Bad arguments for %s.%s: %s, %s" % - (self._object_name, self._function_name, - repr(args), repr(keywords)), bad=True) + try: + del keywords['narg'] + return self._based_function(*args, **keywords) + except TypeError: + self.fm.notify("Bad arguments for %s.%s: %s, %s" % + (self._object_name, self._function_name, + repr(args), repr(keywords)), bad=True) diff --git a/ranger/defaults/commands.py b/ranger/defaults/commands.py index 0db85115..0acfaa82 100644 --- a/ranger/defaults/commands.py +++ b/ranger/defaults/commands.py @@ -859,7 +859,7 @@ class pmap(map_): """:pmap <keysequence> <command> Maps a command to a keysequence in the "pager" context. """ - context = 'embedded_pager' + context = 'pager' class filter(Command): diff --git a/ranger/gui/widgets/pager.py b/ranger/gui/widgets/pager.py index 4b6a51de..a95d3254 100644 --- a/ranger/gui/widgets/pager.py +++ b/ranger/gui/widgets/pager.py @@ -109,7 +109,7 @@ class Pager(Widget): offset=-self.hei + 1) def press(self, key): - self.env.keymaps.use_keymap(self.embedded and 'embedded_pager' or 'pager') + self.env.keymaps.use_keymap('pager') self.fm.ui.press(key) def set_source(self, source, strip=False): |