Merge pull request #1673 from ZyX-I/other-default

Provide another default theme with less troublesome characters

docs/source/configuration/reference.rst

@@ -144,8 +144,8 @@ Common configuration is a subdictionary that is a value of ``common`` key in
 
 ``default_top_theme``
     String, determines which top-level theme will be used as the default. 
-    Defaults to ``powerline`` in unicode locales and ``ascii`` in non-unicode 
-    locales. See `Themes`_ section for more details.
+    Defaults to ``powerline_terminus`` in unicode locales and ``ascii`` in 
+    non-unicode locales. See `Themes`_ section for more details.
 
 Extension-specific configuration
 --------------------------------
@@ -331,6 +331,7 @@ powerline_unicode7          Theme with powerline dividers and unicode-7 symbols
 unicode                     Theme without any symbols from private use area
 unicode_terminus            Theme containing only symbols from terminus PCF font
 unicode_terminus_condensed  Like above, but occupies as less space as possible
+powerline_terminus          Like unicode_terminus, but with powerline symbols
 ascii                       Theme without any unicode characters at all
 ==========================  ====================================================
 

powerline/__init__.py

@@ -298,6 +298,18 @@ def create_logger(common_config, use_daemon_threads=True, ext='__unknown__',
 	return logger, pl, get_module_attr
 
 
+def get_default_theme(is_unicode=True):
+	'''Get default theme used by powerline
+
+	:param bool is_unicode:
+		If true, return theme for unicode environments, otherwise return theme 
+		that is supposed to be ASCII-only.
+
+	:return: theme name.
+	'''
+	return 'powerline_terminus' if is_unicode else 'ascii'
+
+
 def finish_common_config(encoding, common_config):
 	'''Add default values to common config and expand ~ in paths
 
@@ -309,10 +321,8 @@ def finish_common_config(encoding, common_config):
 		paths.
 	'''
 	encoding = encoding.lower()
-	if encoding.startswith('utf') or encoding.startswith('ucs'):
-		default_top_theme = 'powerline'
-	else:
-		default_top_theme = 'ascii'
+	default_top_theme = get_default_theme(
+		encoding.startswith('utf') or encoding.startswith('ucs'))
 
 	common_config = common_config.copy()
 	common_config.setdefault('default_top_theme', default_top_theme)

powerline/config_files/themes/powerline.json

@@ -117,10 +117,10 @@
 		},
 		"powerline.segments.vim.visual_range": {
 			"args": {
-				"CTRL_V_text": "{rows} × {vcols}",
-				"v_text_oneline": "C:{vcols}",
-				"v_text_multiline": "L:{rows}",
-				"V_text": "L:{rows}"
+				"CTRL_V_text": "↕{rows} ↔{vcols}",
+				"v_text_oneline": "↔{vcols}",
+				"v_text_multiline": "↕{rows}",
+				"V_text": "⇕{rows}"
 			}
 		},
 		"powerline.segments.vim.readonly_indicator": {

powerline/config_files/themes/powerline_terminus.json

@@ -0,0 +1,146 @@
+{
+	"dividers": {
+		"left": {
+			"hard": " ",
+			"soft": " "
+		},
+		"right": {
+			"hard": " ",
+			"soft": " "
+		}
+	},
+	"spaces": 1,
+	"segment_data": {
+		"branch": {
+			"before": " "
+		},
+		"stash": {
+			"before": "ST "
+		},
+		"cwd": {
+			"args": {
+				"ellipsis": "…"
+			}
+		},
+
+		"line_current_symbol": {
+			"contents": " "
+		},
+		"player": {
+			"args": {
+				"state_symbols": {
+					"fallback": "♫",
+					"play":     "▶",
+					"pause":    "▮▮",
+					"stop":     "■"
+				}
+			}
+		},
+
+		"time": {
+			"before": ""
+		},
+
+		"powerline.segments.common.net.network_load": {
+			"args": {
+				"recv_format": "⇓ {value:>8}",
+				"sent_format": "⇑ {value:>8}"
+			}
+		},
+		"powerline.segments.common.net.hostname": {
+			"before": " "
+		},
+		"powerline.segments.common.bat.battery": {
+			"args": {
+				"full_heart": "♥",
+				"empty_heart": "♥",
+				"online": "⚡︎",
+				"offline": " "
+			}
+		},
+		"powerline.segments.common.sys.uptime": {
+			"before": "↑  "
+		},
+		"powerline.segments.common.mail.email_imap_alert": {
+			"before": "MAIL "
+		},
+		"powerline.segments.common.env.virtualenv": {
+			"before": "(e) "
+		},
+		"powerline.segments.common.wthr.weather": {
+			"args": {
+				"icons": {
+					"day":           "DAY",
+					"blustery":      "WIND",
+					"rainy":         "RAIN",
+					"cloudy":        "CLOUDS",
+					"snowy":         "SNOW",
+					"stormy":        "STORM",
+					"foggy":         "FOG",
+					"sunny":         "SUN",
+					"night":         "NIGHT",
+					"windy":         "WINDY",
+					"not_available": "NA",
+					"unknown":       "UKN"
+				}
+			}
+		},
+		"powerline.segments.common.time.fuzzy_time": {
+			"args": {
+				"unicode_text": true
+			}
+		},
+
+		"powerline.segments.vim.mode": {
+			"args": {
+				"override": {
+					"n":  "NORMAL",
+					"no": "N·OPER",
+					"v":  "VISUAL",
+					"V":  "V·LINE",
+					"^V": "V·BLCK",
+					"s":  "SELECT",
+					"S":  "S·LINE",
+					"^S": "S·BLCK",
+					"i":  "INSERT",
+					"R":  "RPLACE",
+					"Rv": "V·RPLC",
+					"c":  "COMMND",
+					"cv": "VIM·EX",
+					"ce": "NRM·EX",
+					"r":  "PROMPT",
+					"rm": "-MORE-",
+					"r?": "CNFIRM",
+					"!":  "!SHELL"
+				}
+			}
+		},
+		"powerline.segments.vim.visual_range": {
+			"args": {
+				"CTRL_V_text": "↕{rows} ↔{vcols}",
+				"v_text_oneline": "↔{vcols}",
+				"v_text_multiline": "↕{rows}",
+				"V_text": "⇕{rows}"
+			}
+		},
+		"powerline.segments.vim.readonly_indicator": {
+			"args": {
+				"text": ""
+			}
+		},
+		"powerline.segments.vim.modified_indicator": {
+			"args": {
+				"text": "+"
+			}
+		},
+
+		"powerline.segments.i3wm.scratchpad": {
+			"args": {
+				"icons": {
+					"fresh": "●",
+					"changed": "○"
+				}
+			}
+		}
+	}
+}

powerline/config_files/themes/powerline_unicode7.json

@@ -131,10 +131,10 @@
 		},
 		"powerline.segments.vim.visual_range": {
 			"args": {
-				"CTRL_V_text": "{rows} × {vcols}",
-				"v_text_oneline": "C:{vcols}",
-				"v_text_multiline": "L:{rows}",
-				"V_text": "L:{rows}"
+				"CTRL_V_text": "↕{rows} ↔{vcols}",
+				"v_text_oneline": "↔{vcols}",
+				"v_text_multiline": "↕{rows}",
+				"V_text": "⇕{rows}"
 			}
 		},
 		"powerline.segments.vim.readonly_indicator": {

powerline/config_files/themes/unicode.json

@@ -117,10 +117,10 @@
 		},
 		"powerline.segments.vim.visual_range": {
 			"args": {
-				"CTRL_V_text": "{rows} × {vcols}",
-				"v_text_oneline": "C:{vcols}",
-				"v_text_multiline": "L:{rows}",
-				"V_text": "L:{rows}"
+				"CTRL_V_text": "↕{rows} ↔{vcols}",
+				"v_text_oneline": "↔{vcols}",
+				"v_text_multiline": "↕{rows}",
+				"V_text": "⇕{rows}"
 			}
 		},
 		"powerline.segments.vim.readonly_indicator": {

powerline/config_files/themes/unicode_terminus_condensed.json

@@ -119,9 +119,9 @@
 		"powerline.segments.vim.visual_range": {
 			"args": {
 				"CTRL_V_text": "{rows}×{vcols}",
-				"v_text_oneline": "C:{vcols}",
-				"v_text_multiline": "L:{rows}",
-				"V_text": "L:{rows}"
+				"v_text_oneline": "↔{vcols}",
+				"v_text_multiline": "↕{rows}",
+				"V_text": "⇕{rows}"
 			}
 		},
 		"powerline.segments.vim.readonly_indicator": {

tests/lib/config_mock.py

@@ -10,11 +10,15 @@ from functools import wraps
 
 from powerline.renderer import Renderer
 from powerline.lib.config import ConfigLoader
-from powerline import Powerline
+from powerline import Powerline, get_default_theme
 
 from tests.lib import Args, replace_attr
 
 
+UT = get_default_theme(is_unicode=True)
+AT = get_default_theme(is_unicode=False)
+
+
 class TestHelpers(object):
 	def __init__(self, config):
 		self.config = config

tests/test_config_merging.py

@@ -12,7 +12,7 @@ from powerline.lib.dict import mergedicts_copy as mdc
 from powerline import Powerline
 
 from tests import TestCase
-from tests.lib.config_mock import select_renderer
+from tests.lib.config_mock import select_renderer, UT
 
 
 CONFIG_DIR = 'tests/config'
@@ -88,7 +88,7 @@ main_tree = lambda: {
 	'1/colors': colors_config(),
 	'1/colorschemes/default': colorscheme_config(),
 	'1/themes/test/default': theme_config(),
-	'1/themes/powerline': top_theme_config(),
+	'1/themes/' + UT: top_theme_config(),
 	'1/themes/other1': mdc(top_theme_config(), {
 		'dividers': {
 			'left': {
@@ -193,10 +193,10 @@ class TestMerging(TestCase):
 
 	def test_top_theme_merging(self):
 		with WithConfigTree(mdc(main_tree(), {
-			'2/themes/powerline': {
+			'2/themes/' + UT: {
 				'spaces': 1,
 			},
-			'3/themes/powerline': {
+			'3/themes/' + UT: {
 				'dividers': {
 					'left': {
 						'hard': '>>',

tests/test_config_reload.py

@@ -6,7 +6,7 @@ from copy import deepcopy
 from functools import wraps
 
 from tests import TestCase
-from tests.lib.config_mock import get_powerline, add_watcher_events
+from tests.lib.config_mock import get_powerline, add_watcher_events, UT
 
 
 config = {
@@ -62,7 +62,7 @@ config = {
 			],
 		},
 	},
-	'themes/powerline': {
+	'themes/' + UT: {
 		'dividers': {
 			"left": {
 				"hard": ">>",
@@ -131,7 +131,7 @@ class TestConfigReload(TestCase):
 	def test_noreload(self, config):
 		with get_powerline(config, run_once=True) as p:
 			self.assertEqual(p.render(), '<1 2 1> s<2 4 False>>><3 4 4>g<4 False False>>><None None None>')
-			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/powerline', 'check:themes/test/__main__')
+			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/' + UT, 'check:themes/test/__main__')
 			config['config']['common']['spaces'] = 1
 			add_watcher_events(p, 'config', wait=False, interval=0.05)
 			# When running once thread should not start
@@ -143,7 +143,7 @@ class TestConfigReload(TestCase):
 	def test_reload_main(self, config):
 		with get_powerline(config, run_once=False) as p:
 			self.assertEqual(p.render(), '<1 2 1> s<2 4 False>>><3 4 4>g<4 False False>>><None None None>')
-			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/powerline', 'check:themes/test/__main__')
+			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/' + UT, 'check:themes/test/__main__')
 
 			config['config']['common']['default_top_theme'] = 'other'
 			add_watcher_events(p, 'config')
@@ -205,7 +205,7 @@ class TestConfigReload(TestCase):
 	def test_reload_unexistent(self, config):
 		with get_powerline(config, run_once=False) as p:
 			self.assertEqual(p.render(), '<1 2 1> s<2 4 False>>><3 4 4>g<4 False False>>><None None None>')
-			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/powerline', 'check:themes/test/__main__')
+			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/' + UT, 'check:themes/test/__main__')
 
 			config['config']['ext']['test']['colorscheme'] = 'nonexistentraise'
 			add_watcher_events(p, 'config')
@@ -242,7 +242,7 @@ class TestConfigReload(TestCase):
 	def test_reload_colors(self, config):
 		with get_powerline(config, run_once=False) as p:
 			self.assertEqual(p.render(), '<1 2 1> s<2 4 False>>><3 4 4>g<4 False False>>><None None None>')
-			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/powerline', 'check:themes/test/__main__')
+			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/' + UT, 'check:themes/test/__main__')
 
 			config['colors']['colors']['col1'] = 5
 			add_watcher_events(p, 'colors')
@@ -254,7 +254,7 @@ class TestConfigReload(TestCase):
 	def test_reload_colorscheme(self, config):
 		with get_powerline(config, run_once=False) as p:
 			self.assertEqual(p.render(), '<1 2 1> s<2 4 False>>><3 4 4>g<4 False False>>><None None None>')
-			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/powerline', 'check:themes/test/__main__')
+			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/' + UT, 'check:themes/test/__main__')
 
 			config['colorschemes/test/default']['groups']['str1']['bg'] = 'col3'
 			add_watcher_events(p, 'colorschemes/test/default')
@@ -266,24 +266,24 @@ class TestConfigReload(TestCase):
 	def test_reload_theme(self, config):
 		with get_powerline(config, run_once=False) as p:
 			self.assertEqual(p.render(), '<1 2 1> s<2 4 False>>><3 4 4>g<4 False False>>><None None None>')
-			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/powerline', 'check:themes/test/__main__')
+			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/' + UT, 'check:themes/test/__main__')
 
 			config['themes/test/default']['segments']['left'][0]['contents'] = 'col3'
 			add_watcher_events(p, 'themes/test/default')
 			self.assertEqual(p.render(), '<1 2 1> col3<2 4 False>>><3 4 4>g<4 False False>>><None None None>')
-			self.assertAccessEvents(p, 'themes/test/default', 'themes/powerline', 'check:themes/test/__main__')
+			self.assertAccessEvents(p, 'themes/test/default', 'themes/' + UT, 'check:themes/test/__main__')
 			self.assertEqual(p.logger._pop_msgs(), [])
 
 	@with_new_config
 	def test_reload_top_theme(self, config):
 		with get_powerline(config, run_once=False) as p:
 			self.assertEqual(p.render(), '<1 2 1> s<2 4 False>>><3 4 4>g<4 False False>>><None None None>')
-			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/powerline', 'check:themes/test/__main__')
+			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/' + UT, 'check:themes/test/__main__')
 
-			config['themes/powerline']['dividers']['left']['hard'] = '|>'
-			add_watcher_events(p, 'themes/powerline')
+			config['themes/' + UT]['dividers']['left']['hard'] = '|>'
+			add_watcher_events(p, 'themes/' + UT)
 			self.assertEqual(p.render(), '<1 2 1> s<2 4 False>|><3 4 4>g<4 False False>|><None None None>')
-			self.assertAccessEvents(p, 'themes/test/default', 'themes/powerline', 'check:themes/test/__main__')
+			self.assertAccessEvents(p, 'themes/test/default', 'themes/' + UT, 'check:themes/test/__main__')
 			self.assertEqual(p.logger._pop_msgs(), [])
 
 	@with_new_config
@@ -291,12 +291,12 @@ class TestConfigReload(TestCase):
 		config['config']['common']['interval'] = None
 		with get_powerline(config, run_once=False) as p:
 			self.assertEqual(p.render(), '<1 2 1> s<2 4 False>>><3 4 4>g<4 False False>>><None None None>')
-			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/powerline', 'check:themes/test/__main__')
+			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/' + UT, 'check:themes/test/__main__')
 
 			config['themes/test/default']['segments']['left'][0]['contents'] = 'col3'
 			add_watcher_events(p, 'themes/test/default', wait=False)
 			self.assertEqual(p.render(), '<1 2 1> col3<2 4 False>>><3 4 4>g<4 False False>>><None None None>')
-			self.assertAccessEvents(p, 'themes/test/default', 'themes/powerline', 'check:themes/test/__main__')
+			self.assertAccessEvents(p, 'themes/test/default', 'themes/' + UT, 'check:themes/test/__main__')
 			self.assertEqual(p.logger._pop_msgs(), [])
 			self.assertTrue(p._watcher._calls)
 
@@ -305,7 +305,7 @@ class TestConfigReload(TestCase):
 		config['config']['common']['interval'] = None
 		with get_powerline(config, run_once=True) as p:
 			self.assertEqual(p.render(), '<1 2 1> s<2 4 False>>><3 4 4>g<4 False False>>><None None None>')
-			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/powerline', 'check:themes/test/__main__')
+			self.assertAccessEvents(p, 'config', 'colors', 'check:colorschemes/default', 'check:colorschemes/test/__main__', 'colorschemes/test/default', 'themes/test/default', 'themes/' + UT, 'check:themes/test/__main__')
 
 			config['themes/test/default']['segments']['left'][0]['contents'] = 'col3'
 			add_watcher_events(p, 'themes/test/default', wait=False)

tests/test_configuration.py

@@ -10,7 +10,7 @@ from copy import deepcopy
 import tests.vim as vim_module
 
 from tests import TestCase
-from tests.lib.config_mock import get_powerline, get_powerline_raw, swap_attributes
+from tests.lib.config_mock import get_powerline, get_powerline_raw, swap_attributes, UT
 from tests.lib import Args, replace_item
 
 
@@ -114,7 +114,7 @@ config = {
 			],
 		},
 	},
-	'themes/powerline': {
+	'themes/' + UT: {
 		'dividers': {
 			'left': {
 				'hard': '>>',
@@ -362,9 +362,9 @@ class TestThemeHierarchy(TestRender):
 
 	@add_args
 	def test_no_powerline(self, p, config):
-		config['themes/test/__main__']['dividers'] = config['themes/powerline']['dividers']
+		config['themes/test/__main__']['dividers'] = config['themes/' + UT]['dividers']
 		config['themes/test/__main__']['spaces'] = 1
-		del config['themes/powerline']
+		del config['themes/' + UT]
 		self.assertRenderEqual(p, '{121} s {24}>>{344}g {34}>{34}<{344} f {--}')
 		self.assertEqual(p.logger._pop_msgs(), [])
 
@@ -380,19 +380,19 @@ class TestThemeHierarchy(TestRender):
 
 	@add_args
 	def test_only_default(self, p, config):
-		config['themes/test/default']['dividers'] = config['themes/powerline']['dividers']
+		config['themes/test/default']['dividers'] = config['themes/' + UT]['dividers']
 		config['themes/test/default']['spaces'] = 1
 		del config['themes/test/__main__']
-		del config['themes/powerline']
+		del config['themes/' + UT]
 		self.assertRenderEqual(p, '{121} s {24}>>{344}g {34}>{34}<{344} f {--}')
 
 	@add_args
 	def test_only_main(self, p, config):
 		del config['themes/test/default']
-		del config['themes/powerline']
+		del config['themes/' + UT]
 		self.assertRenderEqual(p, 'themes/test/default')
 		self.assertEqual(p.logger._pop_msgs(), [
-			'exception:test:powerline:Failed to load theme: themes/powerline',
+			'exception:test:powerline:Failed to load theme: themes/' + UT,
 			'exception:test:powerline:Failed to load theme: themes/test/default',
 			'exception:test:powerline:Failed to create renderer: themes/test/default',
 			'exception:test:powerline:Failed to render: themes/test/default',
@@ -413,11 +413,11 @@ class TestThemeHierarchy(TestRender):
 	@add_args
 	def test_nothing(self, p, config):
 		del config['themes/test/default']
-		del config['themes/powerline']
+		del config['themes/' + UT]
 		del config['themes/test/__main__']
 		self.assertRenderEqual(p, 'themes/test/default')
 		self.assertEqual(p.logger._pop_msgs(), [
-			'exception:test:powerline:Failed to load theme: themes/powerline',
+			'exception:test:powerline:Failed to load theme: themes/' + UT,
 			'exception:test:powerline:Failed to load theme: themes/test/__main__',
 			'exception:test:powerline:Failed to load theme: themes/test/default',
 			'exception:test:powerline:Failed to create renderer: themes/test/default',
@@ -570,7 +570,7 @@ class TestSegmentAttributes(TestRender):
 		def m1(divider=',', **kwargs):
 			return divider.join(kwargs.keys()) + divider
 		m1.powerline_segment_datas = {
-			'powerline': {
+			UT: {
 				'args': {
 					'divider': ';'
 				}
@@ -640,7 +640,7 @@ class TestSegmentData(TestRender):
 		def m2(**kwargs):
 			return 'S'
 		sys.modules['bar'] = Args(m1=m1, m2=m2)
-		config['themes/powerline']['segment_data'] = {
+		config['themes/' + UT]['segment_data'] = {
 			'm1': {
 				'before': '1'
 			},

tests/test_shells/bash.daemon.ok

@@ -1,15 +1,15 @@
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV=
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV=
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
 [1] PID
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 [1]+  Terminated              bgscript.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.hostname.display false
- USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
-  BRANCH  ⋯  tests  shell  3rd  echo '
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  …  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
+  BRANCH  …  tests  shell  3rd  echo '
                                      abc
                                      def
                                      '
@@ -17,25 +17,25 @@
 abc
 def
 
-  BRANCH  ⋯  tests  shell  3rd  cd "$DIR1"
-  BRANCH  ⋯  shell  3rd  ^[[32m  cd ../"$DIR2"
-  BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segments.above "$ABOVE_LEFT"
-  BRANCH  ⋯  shell  3rd  «Unicode!»  export DISPLAYED_ENV_VAR=foo
+  BRANCH  …  tests  shell  3rd  cd "$DIR1"
+  BRANCH  …  shell  3rd  ^[[32m  cd ../"$DIR2"
+  BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segments.above "$ABOVE_LEFT"
+  BRANCH  …  shell  3rd  «Unicode!»  export DISPLAYED_ENV_VAR=foo
  foo  
-  BRANCH  ⋯  shell  3rd  «Unicode!»  unset DISPLAYED_ENV_VAR
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segments.above "$ABOVE_FULL"
+  BRANCH  …  shell  3rd  «Unicode!»  unset DISPLAYED_ENV_VAR
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segments.above "$ABOVE_FULL"
                                                                                                                                                                                                                                                                                                             
-  BRANCH  ⋯  shell  3rd  «Unicode!»  export DISPLAYED_ENV_VAR=foo
+  BRANCH  …  shell  3rd  «Unicode!»  export DISPLAYED_ENV_VAR=foo
                                                                                                                                                                                                                                                                                                        foo 
-  BRANCH  ⋯  shell  3rd  «Unicode!»  unset DISPLAYED_ENV_VAR
+  BRANCH  …  shell  3rd  «Unicode!»  unset DISPLAYED_ENV_VAR
                                                                                                                                                                                                                                                                                                             
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segments.above
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
-  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segments.above
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
+  BRANCH $ABC…  shell  3rd  «Unicode!» $ABCfalse

tests/test_shells/bash.nodaemon.ok

@@ -1,15 +1,15 @@
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV=
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV=
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
 [1] PID
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 [1]+  Terminated              bgscript.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.hostname.display false
- USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
-  BRANCH  ⋯  tests  shell  3rd  echo '
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  …  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
+  BRANCH  …  tests  shell  3rd  echo '
    abc
    def
    '
@@ -17,25 +17,25 @@
 abc
 def
 
-  BRANCH  ⋯  tests  shell  3rd  cd "$DIR1"
-  BRANCH  ⋯  shell  3rd  ^[[32m  cd ../"$DIR2"
-  BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segments.above "$ABOVE_LEFT"
-  BRANCH  ⋯  shell  3rd  «Unicode!»  export DISPLAYED_ENV_VAR=foo
+  BRANCH  …  tests  shell  3rd  cd "$DIR1"
+  BRANCH  …  shell  3rd  ^[[32m  cd ../"$DIR2"
+  BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segments.above "$ABOVE_LEFT"
+  BRANCH  …  shell  3rd  «Unicode!»  export DISPLAYED_ENV_VAR=foo
  foo  
-  BRANCH  ⋯  shell  3rd  «Unicode!»  unset DISPLAYED_ENV_VAR
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segments.above "$ABOVE_FULL"
+  BRANCH  …  shell  3rd  «Unicode!»  unset DISPLAYED_ENV_VAR
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segments.above "$ABOVE_FULL"
                                                                                                                                                                                                                                                                                                             
-  BRANCH  ⋯  shell  3rd  «Unicode!»  export DISPLAYED_ENV_VAR=foo
+  BRANCH  …  shell  3rd  «Unicode!»  export DISPLAYED_ENV_VAR=foo
                                                                                                                                                                                                                                                                                                        foo 
-  BRANCH  ⋯  shell  3rd  «Unicode!»  unset DISPLAYED_ENV_VAR
+  BRANCH  …  shell  3rd  «Unicode!»  unset DISPLAYED_ENV_VAR
                                                                                                                                                                                                                                                                                                             
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segments.above
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
-  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segments.above
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
+  BRANCH $ABC…  shell  3rd  «Unicode!» $ABCfalse

tests/test_shells/busybox.daemon.ok

@@ -1,14 +1,14 @@
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV=
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV=
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 [1]+  Terminated                 bgscript.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  set_theme_option default_leftonly.segment_data.hostname.display false
- USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
-  BRANCH  ⋯  tests  shell  3rd  echo '
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  …  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
+  BRANCH  …  tests  shell  3rd  echo '
                                      abc
                                      def
                                      '
@@ -16,14 +16,14 @@
 abc
 def
 
-  BRANCH  ⋯  tests  shell  3rd  cd "$DIR1"
-  BRANCH  ⋯  shell  3rd  ^[[32m  cd ../"$DIR2"
-  BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
-  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
+  BRANCH  …  tests  shell  3rd  cd "$DIR1"
+  BRANCH  …  shell  3rd  ^[[32m  cd ../"$DIR2"
+  BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
+  BRANCH $ABC…  shell  3rd  «Unicode!» $ABCfalse

tests/test_shells/busybox.nodaemon.ok

@@ -1,14 +1,14 @@
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV=
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV=
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 [1]+  Terminated                 bgscript.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  set_theme_option default_leftonly.segment_data.hostname.display false
- USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
-  BRANCH  ⋯  tests  shell  3rd  echo '
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  …  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
+  BRANCH  …  tests  shell  3rd  echo '
    abc
    def
    '
@@ -16,14 +16,14 @@
 abc
 def
 
-  BRANCH  ⋯  tests  shell  3rd  cd "$DIR1"
-  BRANCH  ⋯  shell  3rd  ^[[32m  cd ../"$DIR2"
-  BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
-  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
+  BRANCH  …  tests  shell  3rd  cd "$DIR1"
+  BRANCH  …  shell  3rd  ^[[32m  cd ../"$DIR2"
+  BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
+  BRANCH $ABC…  shell  3rd  «Unicode!» $ABCfalse

tests/test_shells/dash.daemon.ok

@@ -1,13 +1,13 @@
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV=
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV=
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 set_theme_option default_leftonly.segment_data.hostname.display false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1   USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
-  BRANCH  ⋯  tests  shell  3rd  echo '
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1   USER   BRANCH  …  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
+  BRANCH  …  tests  shell  3rd  echo '
                                      abc
                                      def
                                      '
@@ -15,14 +15,14 @@ set_theme_option default_leftonly.segment_data.hostname.display false
 abc
 def
 
-  BRANCH  ⋯  tests  shell  3rd  cd "$DIR1"
-  BRANCH  ⋯  shell  3rd  ^[[32m  cd ../"$DIR2"
-  BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
-  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
+  BRANCH  …  tests  shell  3rd  cd "$DIR1"
+  BRANCH  …  shell  3rd  ^[[32m  cd ../"$DIR2"
+  BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
+  BRANCH $ABC…  shell  3rd  «Unicode!» $ABCfalse

tests/test_shells/dash.nodaemon.ok

@@ -1,13 +1,13 @@
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV=
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV=
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 set_theme_option default_leftonly.segment_data.hostname.display false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1   USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
-  BRANCH  ⋯  tests  shell  3rd  echo '
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1   USER   BRANCH  …  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
+  BRANCH  …  tests  shell  3rd  echo '
    abc
    def
    '
@@ -15,14 +15,14 @@ set_theme_option default_leftonly.segment_data.hostname.display false
 abc
 def
 
-  BRANCH  ⋯  tests  shell  3rd  cd "$DIR1"
-  BRANCH  ⋯  shell  3rd  ^[[32m  cd ../"$DIR2"
-  BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
-  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
+  BRANCH  …  tests  shell  3rd  cd "$DIR1"
+  BRANCH  …  shell  3rd  ^[[32m  cd ../"$DIR2"
+  BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
+  BRANCH $ABC…  shell  3rd  «Unicode!» $ABCfalse

tests/test_shells/fish.ok

@@ -1,52 +1,52 @@
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^[[32m  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^H  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  \[\]  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  %%  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  #[bold]  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  (echo)  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  $(echo)  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»  
- USER  ⋯  shell  3rd  «Unicode!»  
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^[[32m  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^H  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  \[\]  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  %%  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  #[bold]  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  (echo)  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  $(echo)  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  `echo`  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  «Unicode!»  
+ USER  …  shell  3rd  «Unicode!»  
    BRANCH 
    BRANCH 
    BRANCH 
- USER  ⋯  shell  3rd  «Unicode!»  
+ USER  …  shell  3rd  «Unicode!»  
    BRANCH 
    BRANCH 
    BRANCH 
  foo  
- USER  ⋯  shell  3rd  «Unicode!»  
+ USER  …  shell  3rd  «Unicode!»  
    BRANCH 
    BRANCH 
    BRANCH 
                                                                                                                                                                                                                                                                                                            
                                                                                                                                                                                                                                                                                                       foo 
                                                                                                                                                                                                                                                                                                            
- USER  ⋯  shell  3rd  «Unicode!»  
+ USER  …  shell  3rd  «Unicode!»  
    BRANCH 
    BRANCH 
    BRANCH 
- INSERT  USER  ⋯  shell  3rd  «Unicode!»  
+ INSERT  USER  …  shell  3rd  «Unicode!»  
    BRANCH 
- DEFAULT  USER  ⋯  shell  3rd  «Unicode!»  
+ DEFAULT  USER  …  shell  3rd  «Unicode!»  
    BRANCH 
- INSERT  USER  ⋯  shell  3rd  «Unicode!»  
+ INSERT  USER  …  shell  3rd  «Unicode!»  
    BRANCH 
- DEFAULT  USER  ⋯  shell  3rd  «Unicode!»  
+ DEFAULT  USER  …  shell  3rd  «Unicode!»  
    BRANCH 
- INSERT  USER  ⋯  shell  3rd  «Unicode!»  
+ INSERT  USER  …  shell  3rd  «Unicode!»  
    BRANCH 
    BRANCH 
- INSERT  USER  ⋯  shell  3rd  «Unicode!»  
+ INSERT  USER  …  shell  3rd  «Unicode!»  
    BRANCH 
    BRANCH 
    BRANCH 

tests/test_shells/mksh.daemon.ok

@@ -1,17 +1,17 @@
 
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV=
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV=
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
 [1] PID
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1
 [1] + Terminated bash -c ...
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.hostname.display false
- USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
-  BRANCH  ⋯  tests  shell  3rd  echo -n
-  BRANCH  ⋯  tests  shell  3rd  echo '
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  …  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
+  BRANCH  …  tests  shell  3rd  echo -n
+  BRANCH  …  tests  shell  3rd  echo '
                                      abc
                                      def
                                      '
@@ -19,14 +19,14 @@
 abc
 def
 
-  BRANCH  ⋯  tests  shell  3rd  cd "$DIR1"
-  BRANCH  ⋯  shell  3rd  ^[[32m  cd ../"$DIR2"
-  BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
-  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
+  BRANCH  …  tests  shell  3rd  cd "$DIR1"
+  BRANCH  …  shell  3rd  ^[[32m  cd ../"$DIR2"
+  BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
+  BRANCH $ABC…  shell  3rd  «Unicode!» $ABCfalse

tests/test_shells/mksh.nodaemon.ok

@@ -1,17 +1,17 @@
 
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV=
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV=
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
 [1] PID
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1
 [1] + Terminated bash -c ...
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.hostname.display false
- USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
-  BRANCH  ⋯  tests  shell  3rd  echo -n
-  BRANCH  ⋯  tests  shell  3rd  echo '
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  …  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
+  BRANCH  …  tests  shell  3rd  echo -n
+  BRANCH  …  tests  shell  3rd  echo '
    abc
    def
    '
@@ -19,14 +19,14 @@
 abc
 def
 
-  BRANCH  ⋯  tests  shell  3rd  cd "$DIR1"
-  BRANCH  ⋯  shell  3rd  ^[[32m  cd ../"$DIR2"
-  BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
-  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
+  BRANCH  …  tests  shell  3rd  cd "$DIR1"
+  BRANCH  …  shell  3rd  ^[[32m  cd ../"$DIR2"
+  BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
+  BRANCH $ABC…  shell  3rd  «Unicode!» $ABCfalse

tests/test_shells/rc.daemon.ok

@@ -1,24 +1,24 @@
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV = '/home/foo/.virtenvs/some-virtual-environment'
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV = ()
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV = '/home/foo/.virtenvs/some-virtual-environment'
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV = ()
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
 PID
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `{cat pid} ; sleep 1s
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd $DIR1
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^[[32m  cd ../$DIR2
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»  false
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»  1  set_theme_option default_leftonly.segment_data.hostname.display false
- USER   BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segment_data.user.display false
-  BRANCH  ⋯  shell  3rd  «Unicode!»  echo `{
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `{cat pid} ; sleep 1s
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd $DIR1
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^[[32m  cd ../$DIR2
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  «Unicode!»  false
+  HOSTNAME  USER   BRANCH  …  shell  3rd  «Unicode!»  1  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segment_data.user.display false
+  BRANCH  …  shell  3rd  «Unicode!»  echo `{
                                               echo Continuation!
                                           }
 Continuation!

tests/test_shells/rc.nodaemon.ok

@@ -1,24 +1,24 @@
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV = '/home/foo/.virtenvs/some-virtual-environment'
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV = ()
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV = '/home/foo/.virtenvs/some-virtual-environment'
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV = ()
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
 PID
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `{cat pid} ; sleep 1s
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd $DIR1
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^[[32m  cd ../$DIR2
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»  false
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»  1  set_theme_option default_leftonly.segment_data.hostname.display false
- USER   BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segment_data.user.display false
-  BRANCH  ⋯  shell  3rd  «Unicode!»  echo `{
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `{cat pid} ; sleep 1s
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd $DIR1
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^[[32m  cd ../$DIR2
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  «Unicode!»  false
+  HOSTNAME  USER   BRANCH  …  shell  3rd  «Unicode!»  1  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  …  shell  3rd  «Unicode!»  set_theme_option default_leftonly.segment_data.user.display false
+  BRANCH  …  shell  3rd  «Unicode!»  echo `{
        echo Continuation!
    }
 Continuation!

tests/test_shells/tcsh.ok

@@ -1,17 +1,17 @@
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^[[32m  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^H  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  \[\]  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  %%  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  #[bold]  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  (echo)  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  $(echo)  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`  
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»  
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^[[32m  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^H  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  \[\]  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  %%  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  #[bold]  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  (echo)  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  $(echo)  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  `echo`  
+  HOSTNAME  USER   BRANCH  …  shell  3rd  «Unicode!»  

tests/test_shells/zsh.daemon.ok

@@ -1,32 +1,32 @@
 
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="/home/USER/.virtenvs/some-virtual-environment"
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV=
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV="/home/USER/.virtenvs/some-virtual-environment"
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV=
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
 [1] PID
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 [1]  + terminated  bgscript.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd "$DIR1"
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^[[32m  cd ../"$DIR2"
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bindkey -v ; set_theme default
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd   COMMND   HOSTNAME  USER  ⋯  tests  shell  3rd  
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd  
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd  echo abc
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd "$DIR1"
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^[[32m  cd ../"$DIR2"
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  «Unicode!»  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bindkey -v ; set_theme default
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd   COMMND   HOSTNAME  USER  …  tests  shell  3rd  
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd  
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd  echo abc
 abc
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd  false
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd  set_theme_option default.segment_data.hostname.display false
- INSERT  USER  ⋯  tests  shell  3rd  set_theme_option default.segment_data.user.display false
- INSERT  ⋯  tests  shell  3rd  select abc in def ghi jkl
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd  false
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd  set_theme_option default.segment_data.hostname.display false
+ INSERT  USER  …  tests  shell  3rd  set_theme_option default.segment_data.user.display false
+ INSERT  …  tests  shell  3rd  select abc in def ghi jkl
  select                            do
  select                                echo $abc
  select                                break
@@ -34,19 +34,19 @@ abc
 1) def  2) ghi  3) jkl  
                    Select variant  1
 def
- INSERT  ⋯  tests  shell  3rd  cd .
- INSERT  ⋯  tests  shell  3rd  cd .
- INSERT  ⋯  tests  shell  3rd  set_theme_option default.segments.above "$ABOVE_LEFT"
- INSERT  ⋯  tests  shell  3rd  export DISPLAYED_ENV_VAR=foo
+ INSERT  …  tests  shell  3rd  cd .
+ INSERT  …  tests  shell  3rd  cd .
+ INSERT  …  tests  shell  3rd  set_theme_option default.segments.above "$ABOVE_LEFT"
+ INSERT  …  tests  shell  3rd  export DISPLAYED_ENV_VAR=foo
  foo  
- INSERT  ⋯  tests  shell  3rd  unset DISPLAYED_ENV_VAR
- INSERT  ⋯  tests  shell  3rd  set_theme_option default.segments.above "$ABOVE_FULL"
+ INSERT  …  tests  shell  3rd  unset DISPLAYED_ENV_VAR
+ INSERT  …  tests  shell  3rd  set_theme_option default.segments.above "$ABOVE_FULL"
                                                                                                                                                                                                                                                                                                            
- INSERT  ⋯  tests  shell  3rd  export DISPLAYED_ENV_VAR=foo
+ INSERT  …  tests  shell  3rd  export DISPLAYED_ENV_VAR=foo
                                                                                                                                                                                                                                                                                                       foo 
- INSERT  ⋯  tests  shell  3rd  unset DISPLAYED_ENV_VAR
+ INSERT  …  tests  shell  3rd  unset DISPLAYED_ENV_VAR
                                                                                                                                                                                                                                                                                                            
- INSERT  ⋯  tests  shell  3rd  set_theme_option default.segments.above
- INSERT  ⋯  tests  shell  3rd  hash -d foo=$PWD:h ; cd .
+ INSERT  …  tests  shell  3rd  set_theme_option default.segments.above
+ INSERT  …  tests  shell  3rd  hash -d foo=$PWD:h ; cd .
  INSERT  ~foo  3rd  set_theme_option default.dividers.left.hard \$ABC
  INSERT $ABC~foo  3rd $ABCtrue

tests/test_shells/zsh.nodaemon.ok

@@ -1,32 +1,32 @@
 
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="/home/USER/.virtenvs/some-virtual-environment"
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV=
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV="/home/USER/.virtenvs/some-virtual-environment"
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV=
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
 [1] PID
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 [1]  + terminated  bgscript.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd "$DIR1"
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^[[32m  cd ../"$DIR2"
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bindkey -v ; set_theme default
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd   COMMND   HOSTNAME  USER  ⋯  tests  shell  3rd  
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd  
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd  echo abc
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd "$DIR1"
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^[[32m  cd ../"$DIR2"
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  «Unicode!»  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bindkey -v ; set_theme default
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd   COMMND   HOSTNAME  USER  …  tests  shell  3rd  
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd  
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd  echo abc
 abc
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd  false
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd  set_theme_option default.segment_data.hostname.display false
- INSERT  USER  ⋯  tests  shell  3rd  set_theme_option default.segment_data.user.display false
- INSERT  ⋯  tests  shell  3rd  select abc in def ghi jkl
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd  false
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd  set_theme_option default.segment_data.hostname.display false
+ INSERT  USER  …  tests  shell  3rd  set_theme_option default.segment_data.user.display false
+ INSERT  …  tests  shell  3rd  select abc in def ghi jkl
  select  do
  select        echo $abc
  select        break
@@ -34,19 +34,19 @@ abc
 1) def  2) ghi  3) jkl  
  Select variant  1
 def
- INSERT  ⋯  tests  shell  3rd  cd .
- INSERT  ⋯  tests  shell  3rd  cd .
- INSERT  ⋯  tests  shell  3rd  set_theme_option default.segments.above "$ABOVE_LEFT"
- INSERT  ⋯  tests  shell  3rd  export DISPLAYED_ENV_VAR=foo
+ INSERT  …  tests  shell  3rd  cd .
+ INSERT  …  tests  shell  3rd  cd .
+ INSERT  …  tests  shell  3rd  set_theme_option default.segments.above "$ABOVE_LEFT"
+ INSERT  …  tests  shell  3rd  export DISPLAYED_ENV_VAR=foo
  foo  
- INSERT  ⋯  tests  shell  3rd  unset DISPLAYED_ENV_VAR
- INSERT  ⋯  tests  shell  3rd  set_theme_option default.segments.above "$ABOVE_FULL"
+ INSERT  …  tests  shell  3rd  unset DISPLAYED_ENV_VAR
+ INSERT  …  tests  shell  3rd  set_theme_option default.segments.above "$ABOVE_FULL"
                                                                                                                                                                                                                                                                                                            
- INSERT  ⋯  tests  shell  3rd  export DISPLAYED_ENV_VAR=foo
+ INSERT  …  tests  shell  3rd  export DISPLAYED_ENV_VAR=foo
                                                                                                                                                                                                                                                                                                       foo 
- INSERT  ⋯  tests  shell  3rd  unset DISPLAYED_ENV_VAR
+ INSERT  …  tests  shell  3rd  unset DISPLAYED_ENV_VAR
                                                                                                                                                                                                                                                                                                            
- INSERT  ⋯  tests  shell  3rd  set_theme_option default.segments.above
- INSERT  ⋯  tests  shell  3rd  hash -d foo=$PWD:h ; cd .
+ INSERT  …  tests  shell  3rd  set_theme_option default.segments.above
+ INSERT  …  tests  shell  3rd  hash -d foo=$PWD:h ; cd .
  INSERT  ~foo  3rd  set_theme_option default.dividers.left.hard \$ABC
  INSERT $ABC~foo  3rd $ABCtrue

tests/test_shells/zsh.zpython.ok

@@ -1,32 +1,32 @@
 
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd .git
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="/home/USER/.virtenvs/some-virtual-environment"
-  HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV=
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd .git
+  HOSTNAME  USER   BRANCH  …  shell  3rd  .git  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV="/home/USER/.virtenvs/some-virtual-environment"
+  HOSTNAME  USER  (e) some-virtual-environment   BRANCH  …  tests  shell  3rd  VIRTUAL_ENV=
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bgscript.sh & waitpid.sh
 [1] PID
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  false
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 [1]  + terminated  bgscript.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd "$DIR1"
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^[[32m  cd ../"$DIR2"
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  \[\]  cd ../'%%'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  %%  cd ../'#[bold]'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»  cd ..
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bindkey -v ; set_theme default
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd   COMMND   HOSTNAME  USER  ⋯  tests  shell  3rd  
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd  
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd  echo abc
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  cd "$DIR1"
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^[[32m  cd ../"$DIR2"
+  HOSTNAME  USER   BRANCH  …  shell  3rd  ^H  cd ../'\[\]'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  \[\]  cd ../'%%'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  %%  cd ../'#[bold]'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  #[bold]  cd ../'(echo)'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  (echo)  cd ../'$(echo)'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  $(echo)  cd ../'`echo`'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  `echo`  cd ../'«Unicode!»'
+  HOSTNAME  USER   BRANCH  …  shell  3rd  «Unicode!»  cd ..
+  HOSTNAME  USER   BRANCH  …  tests  shell  3rd  bindkey -v ; set_theme default
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd   COMMND   HOSTNAME  USER  …  tests  shell  3rd  
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd  
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd  echo abc
 abc
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd  false
- INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd  set_theme_option default.segment_data.hostname.display false
- INSERT  USER  ⋯  tests  shell  3rd  set_theme_option default.segment_data.user.display false
- INSERT  ⋯  tests  shell  3rd  select abc in def ghi jkl
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd  false
+ INSERT   HOSTNAME  USER  …  tests  shell  3rd  set_theme_option default.segment_data.hostname.display false
+ INSERT  USER  …  tests  shell  3rd  set_theme_option default.segment_data.user.display false
+ INSERT  …  tests  shell  3rd  select abc in def ghi jkl
  select                            do
  select                                echo $abc
  select                                break
@@ -34,8 +34,8 @@ abc
 1) def  2) ghi  3) jkl  
                    Select variant  1
 def
- INSERT  ⋯  tests  shell  3rd  cd .
- INSERT  ⋯  tests  shell  3rd  cd .
- INSERT  ⋯  tests  shell  3rd  hash -d foo=$PWD:h ; cd .
+ INSERT  …  tests  shell  3rd  cd .
+ INSERT  …  tests  shell  3rd  cd .
+ INSERT  …  tests  shell  3rd  hash -d foo=$PWD:h ; cd .
  INSERT  ~foo  3rd  set_theme_option default.dividers.left.hard \$ABC
  INSERT $ABC~foo  3rd $ABCtrue