From dd84bff854d22ad4707e2b1c003a277e2216bd5e Mon Sep 17 00:00:00 2001
From: Julien Nicoulaud <julien.nicoulaud@gmail.com>
Date: Thu, 17 Feb 2011 19:51:07 +0100
Subject: [PATCH] Code style

Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
---
 contrib/keyword.zsh         |  3 +--
 zsh-syntax-highlighting.zsh | 12 +++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/contrib/keyword.zsh b/contrib/keyword.zsh
index ee0620c..e787fa0 100644
--- a/contrib/keyword.zsh
+++ b/contrib/keyword.zsh
@@ -51,8 +51,7 @@ _zsh_highlight-keyword() {
 
 _zsh_highlight-keyword-loop() {
   # This does *not* do its job syntactically, sorry.
-  local buf="$1"
-  local pat="$2"
+  local buf="$1" pat="$2"
   local -a match mbegin mend
   if [[ "$buf" == (#b)(*)(${~pat})* ]]; then
     region_highlight+=("$((mbegin[2] - 1)) $mend[2] $ZSH_HIGHLIGHT_KEYWORD_KEYWORDS[$pat]")
diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh
index 14f3f36..c84cc01 100644
--- a/zsh-syntax-highlighting.zsh
+++ b/zsh-syntax-highlighting.zsh
@@ -157,8 +157,7 @@ _zsh_highlight-zle-buffer() {
 
 # Whether supplied highlight_predicate satisfies or not.
 _zsh_highlight-zle-buffer-p() {
-  local region_highlight_size="$1"
-  local highlight_predicate="$2"
+  local region_highlight_size="$1" highlight_predicate="$2"
   # If any highlightings are not taken into account, asume it is needed.
   # This holds for some up/down-history commands, for example.
   ((region_highlight_size == 0)) || "$highlight_predicate"
@@ -176,9 +175,7 @@ _zsh_cursor-moved-p() {
 
 # Register a highlighting function.
 _zsh_add-highlighter() {
-  local func="$1"
-  local pred="${2-${1}-p}"
-  local cache_place="${3-${1//-/_}}"
+  local func="$1" pred="${2-${1}-p}" cache_place="${3-${1//-/_}}"
   zsh_highlight_functions+=$func
   zsh_highlight_predicates+=$pred
   zsh_highlight_caches+=$cache_place
@@ -191,10 +188,7 @@ _zsh_add-highlighter _zsh_highlight-bracket-match
 # Core syntax highlighting.
 _zsh_main-highlight() {
   setopt localoptions extendedglob bareglobqual
-  local new_expression=true
-  local start_pos=0
-  local highlight_glob=true
-  local end_pos arg style
+  local start_pos=0 end_pos highlight_glob=true new_expression=true arg style
   region_highlight=()
   for arg in ${(z)BUFFER}; do
     local substr_color=0