diff options
| author | hut <hut@lavabit.com> | 2013-02-15 19:42:35 +0100 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2013-02-15 19:42:35 +0100 |
| commit | d4979d452e269113fb5edd0da3d47ce5ce5c5786 (patch) | |
| tree | ed953ca96b43e70d27c0b62e4348ca37dbac30b1 /ranger | |
| parent | a471b6e1a778112c857a10093c6ccf16070ed1e2 (diff) | |
| download | ranger-d4979d452e269113fb5edd0da3d47ce5ce5c5786.tar.gz | |
Revert "api.commands: add updated_line handler"
This reverts commit 8a516820081a317b85c6c2ced7901a4000130bf5. The commit introduced a feature that already existed; you can simply run fm.open_console() to change the current line. Conflicts: ranger/gui/widgets/console.py
Diffstat (limited to 'ranger')
| -rw-r--r-- | ranger/api/commands.py | 1 | ||||
| -rw-r--r-- | ranger/config/commands.py | 2 | ||||
| -rw-r--r-- | ranger/gui/widgets/console.py | 8 |
3 files changed, 2 insertions, 9 deletions
diff --git a/ranger/api/commands.py b/ranger/api/commands.py index 4250a5da..ce381e18 100644 --- a/ranger/api/commands.py +++ b/ranger/api/commands.py @@ -90,7 +90,6 @@ class Command(FileManagerAware): def __init__(self, line, quantifier=None): self.line = line - self.updated_line = line self.args = line.split() self.quantifier = quantifier try: diff --git a/ranger/config/commands.py b/ranger/config/commands.py index 4dce770f..7411face 100644 --- a/ranger/config/commands.py +++ b/ranger/config/commands.py @@ -40,8 +40,6 @@ # self.args: A list of all (space-separated) arguments to the command. # self.quantifier: If this command was mapped to the key "X" and # the user pressed 6X, self.quantifier will be 6. -# self.updated_line: The quick() method can overwrite this attribute and -# the console will use it as the new line. # self.arg(n): The n-th argument, or an empty string if it doesn't exist. # self.rest(n): The n-th argument plus everything that followed. For example, # If the command was "search foo bar a b c", rest(2) will be "bar a b c" diff --git a/ranger/gui/widgets/console.py b/ranger/gui/widgets/console.py index 23d4b861..10458a54 100644 --- a/ranger/gui/widgets/console.py +++ b/ranger/gui/widgets/console.py @@ -418,12 +418,8 @@ class Console(Widget): pass else: cmd = cls(self.line) - if cmd: - result = cmd.quick() - if self.allow_close: - self.line = cmd.updated_line - if result: - self.execute(cmd) + if cmd and cmd.quick(): + self.execute(cmd) def ask(self, text, callback, choices=['y', 'n']): """ |