X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tmux.conf;h=5a69f7a65eb3a377e9686959fb5d25f18ebdaa55;hb=667550d3424b726d074c65289c23160268576bc8;hp=c3565cab595590106ab3ab34dd276af19660e83f;hpb=ed9b94bb2473a565278d874f4f502d08a48850d8;p=config%2Fdotfiles.git

diff --git a/tmux.conf b/tmux.conf
index c3565ca..5a69f7a 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,17 +1,35 @@
 # Tmux configuration file.
 
+# Copyright (C) 2011-2012  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
 
 # GENERAL
 
 # Use a larger window history, in lines.
 set-option -g history-limit 10000
 
+# Display messages for three seconds.
+set-option -g display-time 3000
+
 
 # TERMINAL
 
 # Disable alternative screen feature. This way e.g. Vim's window content stays
 # visible after quitting Vim. This is quite useful to copy data (needs tmux
-# 1.5 to work completely).
+# 1.5 to work (almost) completely).
 set-window-option -g alternate-screen off
 
 # Set title for outer terminal.
@@ -60,4 +78,8 @@ bind-key C-p previous-window
 bind-key C-[ copy-mode
 bind-key C-] paste-buffer
 
+# Arrow-key replacements for tmux's prompt.
+bind-key -t vi-edit C-n history-down
+bind-key -t vi-edit C-p history-up
+
 # vim: ft=tmux