From: Moviuro <moviuro+grml@gmail.com>
Date: Sun, 12 Apr 2015 12:12:02 +0000 (+0200)
Subject: zshrc: don't overwrite {ls,grep}_options set in .zshrc.pre
X-Git-Tag: v0.11.2~5
X-Git-Url: http://git.grml.org/?p=grml-etc-core.git;a=commitdiff_plain;h=bd49c00f9a18f413cd33767f5dfa793e9803c112

zshrc: don't overwrite {ls,grep}_options set in .zshrc.pre

(cherry picked from commit 57b7364b7da842f486c85f7abae6ce457a23cc5c)
---

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 4e06cde..f66bebc 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -358,12 +358,12 @@ ZSH_NO_DEFAULT_LOCALE=${ZSH_NO_DEFAULT_LOCALE:-0}
 typeset -ga ls_options
 typeset -ga grep_options
 if ls --color=auto / >/dev/null 2>&1; then
-    ls_options=( --color=auto )
+    ls_options+=( --color=auto )
 elif ls -G / >/dev/null 2>&1; then
-    ls_options=( -G )
+    ls_options+=( -G )
 fi
 if grep --color=auto -q "a" <<< "a" >/dev/null 2>&1; then
-    grep_options=( --color=auto )
+    grep_options+=( --color=auto )
 fi
 
 # utility functions