From 62fc8d802e75f57faf0046e526c3710ffb672d7b Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Mon, 10 Oct 2011 22:16:12 -0400
Subject: [PATCH] Separate unsetopt from setopt for clarity.

---
 themes/minimal/prompt_minimal_setup   | 6 +++---
 themes/nicoulaj/prompt_nicoulaj_setup | 5 +++--
 themes/sorin/prompt_sorin_setup       | 8 +++++---
 themes/steeef/prompt_steeef_setup     | 5 +++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/themes/minimal/prompt_minimal_setup b/themes/minimal/prompt_minimal_setup
index b8fb33f2..35b4343c 100644
--- a/themes/minimal/prompt_minimal_setup
+++ b/themes/minimal/prompt_minimal_setup
@@ -6,13 +6,13 @@ function +vi-git-status() {
 }
 
 function prompt_minimal_precmd () {
-  setopt NO_XTRACE NO_KSHARRAYS LOCAL_OPTIONS
   vcs_info
 }
 
 function prompt_minimal_setup() {
-  setopt NO_XTRACE NO_KSHARRAYS LOCAL_OPTIONS
-  prompt_opts=(cr subst percent)
+  setopt LOCAL_OPTIONS
+  unsetopt XTRACE KSH_ARRAYS
+  prompt_opts=(cr percent subst)
 
   autoload -Uz add-zsh-hook
   autoload -Uz vcs_info
diff --git a/themes/nicoulaj/prompt_nicoulaj_setup b/themes/nicoulaj/prompt_nicoulaj_setup
index bf82325c..26a0783a 100644
--- a/themes/nicoulaj/prompt_nicoulaj_setup
+++ b/themes/nicoulaj/prompt_nicoulaj_setup
@@ -11,8 +11,9 @@
 # ------------------------------------------------------------------------------
 
 function prompt_nicoulaj_setup() {
-  setopt NO_XTRACE NO_KSHARRAYS LOCAL_OPTIONS
-  prompt_opts=(cr subst percent)
+  setopt LOCAL_OPTIONS
+  unsetopt XTRACE KSH_ARRAYS
+  prompt_opts=(cr percent subst)
 
   # Load required modules.
   autoload -Uz add-zsh-hook
diff --git a/themes/sorin/prompt_sorin_setup b/themes/sorin/prompt_sorin_setup
index fa63dcc4..c04e533a 100644
--- a/themes/sorin/prompt_sorin_setup
+++ b/themes/sorin/prompt_sorin_setup
@@ -6,7 +6,8 @@
 #    SCREENSHOT:  http://i.imgur.com/aipDQ.png
 # ------------------------------------------------------------------------------
 function prompt_sorin_precmd () {
-  setopt NO_XTRACE NO_KSHARRAYS LOCAL_OPTIONS
+  setopt LOCAL_OPTIONS
+  unsetopt XTRACE KSH_ARRAYS
 
   if (( $+functions[git-info] )); then
     git-info
@@ -14,8 +15,9 @@ function prompt_sorin_precmd () {
 }
 
 function prompt_sorin_setup() {
-  setopt NO_XTRACE NO_KSHARRAYS LOCAL_OPTIONS
-  prompt_opts=(cr subst percent)
+  setopt LOCAL_OPTIONS
+  unsetopt XTRACE KSH_ARRAYS
+  prompt_opts=(cr percent subst)
 
   autoload -Uz add-zsh-hook
   add-zsh-hook precmd prompt_sorin_precmd
diff --git a/themes/steeef/prompt_steeef_setup b/themes/steeef/prompt_steeef_setup
index b8cfcc9e..28b2a91c 100644
--- a/themes/steeef/prompt_steeef_setup
+++ b/themes/steeef/prompt_steeef_setup
@@ -45,8 +45,9 @@ function prompt_steeef_chpwd() {
 }
 
 function prompt_steeef_setup() {
-  setopt NO_XTRACE NO_KSHARRAYS LOCAL_OPTIONS
-  prompt_opts=(cr subst percent)
+  setopt LOCAL_OPTIONS
+  unsetopt XTRACE KSH_ARRAYS
+  prompt_opts=(cr percent subst)
 
   autoload -Uz add-zsh-hook
   autoload -Uz vcs_info