From 7ebef8ea1e45ea61de6389914a3c599dfabaec10 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Sun, 28 Feb 2016 22:27:59 -0600
Subject: [PATCH] * usr/share/byobu/keybindings/f-keys.screen,  
 usr/share/byobu/keybindings/f-keys.tmux: LP: #1543903   - use $EDITOR rather
 than 'view'

---
 debian/changelog                          | 3 +++
 usr/share/byobu/keybindings/f-keys.screen | 4 ++--
 usr/share/byobu/keybindings/f-keys.tmux   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 993a1e80..14281d8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ byobu (5.103) unreleased; urgency=medium
     - move purge-old-kernels over from bikeshed into byobu
   * usr/lib/byobu/include/select-session.py: LP: #1550687
     - make sure input/eval is compatible with both python2 and 3
+  * usr/share/byobu/keybindings/f-keys.screen,
+    usr/share/byobu/keybindings/f-keys.tmux: LP: #1543903
+    - use $EDITOR rather than 'view'
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 04 Feb 2016 16:30:00 -0600
 
diff --git a/usr/share/byobu/keybindings/f-keys.screen b/usr/share/byobu/keybindings/f-keys.screen
index db5fa51e..02dd0e9d 100644
--- a/usr/share/byobu/keybindings/f-keys.screen
+++ b/usr/share/byobu/keybindings/f-keys.screen
@@ -74,7 +74,7 @@ bindkey "^[[19;5~" eval 'process x' 'process u'		# Ctrl-F8  | Re-title a session
 # No ctrl-shift-F8 (save layout) in Screen
 bindkey -k k9 $BYOBU_BACKEND -t config 0 byobu-config	# F9  | Configuration
 register s "[g G$>^h"					# Goes with Shift-F7 and F12 ~ definition
-bindkey "^[[18;2~" eval 'process x' 'process s' 'exec $BYOBU_SED_INLINE -e "/./,/^$/!d" $BYOBU_RUN_DIR/printscreen' '$BYOBU_BACKEND -t PRINTSCREEN view $BYOBU_RUN_DIR/printscreen' # Shift-F7 | write the buffer to file, open in a new window
+bindkey "^[[18;2~" eval 'process x' 'process s' 'exec $BYOBU_SED_INLINE -e "/./,/^$/!d" $BYOBU_RUN_DIR/printscreen' '$BYOBU_BACKEND -t PRINTSCREEN $EDITOR $BYOBU_RUN_DIR/printscreen' # Shift-F7 | write the buffer to file, open in a new window
 							# F10 | 'toolbar' in gnome-terminal
 							# F11 | 'Full Screen' in gnome-terminal
 # No alt-F11 (break pane) in Screen
@@ -84,7 +84,7 @@ bindkey -k F2 process x					# F12 | Byobu's escape key
 bind $ $BYOBU_BACKEND -t status 0 byobu-status-detail	# F12 $ | show detailed status
 bind @ $BYOBU_BACKEND -t config 0 byobu-config		# F12 @ | Configuration
 bind R process r					# F12 R | Reload profile
-bind ~ eval 'process x' 'process s' 'exec $BYOBU_SED_INLINE -e "/./,/^$/!d" $BYOBU_RUN_DIR/printscreen' '$BYOBU_BACKEND -t PRINTSCREEN view $BYOBU_RUN_DIR/printscreen' # F12 ~ | write the buffer to file, open in a new window
+bind ~ eval 'process x' 'process s' 'exec $BYOBU_SED_INLINE -e "/./,/^$/!d" $BYOBU_RUN_DIR/printscreen' '$BYOBU_BACKEND -t PRINTSCREEN $EDITOR $BYOBU_RUN_DIR/printscreen' # F12 ~ | write the buffer to file, open in a new window
 
 register d ":source $BYOBU_PREFIX/share/byobu/keybindings/f-keys.screen.disable^M"
 bind ! eval 'process x' 'process d' 'backtick 111 9999999 9999999 byobu-status menu --disable-f-keys'	# F12 ! | toggle on/off f-keys
diff --git a/usr/share/byobu/keybindings/f-keys.tmux b/usr/share/byobu/keybindings/f-keys.tmux
index 938fa7fb..f84f7fe2 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux
+++ b/usr/share/byobu/keybindings/f-keys.tmux
@@ -62,7 +62,7 @@ bind-key -n M-F6 run-shell '$BYOBU_PREFIX/lib/byobu/include/tmux-detach-all-but-
 bind-key -n S-F6 run-shell 'exec touch $BYOBU_RUN_DIR/no-logout' \; detach
 bind-key -n C-F6 kill-pane
 bind-key -n F7 copy-mode
-bind-key -n S-F7 capture-pane -S -32768 \; save-buffer "$BYOBU_RUN_DIR/printscreen" \; delete-buffer \; new-window -n "PRINTSCREEN" "view $BYOBU_RUN_DIR/printscreen"
+bind-key -n S-F7 capture-pane -S -32768 \; save-buffer "$BYOBU_RUN_DIR/printscreen" \; delete-buffer \; new-window -n "PRINTSCREEN" "$EDITOR $BYOBU_RUN_DIR/printscreen"
 bind-key -n M-NPage copy-mode \; send-keys NPage
 bind-key -n M-PPage copy-mode \; send-keys PPage
 bind-key -n F8 command-prompt -p "(rename-window) " "rename-window '%%'"