From 4507df41cccd2d08f82ae20d8c710adfeaf53cdd Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Thu, 26 May 2011 12:25:44 -0500 Subject: [PATCH] * usr/share/byobu/keybindings/f-keys, usr/share/byobu/profiles/common: - avoid some screen crashes associated with buggy 'layout' saving feature; only save layouts if user is splitting screens, LP: #788670 --- debian/changelog | 3 +++ usr/share/byobu/keybindings/f-keys | 4 ++-- usr/share/byobu/profiles/common | 4 ---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 83222c83..7604055e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ byobu (4.5) unreleased; urgency=low * usr/lib/byobu/custom, usr/share/byobu/keybindings/f-keys: - fix regression in custom scripts - get ctrl-F5 working correctly again + * usr/share/byobu/keybindings/f-keys, usr/share/byobu/profiles/common: + - avoid some screen crashes associated with buggy 'layout' saving + feature; only save layouts if user is splitting screens, LP: #788670 -- Dustin Kirkland Wed, 25 May 2011 19:37:18 -0500 diff --git a/usr/share/byobu/keybindings/f-keys b/usr/share/byobu/keybindings/f-keys index a2ea56a2..4b923743 100644 --- a/usr/share/byobu/keybindings/f-keys +++ b/usr/share/byobu/keybindings/f-keys @@ -47,8 +47,8 @@ register s "[g G$>^h" # Goes with F12 ~ definition bind ~ eval 'process x' 'process s' 'exec sed -i -e "/./,/^$/!d" /var/run/screen/S-$USER/printscreen' 'screen -t PRINTSCREEN view /var/run/screen/S-$USER/printscreen' # F12 ~ | write the buffer to file, open in a new window # Hotkeys for splits (gnome-terminal) -bindkey "^[O1;2Q" eval 'split' 'focus down' 'next' 'focus up' # shift-F2 | horizontal split -bindkey "^[O1;5Q" eval 'split -v' 'focus down' 'next' 'focus up' # ctrl-F2 | vertical split +bindkey "^[O1;2Q" eval 'split' 'focus down' 'next' 'focus up' 'layout save byobu' 'layout autosave' # shift-F2 | horizontal split +bindkey "^[O1;5Q" eval 'split -v' 'focus down' 'next' 'focus up' 'layout save byobu' 'layout autosave' # ctrl-F2 | vertical split bindkey "^[O1;2R" focus up # shift-F3 | focus up bindkey "^[O1;2S" focus down # shift-F4 | focus down bindkey "^[[15;2~" only # shift-F5 | kill all splits diff --git a/usr/share/byobu/profiles/common b/usr/share/byobu/profiles/common index e9f9a6c0..eed706a8 100644 --- a/usr/share/byobu/profiles/common +++ b/usr/share/byobu/profiles/common @@ -107,10 +107,6 @@ activity "" # Fit to the current window size, useful with F5/reloads of the profile fit -# Preserve splits; requires a pretty recent screen version (works on Debian/Ubuntu) -layout save byobu -layout autosave - # Maintain SSH_AUTH_SOCK link setenv SSH_AUTH_SOCK $HOME/.byobu/.ssh-agent