From c78c1427be7ee39d87d5aab0653ef944303a5c26 Mon Sep 17 00:00:00 2001
From: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Date: Fri, 5 Apr 2013 00:20:18 -0500
Subject: [PATCH] tmux: use status-left short flags

Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>

Conflicts:
	share/completions/tmux.fish
---
 share/completions/tmux.fish | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/share/completions/tmux.fish b/share/completions/tmux.fish
index 140608779..85811d0b1 100644
--- a/share/completions/tmux.fish
+++ b/share/completions/tmux.fish
@@ -3,28 +3,18 @@ function __fish_tmux_sessions --description 'available sessions'
 end
 
 function __fish_tmux_clients --description 'connected clients'
-        tmux list-clients -F "#{client_tty}	#{session_name}: Created: #{client_created_string} [#{client_width}x#{client_height} #{client_termname}]" ^/dev/null
+        tmux list-clients -F "#{client_tty}	#S: Created: #{client_created_string} [#{client_width}x#{client_height} #{client_termname}]" ^/dev/null
 end
 
 function __fish_tmux_panes --description 'window panes'
-        set -l panes (tmux list-panes -F "#S:#{window_name}." ^ /dev/null)
-
         #fully qualified pane names
-        if count $panes
-			for i in (seq (count $panes))
-					echo "$panes[$i]"(math $i - 1)'	session:window.pane'
-			end
-		end
+        tmux list-panes -F '#S:#W.#P	session:window.pane' ^/dev/null
 
         #panes by themselves
-        if count $panes
-			for i in (seq (count $panes))
-					echo (math $i - 1)'	pane'
-			end
-		end
+        tmux list-panes -F '#P	pane' ^/dev/null
 
         #windows by themselves
-        tmux list-panes -F '#{window_name}	window' ^ /dev/null
+        tmux list-panes -F '#W	window' ^/dev/null
 end
 
 #don't allow dirs in the completion list...