set warn_create_global and unglobal a few

diff --git a/.zsh/func/vcsh b/.zsh/func/vcsh
index ca26a9edd78390156bc6981af21b55af7ad07787..0a08b5e31d3d541b8f0126678bb7eeeebcbb93a9 100755 (executable)
--- a/.zsh/func/vcsh
+++ b/.zsh/func/vcsh
@@ -10,7 +10,7 @@
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
-FGIT_BASE="$HOME/.fgits"
+local FGIT_BASE="$HOME/.fgits"
 
 if [ "${1:---help}" = '--help' ] || [ $# -gt 1 ]; then
   echo "usage: ${0%/*} reponame" >&2
@@ -32,7 +32,7 @@ if [ ! -d "$FGIT_BASE/${1}.git" ]; then
 fi
 
 export GIT_DIR="$FGIT_BASE/${1}.git"
-_WORKTREE="$(git config --get core.worktree)"
+local _WORKTREE="$(git config --get core.worktree)"
 export GIT_WORK_TREE="$(readlink -f $GIT_DIR/$_WORKTREE)"
 unset _WORKTREE
 

diff --git a/.zsh/zshrc/00_varsetup b/.zsh/zshrc/00_varsetup
index 68ec3862bdf5962d919a341d0aa435591a0d0178..a49f67da082ec0f64ed4fdb3a8ac04a308355bd9 100644 (file)
--- a/.zsh/zshrc/00_varsetup
+++ b/.zsh/zshrc/00_varsetup
@@ -16,4 +16,7 @@ typeset -ga preexec_functions
 typeset -ga precmd_functions
 typeset -ga chpwd_functions
 
+# warn on accidental creation of global variables
+setopt warn_create_global
+
 # vim:ft=zsh

diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index 82625ff68b240a27dc1513063c097051d8577356..562f4b9e42d77bfe4363289839356590909513d0 100644 (file)
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -23,12 +23,11 @@ alias curl='noglob curl'
 alias apt-cache='noglob apt-cache'
 alias locate='noglob locate'
 
-_ls_opts=(-bC --color=auto)
-ls --group-directories-first >/dev/null 2>&1 \
+typeset -a _ls_opts; _ls_opts=(-bC --color=auto)
+command ls --group-directories-first >/dev/null 2>&1 \
   && _ls_opts+=--group-directories-first
 # I prefer POSIX collation for ls
 alias ls="LC_COLLATE=POSIX ls $_ls_opts"
-unset _ls_opts
 
 alias ll='ls -l'
 alias l=ll

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index 4cc18a3fd6feb72d174044579ad73d6999c7ccf7..9fa0f44e4a458852e7d636f316562eaa0d898e5c 100644 (file)
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -144,9 +144,8 @@ __vcs_set_prompt_variables()
       if [ -d "$GIT_DIR" ]; then
         # poor man's replace until I find out how to do named dirs properly
         # here:
-        _D="${GIT_DIR/$HOME/~}"
+        local _D="${GIT_DIR/$HOME/~}"
         set -- "$_D" "$2" "${${1#$_D}%/}"
-        unset _D
       fi
       ;;
     hg)

diff --git a/.zsh/zshrc/80_history b/.zsh/zshrc/80_history
index 4a80f0604d8d0785f52f65d413413b6843c7b79d..af0f93b44a784146583027ff341db795fc42c1e8 100644 (file)
--- a/.zsh/zshrc/80_history
+++ b/.zsh/zshrc/80_history
@@ -8,7 +8,8 @@
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
-HISTFILE=$ZVARDIR/history
+# typeset -g on this one to make warn_create_global happy
+typeset -g HISTFILE=$ZVARDIR/history
 HISTSIZE=10000
 SAVEHIST=$HISTSIZE
 LISTMAX=1000

diff --git a/.zsh/zshrc/80_prompt b/.zsh/zshrc/80_prompt
index a2b18eb250d17b81c5fc8b327258bffe9e005382..54d0e4d25b67e4dbd7166a364e69347bf2605451 100644 (file)
--- a/.zsh/zshrc/80_prompt
+++ b/.zsh/zshrc/80_prompt
@@ -9,20 +9,16 @@
 #
 
 if [ "${PS1:-}" = '%m%# ' ]; then
-  _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
+  local _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
   if is_root; then
     _MIDDLE="%25<..<%~%<<"
-    _PS1_HL=U
+    local _PS1_HL=U
   fi
 
-  _MACHINE_NAME="${_PS1_HL:=B}%m%${(L)_PS1_HL}"
+  local _MACHINE_NAME="${_PS1_HL:=B}%m%${(L)_PS1_HL}"
   _MACHINE_NAME="$_MACHINE_NAME${debian_chroot:+/%S$debian_chroot%s}"
 
   PS1="%(2L.+.)%${_MACHINE_NAME}:${_MIDDLE}%# "
-
-  unset _MACHINE_NAME
-  unset _PS1_HL
-  unset _MIDDLE
 fi
 
 : ${RPS1:="#%(0?..%?,)%!"}

diff --git a/.zsh/zshrc/99_TODO b/.zsh/zshrc/99_TODO
index 4fbaa92f133f1a19cd7b81b9b2854d56705547a4..7d6536b7fe5ba815fb61fd79f754b44fa0cc255b 100644 (file)
--- a/.zsh/zshrc/99_TODO
+++ b/.zsh/zshrc/99_TODO
@@ -56,7 +56,8 @@ setopt c_bases
 WORDCHARS="${WORDCHARS//\/}"
 
 # report time stats when command takes longer than 5 seconds
-REPORTTIME=5
+# typeset -g to make warn_create_global happy
+typeset -g REPORTTIME=5
 
 MAILCHECK=0