Merge branch 'master' into themes

rtv/page.py

@@ -391,7 +391,9 @@ class Page(object):
         else:
             title = sub_name
 
-        if os.getenv('DISPLAY'):
+        # Setting the terminal title will break emacs or systems without
+        # X window.
+        if os.getenv('DISPLAY') and not os.getenv('INSIDE_EMACS'):
             title += ' - rtv {0}'.format(__version__)
             title = self.term.clean(title)
             if six.PY3: