X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=.zsh%2Fzshrc%2F80_history;h=d5d71d2ed97401ff4cbaf0d962b4e6abf5095fcf;hb=HEAD;hp=708ea41f0f973edc2e8a76c440bd307e10c15352;hpb=af0c689d498bcb9620503480fac4a399540eaa7e;p=zsh.git

diff --git a/.zsh/zshrc/80_history b/.zsh/zshrc/80_history
index 708ea41..d5d71d2 100644
--- a/.zsh/zshrc/80_history
+++ b/.zsh/zshrc/80_history
@@ -1,3 +1,4 @@
+# -*- mode: sh -*-
 # zshrc/80_history
 #
 # Set up command line history functions
@@ -5,10 +6,12 @@
 # Copyright © 1994–2008 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
+# Source repository: git://git.madduck.net/etc/zsh.git
 #
 
-HISTFILE=$ZVAR/history
+# 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
@@ -22,10 +25,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