The branch, master has been updated
       via  e496a548d7b07c9a4be9ce8e750cf5423e3bafe3 (commit)
       via  3d39b18e319cdd96bf25debcfcf52c03120e3d8e (commit)
      from  c7a121cfc0137c907b7bfb0c3fd1bdee395af8aa (commit)

- Log -----------------------------------------------------------------
commit e496a548d7b07c9a4be9ce8e750cf5423e3bafe3
Merge: 3d39b18 c7a121c
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>

    Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

 cmd-queue.c            |    7 +++++--
 compat/forkpty-sunos.c |    1 +
 compat/imsg-buffer.c   |    1 +
 compat/imsg.c          |    1 +
 control.c              |    3 +++
 input.c                |    2 +-
 options-table.c        |    5 +++++
 server-client.c        |   13 +++++++++++--
 tmux.1                 |    8 ++++++++
 tmux.h                 |    8 +++++---
 tty.c                  |   14 ++++++++++++--
 11 files changed, 53 insertions(+), 10 deletions(-)


commit 3d39b18e319cdd96bf25debcfcf52c03120e3d8e
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>

    Section on clipboard, from Thomas Adam.
---
 FAQ |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/FAQ b/FAQ
index 41b917c..81421bc 100644
--- a/FAQ
+++ b/FAQ
@@ -396,5 +396,29 @@ configuration file:
 Or the default window options:
 
         $ tmux -Lfoo -f/dev/null start\; show -gw
+
+* How do I copy a selection from tmux to the system's clipboard?
+
+When running in xterm(1), tmux can automatically send copied text to the
+clipboard. This is controlled by the set-clipboard option and also needs this
+X resource to be set:
+
+       XTerm*disallowedWindowOps: 20,21,SetXprop
+
+For rxvt-unicode (urxvt), there is an unofficial Perl extension here:
+
+        http://anti.teamidiot.de/static/nei/*/Code/urxvt/
+
+Otherwise a key binding for copy mode using xclip (or xsel) works:
+
+       bind -temacs-copy C-y copy-pipe "xclip -i >/dev/null"
+
+Or for inside and outside copy mode with the prefix key:
+
+        bind C-y run -b "tmux save-buffer - | xclip -i"
+
+On OS X, reattach-to-usernamespace lets pbcopy/pbpaste work:
+
+        https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard
  
 $Id$


-----------------------------------------------------------------------

Summary of changes:
 FAQ |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
tmux

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs

Reply via email to