Browse Source

Use 'auto' as an adverb, not a namespace

master
Sorin Ionescu 13 years ago
parent
commit
a444469641
  1. 4
      plugins/screen/init.zsh
  2. 4
      plugins/tmux/init.zsh
  3. 2
      templates/zshrc
  4. 4
      terminal.zsh

4
plugins/screen/init.zsh

@ -8,7 +8,7 @@
# To auto start it, add the following to zshrc: # To auto start it, add the following to zshrc:
# #
# # Auto launch GNU Screen at start-up. # # Auto launch GNU Screen at start-up.
# zstyle -t ':omz:plugin:screen:auto' start 'yes' # zstyle -t ':omz:plugin:screen' auto-start 'yes'
# #
# Aliases # Aliases
@ -17,7 +17,7 @@ alias sn="screen -U -S"
alias sr="screen -a -A -U -D -R" alias sr="screen -a -A -U -D -R"
# Auto Start # Auto Start
if [[ -z "$STY" ]] && zstyle -t ':omz:plugin:screen:auto' start; then if [[ -z "$STY" ]] && zstyle -t ':omz:plugin:screen' auto-start; then
session="$( session="$(
screen -list 2> /dev/null \ screen -list 2> /dev/null \
| sed '1d;$d' \ | sed '1d;$d' \

4
plugins/tmux/init.zsh

@ -9,7 +9,7 @@
# To auto start it, add the following to zshrc: # To auto start it, add the following to zshrc:
# #
# # Auto launch tmux at start-up. # # Auto launch tmux at start-up.
# zstyle -t ':omz:plugin:tmux:auto' start 'yes' # zstyle -t ':omz:plugin:tmux' auto-start 'yes'
# #
# Warning: # Warning:
# Tmux is known to cause kernel panics on Mac OS X. # Tmux is known to cause kernel panics on Mac OS X.
@ -21,7 +21,7 @@ alias ta="tmux attach-session"
alias tl="tmux list-sessions" alias tl="tmux list-sessions"
# Auto Start # Auto Start
if [[ -z "$TMUX" ]] && zstyle -t ':omz:plugin:tmux:auto' start; then if [[ -z "$TMUX" ]] && zstyle -t ':omz:plugin:tmux' auto-start; then
tmux_session='#OMZ' tmux_session='#OMZ'
if ! tmux has-session -t "$tmux_session" 2> /dev/null; then if ! tmux has-session -t "$tmux_session" 2> /dev/null; then

2
templates/zshrc

@ -18,7 +18,7 @@ zstyle ':omz:*:*' case-sensitive 'no'
zstyle ':omz:*:*' color 'yes' zstyle ':omz:*:*' color 'yes'
# Auto set the tab and window titles. # Auto set the tab and window titles.
zstyle ':omz:terminal:auto' title 'yes' zstyle ':omz:terminal' auto-title 'yes'
# Set the plugins to load (see $OMZ/plugins/). # Set the plugins to load (see $OMZ/plugins/).
zstyle ':omz:load' plugin 'archive' 'git' zstyle ':omz:load' plugin 'archive' 'git'

4
terminal.zsh

@ -78,7 +78,7 @@ autoload -Uz add-zsh-hook
# Sets the tab and window titles before the prompt is displayed. # Sets the tab and window titles before the prompt is displayed.
function set-title-precmd { function set-title-precmd {
if [[ "$TERM_PROGRAM" != "Apple_Terminal" ]] && zstyle -t ':omz:terminal:auto' title; then if [[ "$TERM_PROGRAM" != "Apple_Terminal" ]] && zstyle -t ':omz:terminal' auto-title; then
set-window-title "${(%):-%~}" set-window-title "${(%):-%~}"
for kind in tab screen; do for kind in tab screen; do
# Left-truncate the current working directory to 15 characters. # Left-truncate the current working directory to 15 characters.
@ -93,7 +93,7 @@ add-zsh-hook precmd set-title-precmd
# Sets the tab and window titles before command execution. # Sets the tab and window titles before command execution.
function set-title-preexec { function set-title-preexec {
if zstyle -t ':omz:terminal:auto' title; then if zstyle -t ':omz:terminal' auto-title; then
set-title-by-command "$2" set-title-by-command "$2"
fi fi
} }

Loading…
Cancel
Save