From dc7c51434ac327250ba6aaa8ab63bd25f06c6826 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Sun, 8 Apr 2012 18:37:22 -0400 Subject: [PATCH] Simplify a few for loops --- init.zsh | 8 ++------ modules/directory/init.zsh | 5 +---- modules/editor/init.zsh | 14 ++++++-------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/init.zsh b/init.zsh index 729ca72c..2af9e858 100644 --- a/init.zsh +++ b/init.zsh @@ -21,16 +21,12 @@ fi # Load Zsh modules. zstyle -a ':omz:load' zmodule 'zmodules' -for zmodule in "$zmodules[@]"; do - zmodload "zsh/${(z)zmodule}" -done +for zmodule ("$zmodules[@]") zmodload "zsh/${(z)zmodule}" unset zmodule{s,} # Autoload Zsh functions. zstyle -a ':omz:load' zfunction 'zfunctions' -for zfunction in "$zfunctions[@]"; do - autoload -Uz "$zfunction" -done +for zfunction ("$zfunctions[@]") autoload -Uz "$zfunction" unset zfunction{s,} # Source files (the order matters). diff --git a/modules/directory/init.zsh b/modules/directory/init.zsh index 322dee07..338b8c69 100644 --- a/modules/directory/init.zsh +++ b/modules/directory/init.zsh @@ -19,8 +19,5 @@ unsetopt CLOBBER # Don't overwrite existing files with > and >>. # Use >! and >>! to bypass. # Aliases -for index in {1..9}; do - alias "$index"="cd +${index}" -done -unset index +for index ({1..9}) alias "$index"="cd +${index}"; unset index diff --git a/modules/editor/init.zsh b/modules/editor/init.zsh index a1d3d86a..4b85b43f 100644 --- a/modules/editor/init.zsh +++ b/modules/editor/init.zsh @@ -116,15 +116,13 @@ zle -N prepend-sudo bindkey -d # Emacs key bindings. -for key in "$keyinfo[Escape]"{B,b}; \ - bindkey -M emacs "$key" emacs-backward-word -for key in "$keyinfo[Escape]"{F,f}; \ - bindkey -M emacs "$key" emacs-forward-word +for key ("$keyinfo[Escape]"{B,b}) bindkey -M emacs "$key" emacs-backward-word +for key ("$keyinfo[Escape]"{F,f}) bindkey -M emacs "$key" emacs-forward-word bindkey -M emacs "$keyinfo[Escape]$keyinfo[Left]" emacs-backward-word bindkey -M emacs "$keyinfo[Escape]$keyinfo[Right]" emacs-forward-word # Kill to the beginning of the line. -for key in "$keyinfo[Escape]"{K,k}; \ +for key in "$keyinfo[Escape]"{K,k} bindkey -M emacs "$key" backward-kill-line # Redo. @@ -186,15 +184,15 @@ for keymap in 'emacs' 'viins'; do bindkey -M "$keymap" "$keyinfo[Control]L" clear-screen # Expand command name to full path. - for key in "$keyinfo[Escape]"{E,e}; \ + for key in "$keyinfo[Escape]"{E,e} bindkey -M "$keymap" "$key" expand-cmd-path # Duplicate the previous word. - for key in "$keyinfo[Escape]"{M,m}; \ + for key in "$keyinfo[Escape]"{M,m} bindkey -M "$keymap" "$key" copy-prev-shell-word # Use a more flexible push-line. - for key in "$keyinfo[Control]Q" "$keyinfo[Escape]"{q,Q}; \ + for key in "$keyinfo[Control]Q" "$keyinfo[Escape]"{q,Q} bindkey -M "$keymap" "$key" push-line-or-edit # Bind Shift + Tab to go to the previous menu item.