X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/ad8b383d21775f621bab9a72a76413fc9fdd00ef..e45b0db3d66ca9e041622db3d801d026fb4d3724:/.zsh/zshrc/80_history

diff --git a/.zsh/zshrc/80_history b/.zsh/zshrc/80_history
index 48a161a..2f97935 100644
--- a/.zsh/zshrc/80_history
+++ b/.zsh/zshrc/80_history
@@ -1,15 +1,16 @@
-# zshrc/90_history
+# zshrc/80_history
 #
 # Set up command line history functions
 #
-# 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: http://git.madduck.net/v/etc/zsh.git
 #
 
-DEFAULT_HISTFILE=$ZVAR/history
-HISTFILE=$DEFAULT_HISTFILE
+# typeset -g on this one to make warn_create_global happy
+typeset -g HISTFILE=$ZVARDIR/history-$HOST
+[[ -e $ZVARDIR/history ]] && mv $ZVARDIR/history $HISTFILE
 HISTSIZE=10000
 SAVEHIST=$HISTSIZE
 LISTMAX=1000
@@ -23,10 +24,8 @@ setopt hist_ignore_dups
 # save timestamp and duration with each event
 setopt extended_history
 
-# properly lock the file on write
-autoload -U is-at-least
-# actually ignores the -dev-* stuff, but so be it
-is-at-least 4.3.6-dev-0+0417 && setopt hist_fcntl_lock
+# properly lock the file on write, if that option exists
+setopt hist_fcntl_lock 2>/dev/null
 
 # skip over non-contiguous duplicates when searching history
 setopt hist_find_no_dups