byobu

Merge lp:~blueyed/byobu/fix-910779 into lp:byobu

  1. fix-910779
  2. Merge into trunk
Proposed by Daniel Hahler
Status: Merged
Merged at revision: 1843
Proposed branch: lp:~blueyed/byobu/fix-910779
Merge into: lp:byobu
Diff against target: 28 lines (+3/-3)
2 files modified
usr/bin/byobu-ctrl-a (+1/-1)
usr/share/byobu/profiles/tmux (+2/-2)
To merge this branch: bzr merge lp:~blueyed/byobu/fix-910779
Reviewer Review Type Date Requested Status
Dustin Kirkland  Pending
Review via email: mp+87236@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'usr/bin/byobu-ctrl-a'
2--- usr/bin/byobu-ctrl-a 2011-12-08 16:59:43 +0000
3+++ usr/bin/byobu-ctrl-a 2012-01-02 10:26:25 +0000
4@@ -76,7 +76,7 @@
5 echo 'escape "^Aa"' >> "$keybindings"
6 echo 'register x "^A"' >> "$keybindings"
7 echo 'bindkey "^A"' >> "$keybindings"
8- echo "source \$BYOBU_PREFIX/share/doc/tmux/examples/screen-keys.conf" > "$keybindings.tmux"
9+ echo "source /usr/share/doc/tmux/examples/screen-keys.conf" > "$keybindings.tmux"
10 echo "INFO: ctrl-a will now operate in GNU Screen mode"
11 break
12 ;;
13
14=== modified file 'usr/share/byobu/profiles/tmux'
15--- usr/share/byobu/profiles/tmux 2011-11-26 23:39:29 +0000
16+++ usr/share/byobu/profiles/tmux 2012-01-02 10:26:25 +0000
17@@ -26,9 +26,9 @@
18 set -s escape-time 0
19
20 # Change to Screen's ctrl-a escape sequence
21-source $BYOBU_PREFIX/share/doc/tmux/examples/screen-keys.conf
22+source /usr/share/doc/tmux/examples/screen-keys.conf
23 # On Archlinux, this file is not under the same directory
24-source $BYOBU_PREFIX/share/tmux/screen-keys.conf
25+source /usr/share/tmux/screen-keys.conf
26
27 # Add F12 to the prefix list
28 set -g prefix ^A,F12

Subscribers

People subscribed via source and target branches