aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2012-05-30 13:45:16 +0000
committerTiago Cunha <tcunha@gmx.com>2012-05-30 13:45:16 +0000
commit7c7bd14c61e36651e593e9794c19d23cc6b60c00 (patch)
tree899ca1e4bf132b31fcb9b0fe234e439ec1f8b215
parent30b23baaf5bed638d8ffb680e2135671b6e9c019 (diff)
downloadrtmux-7c7bd14c61e36651e593e9794c19d23cc6b60c00.tar.gz
rtmux-7c7bd14c61e36651e593e9794c19d23cc6b60c00.tar.bz2
rtmux-7c7bd14c61e36651e593e9794c19d23cc6b60c00.zip
Sync OpenBSD patchset 1125:
Strip layout from choose-windows again (leave in list-windows), suggested by Romain Francoise, diff from Thomas Adam.
-rw-r--r--cmd-list-windows.c4
-rw-r--r--tmux.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd-list-windows.c b/cmd-list-windows.c
index 5f4326a3..a816a017 100644
--- a/cmd-list-windows.c
+++ b/cmd-list-windows.c
@@ -84,7 +84,9 @@ cmd_list_windows_session(
if (template == NULL) {
switch (type) {
case 0:
- template = DEFAULT_WINDOW_TEMPLATE;
+ template = DEFAULT_WINDOW_TEMPLATE \
+ " [layout #{window_layout}] #{window_id}" \
+ " #{?window_active, (active),}";
break;
case 1:
template = "#{session_name}:" DEFAULT_WINDOW_TEMPLATE;
diff --git a/tmux.h b/tmux.h
index 7f866bbf..d0dc1223 100644
--- a/tmux.h
+++ b/tmux.h
@@ -113,9 +113,7 @@ extern char **environ;
#define DEFAULT_WINDOW_TEMPLATE \
"#{window_index}: #{window_name}#{window_flags} " \
"(#{window_panes} panes) " \
- "[#{window_width}x#{window_height}] " \
- "[layout #{window_layout}] #{window_id}" \
- "#{?window_active, (active),}"
+ "[#{window_width}x#{window_height}]"
#define DEFAULT_PANE_INFO_TEMPLATE \
"#{session_name}:#{window_index}.#{pane_index}"