Browse files

Merge branch 'tw/develop'

My comments on Trevor's changes:

  Makefile: remove ppc from default arches

    This also makes sense since PPC binaries seems unlikely to be
    supported in the next release of Mac OS X (10.7 Lion, due next
    month). indentation fixes

    These are correct.

    My local rdiscount-based rendering did not require the extra
    spaces to achieve the desired output, but GitHub was rendering
    them differently. These changes make GitHub's output match my
    local output (at least for the modified section). add `tmux kill-server`

    Good idea. However, given the context ("restart your server"),
    I think we should explicitly warn about its effects. I appended
    a commit.
  • Loading branch information...
2 parents 2697c6a + c3aea83 commit 172aca57ee6cd5013bc66eec7beb59afc26ba046 @ChrisJohnsen committed Jun 26, 2011
Showing with 12 additions and 5 deletions.
  1. +3 −1 Makefile
  2. +9 −4
@@ -1,4 +1,6 @@
-ARCHES = i386 ppc x86_64
+# use for ppc support:
+# ARCHES = i386 ppc x86_64
+ARCHES = i386 x86_64
ARCH_FLAGS = $(ARCHES:%=-arch %)
CFLAGS ?= -Wall -Wextra -ansi -pendantic
@@ -16,19 +16,24 @@ Thus, my wrapper-based workaround:
Make it available in your PATH (or use the absolute pathname in
the next step).
- make reattach-to-user-namespace &&
- cp reattach-to-user-namespace ~/bin
+ make reattach-to-user-namespace &&
+ cp reattach-to-user-namespace ~/bin
1. Configure *tmux* to use this wrapper program to start the shell
for each new window.
- In `.tmux.conf`:
+ In `.tmux.conf`:
- set-option -g default-command "reattach-to-user-namespace -l zsh"
+ set-option -g default-command "reattach-to-user-namespace -l zsh"
1. Restart your *tmux* server (or start a new one, or just
reconfigure your existing one).
+ To kill your existing *tmux* server (and everything running
+ “inside” it!):
+ tmux kill-server
1. Enjoy being able to use *pbpaste*, *pbcopy*, etc. in new shell

0 comments on commit 172aca5

Please sign in to comment.