Overhaul of the entire config. Yay for big diffs.

[etc/zsh.git] / .zsh / logging

diff --git a/.zsh/logging b/.zsh/logging
index 26d7544ccc0cd5207bee526d2abf374a907f830b..c23ad42773ecedce0d7249cade478747871e9feb 100644 (file)
--- a/.zsh/logging
+++ b/.zsh/logging
@@ -2,38 +2,36 @@
 #
 # Logging abilities for the shell initialisation scripts
 #
-# Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
+# Copyright © 1994–2017 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
-# Source repository: git://git.madduck.net/etc/zsh.git
+# Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
 __log() {
+  setopt localoptions noxtrace
   local level; level="$1"; shift
   echo "${level}: $@" >&2
 }
 __do_debug() {
+  setopt localoptions noxtrace
   [ -n "${ZDEBUG:-}" ]
 }
 zerror() {
-  [[ -o xtrace ]] && set +x && local __XTRACE=1
+  setopt localoptions noxtrace
   __log E "$@"
-  [ "${__XTRACE:-}" ] && set -x
 }
 zwarn() {
-  [[ -o xtrace ]] && set +x && local __XTRACE=1
+  setopt localoptions noxtrace
   __log W "$@"
-  [ "${__XTRACE:-}" ] && set -x
 }
 zinfo() {
-  [[ -o xtrace ]] && set +x && local __XTRACE=1
+  setopt localoptions noxtrace
   __log I "$@"
-  [ "${__XTRACE:-}" ] && set -x
 }
 zdebug() {
-  [[ -o xtrace ]] && set +x && local __XTRACE=1
+  setopt localoptions noxtrace
   __do_debug && __log D "$@"
-  [ "${__XTRACE:-}" ] && set -x
 }
 
 # vim:ft=zsh