Skip to content
Snippets Groups Projects
Commit c3fcca02 authored by George Nachman's avatar George Nachman
Browse files

Merge branch 'master' of https://github.com/gnachman/iTerm2

parents b1ac008b ae8a4349
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -2761,8 +2761,10 @@ static NSTimeInterval kMinimumPartialLineTriggerCheckInterval = 0.5;
return (now - _lastOutput) < ([iTermAdvancedSettingsModel idleTimeSeconds] + 1);
}
 
- (NSString*)formattedName:(NSString*)base
{
- (NSString*)formattedName:(NSString*)base {
if ([self isTmuxGateway]) {
return [NSString stringWithFormat:@"[↣ %@ %@]", base, _tmuxController.clientName];
}
if (_tmuxController) {
// There won't be a valid job name, and the profile name is always tmux, so just show the
// window name. This is confusing: this refers to the name of a tmux window, which is
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment