Diff
1diff --git a/README.textile b/README.textile
2index bf4086916e6b495722ad74c753c6a1b9a34449f7..851a5aba888f0a1e933ac1e663d6c1be0733a0a9 100644
3--- a/README.textile
4+++ b/README.textile
5@@ -59,3 +59,7 @@ h3. Send us your theme!
6
7 I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
8
9+h3. Todo from imajes:
10+
11+* need to make the title bar support git folder
12+*
13diff --git a/completion.zsh b/completion.zsh
14index dff71cfd374c72dbdadfc943736f235b8dd1f0c2..c993620ce90600ced442480b318767193cace6c7 100644
15--- a/completion.zsh
16+++ b/completion.zsh
17@@ -1,6 +1,8 @@
18+## fixme - the load process here seems a bit bizarre
19+
20 setopt noautomenu
21-setopt COMPLETE_IN_WORD
22-setopt ALWAYS_TO_END
23+setopt complete_in_word
24+setopt always_to_end
25
26 unsetopt flowcontrol
27
28@@ -17,9 +19,10 @@ zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:
29 zstyle ':completion:*' list-colors ''
30 zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
31
32-unsetopt MENU_COMPLETE
33-setopt AUTO_MENU
34+#unsetopt MENU_COMPLETE
35+#setopt AUTO_MENU
36
37+# should this be in keybindings?
38 bindkey -M menuselect '^o' accept-and-infer-next-history
39
40 zstyle ':completion:*:*:*:*:*' menu yes select
41diff --git a/key-bindings.zsh b/key-bindings.zsh
42index 20caad11f65c45e86bcd970b59053d856b398fb1..43082ae1fafa1a37072ccb38e3cf46be9f23d15f 100644
43--- a/key-bindings.zsh
44+++ b/key-bindings.zsh
45@@ -11,4 +11,24 @@ bindkey "^[[H" beginning-of-line
46 bindkey "^[[1~" beginning-of-line
47 bindkey "^[[F" end-of-line
48 bindkey "^[[4~" end-of-line
49-bindkey ' ' magic-space # also do history expansion on space
50+bindkey ' ' magic-space # also do history expansion on space
51+
52+
53+# consider emacs keybindings:
54+
55+#bindkey -e ## emacs key bindings
56+#
57+#bindkey '^[[A' up-line-or-search
58+#bindkey '^[[B' down-line-or-search
59+#bindkey '^[^[[C' emacs-forward-word
60+#bindkey '^[^[[D' emacs-backward-word
61+#
62+#bindkey -s '^X^Z' '%-^M'
63+#bindkey '^[e' expand-cmd-path
64+#bindkey '^[^I' reverse-menu-complete
65+#bindkey '^X^N' accept-and-infer-next-history
66+#bindkey '^W' kill-region
67+#bindkey '^I' complete-word
68+## Fix weird sequence that rxvt produces
69+#bindkey -s '^[[Z' '\t'
70+#
71diff --git a/xterms.zsh b/xterms.zsh
72index 17c6a104bb426c0d7617d3d0d4a4f7d53cae4f6a..fef9787486b1d2f5d06ae49958dc0dad73235ff0 100644
73--- a/xterms.zsh
74+++ b/xterms.zsh
75@@ -1,16 +1,21 @@
76-# Specific to xterms, such as OS X terminal
77-
78-if [[ "${TERM}" == xterm* ]]; then
79- unset TMOUT
80-
81- precmd () {
82- print -Pn "\033]0;%n@%m %~\007"
83- #print -Pn "\033]0;%n@%m%# %~ %l %w :: %T\a" ## or use this
84- }
85-
86- preexec () {
87- print -Pn "\033]0;%n@%m <$1> %~\007"
88- #print -Pn "\033]0;%n@%m%# <$1> %~ %l %w :: %T\a" ## or use this
89- }
90-
91-fi
92+case "$TERM" in
93+ xterm*|rxvt*)
94+ preexec () {
95+ print -Pn "\e]0;%n@%m: $1\a" # xterm
96+ }
97+ precmd () {
98+ print -Pn "\e]0;%n@%m: %~\a" # xterm
99+ }
100+ ;;
101+ screen*)
102+ preexec () {
103+ local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]}
104+ echo -ne "\ek$CMD\e\\"
105+ print -Pn "\e]0;%n@%m: $1\a" # xterm
106+ }
107+ precmd () {
108+ echo -ne "\ekzsh\e\\"
109+ print -Pn "\e]0;%n@%m: %~\a" # xterm
110+ }
111+ ;;
112+esac