diff options
| author | Patrick Totzke <patricktotzke@gmail.com> | 2012-03-28 21:46:15 +0100 |
|---|---|---|
| committer | Patrick Totzke <patricktotzke@gmail.com> | 2012-03-28 21:46:15 +0100 |
| commit | 70ecb1582fa90abb437314242bb13c50d4dd9d96 (patch) | |
| tree | a5034ae474b4ad8dc0b46e3174de2706d24c0bc5 | |
| parent | 2cb5996bc6cea048b981ea26bdfe90d8ae7dcd60 (diff) | |
| parent | d8e649ab68996452cfae1318e1df2fcf1464fd9d (diff) | |
Merge branch '0.3-fix-spawn-416' into staging
| -rw-r--r-- | alot/commands/globals.py | 7 | ||||
| -rw-r--r-- | alot/defaults/alot.rc.spec | 1 | ||||
| -rw-r--r-- | docs/source/configuration/alotrc_table.rst | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/alot/commands/globals.py b/alot/commands/globals.py index f99aec25..a94db360 100644 --- a/alot/commands/globals.py +++ b/alot/commands/globals.py @@ -210,16 +210,13 @@ class EditCommand(ExternalCommand): """ :param path: path to the file to be edited :type path: str - :param spawn: run command in a new terminal + :param spawn: force running edtor in a new terminal :type spawn: bool :param thread: run asynchronously, don't block alot :type thread: bool """ self.path = path - if spawn != None: - self.spawn = spawn - else: - self.spawn = settings.get('editor_spawn') + self.spawn = settings.get('editor_spawn') or spawn if thread != None: self.thread = thread else: diff --git a/alot/defaults/alot.rc.spec b/alot/defaults/alot.rc.spec index b3927844..0491c0d7 100644 --- a/alot/defaults/alot.rc.spec +++ b/alot/defaults/alot.rc.spec @@ -51,6 +51,7 @@ editor_cmd = string(default=None) editor_writes_encoding = string(default='UTF-8') # use terminal_command to spawn a new terminal for the editor? +# equivalent to always providing the `--spawn` parameter to compose/edit commands editor_spawn = boolean(default=False) # call editor in separate thread. diff --git a/docs/source/configuration/alotrc_table.rst b/docs/source/configuration/alotrc_table.rst index e776a837..857a3865 100644 --- a/docs/source/configuration/alotrc_table.rst +++ b/docs/source/configuration/alotrc_table.rst @@ -130,6 +130,7 @@ .. describe:: editor_spawn use terminal_command to spawn a new terminal for the editor? + equivalent to always providing the `--spawn` parameter to compose/edit commands :type: boolean :default: False |