summary refs log tree commit diff stats
diff options
context:
space:
mode:
authortoonn <toonn@toonn.io>2018-05-08 23:48:57 +0200
committertoonn <toonn@toonn.io>2018-05-08 23:48:57 +0200
commiteb46dc7569d0341198e7cd2ce649c00716d02790 (patch)
treea6671d5bf123d2b57856724bc75e69046088810a
parentcba11af4181723334c25edb12e6ff0e4ec641cb5 (diff)
parentb8a2311bd72f39d2adf4bc0c365c3c22e0ec3897 (diff)
downloadranger-eb46dc7569d0341198e7cd2ce649c00716d02790.tar.gz
Merge branch 'tmuxtitle'
-rw-r--r--examples/rc_emacs.conf2
-rw-r--r--ranger/config/rc.conf2
-rw-r--r--ranger/gui/ui.py6
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/rc_emacs.conf b/examples/rc_emacs.conf
index 26074a42..8924d1d6 100644
--- a/examples/rc_emacs.conf
+++ b/examples/rc_emacs.conf
@@ -129,7 +129,7 @@ set display_tags_in_all_columns true
 set update_title false
 
 # Set the title to "ranger" in the tmux program?
-set update_tmux_title false
+set update_tmux_title true
 
 # Shorten the title if it gets long?  The number defines how many
 # directories are displayed at once, 0 turns off this feature.
diff --git a/ranger/config/rc.conf b/ranger/config/rc.conf
index 3aac8dfd..ce0240c6 100644
--- a/ranger/config/rc.conf
+++ b/ranger/config/rc.conf
@@ -145,7 +145,7 @@ set display_tags_in_all_columns true
 set update_title false
 
 # Set the title to "ranger" in the tmux program?
-set update_tmux_title false
+set update_tmux_title true
 
 # Shorten the title if it gets long?  The number defines how many
 # directories are displayed at once, 0 turns off this feature.
diff --git a/ranger/gui/ui.py b/ranger/gui/ui.py
index 990db0ad..4f76dfab 100644
--- a/ranger/gui/ui.py
+++ b/ranger/gui/ui.py
@@ -113,7 +113,7 @@ class UI(  # pylint: disable=too-many-instance-attributes,too-many-public-method
             self._draw_title = curses.tigetflag('hs')  # has_status_line
 
             # Save tmux setting `automatic-rename`
-            if self.settings.update_tmux_title:
+            if self.settings.update_tmux_title and 'TMUX' in os.environ:
                 try:
                     self._tmux_automatic_rename = check_output(
                         ['tmux', 'show-window-options', '-v', 'automatic-rename']).strip()
@@ -123,7 +123,7 @@ class UI(  # pylint: disable=too-many-instance-attributes,too-many-public-method
         self.update_size()
         self.is_on = True
 
-        if self.settings.update_tmux_title:
+        if self.settings.update_tmux_title and 'TMUX' in os.environ:
             sys.stdout.write("\033kranger\033\\")
             sys.stdout.flush()
 
@@ -172,7 +172,7 @@ class UI(  # pylint: disable=too-many-instance-attributes,too-many-public-method
         DisplayableContainer.destroy(self)
 
         # Restore tmux setting `automatic-rename`
-        if self.settings.update_tmux_title:
+        if self.settings.update_tmux_title and 'TMUX' in os.environ:
             if self._tmux_automatic_rename:
                 try:
                     check_output(['tmux', 'set-window-option',