PATCH: history improvements for 3.1.5-pws-17 and 3.0.6-pre-2

PATCH: history improvements for 3.1.5-pws-17 and 3.0.6-pre-2

[Wayne Davison]

Appended is the history improvements for pws-17 that I mentioned in
zsh-workers 6218.  I've gzipped and uuencoded the patch to make it
smaller.  You can also grab it and a version of the patch for
3.0.6-pre-2 via the web:

  http://www.clari.net/~wayne/history_patch_for_zsh-3.1.5-pws-17.txt
  http://www.clari.net/~wayne/history_patch_for_zsh-3.0.6-pre-2.txt

The pws-17 version has documentation changes in the yoda source
(though I don't have yoda to see if the changes worked out OK),
but the 3.0.6-pre-2 version does not have any doc changes at the
moment (since I'm assuming that this won't make it into 3.0.6).

One previously unmentioned improvement is that you can use "fc -RI"
to manually import just the commands that aren't already in your
history buffer (as opposed to have it done automatically via the
SHARE_HISTORY option).

The 3.0.6-pre-2 version includes a number of fixes to the history
code that I brought over from 3.1.5, though.  I'm mainly using the
3.0.6 version right now (especially since I can't seem to get my
gcc/gdb setup to show me the debugging info for the pws-17 build),
but the pws-17 version seems to be working fine so far as well.
I'm assuming there will be some (hopefully minor) bugs that are
still left to squash, but I've been running most of the code for
a few days now, and it seems stable.

I hope you enjoy it!

..wayne..

---8<------8<------8<------8<---cut here--->8------>8------>8------>8---
begin 644 history_patch_for_zsh-3.1.5-pws-17.gz
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
C<AGO$4A>>)1:LL)E BF)?0J"#_N#11K5>_\+^*ES*6S^  "-
 
end
---8<------8<------8<------8<---cut here--->8------>8------>8------>8---

Re: PATCH: history improvements for 3.1.5-pws-17 and 3.0.6-pre-2

[Peter Stephenson]

Wayne Davison wrote:
> Appended is the history improvements for pws-17 that I mentioned in
> zsh-workers 6218.

Thanks, this will appear in pws-18.

One addition in the patch below:  share_history is set in ksh emulation.

Some comments on share_history (which is the one I've played about with
most): actually, it doesn't emulate ksh at the moment, because only a few
commands cause the history from any other instance of the shell to be used.
I know this is how it's documented, but I find the behaviour a bit
confusing, since after I've typed something in one shell, and hit return in
another shell, I expect to be able just to use up-line-or-history to get to
what's in the other shell --- otherwise I might just as well use an
explicit fc -RI and the option's not much use, or so I've been finding on
rather limited experience so far.

I presume that the real problem is numbering of bang-history references,
and I agree it's correct to be careful in that case.  However, I'd like to
suggest that any zle reference to the history (apart from expansion of
lines like !*, of course, but that's done internally via the lexer so
shouldn't cause problems as an exception) causes the newly imported stuff
to be visible.  I don't think this is likely to cause confusion, since you
always see the line before doing anything with it --- in fact, in my case
it would definitely help eliminate confusion, and also it would make the
behaviour more ksh-like.

Next point --- there is another slight confusion, partly at least as a
knock on effect of this.  If I type something in shell 1, I know it won't
be imported until after the next line in shell 2 is finished, and won't
show up until after the next history reference.  So I type `history'. As
explained above, I find this a bit clumsy anyway, but the point here is
that for some reason due to the internal handling it's not enough to make
what I just typed in shell 1 appear (even if I unset histnostore, which I
thought might have had an effect).  It only happens after I've typed a new
command in shell 2, which can't be a history command or a blank line, and
then after that I have to do something to get the commands to show up.

Ideally for sharing history, I'd like to be able just to hit return (to do
the reading) then up (to allow the new commands to show up) to get what I
just typed in the other shell, just as happens in ksh.  Hope that's
possible.

--- Src/options.c.newhist	Sat May  8 14:31:51 1999
+++ Src/options.c	Sat May  8 15:27:16 1999
@@ -181,7 +181,7 @@
 {NULL, "restricted",	      OPT_SPECIAL,		 RESTRICTED},
 {NULL, "rmstarsilent",	      OPT_BOURNE,		 RMSTARSILENT},
 {NULL, "rmstarwait",	      0,			 RMSTARWAIT},
-{NULL, "sharehistory",	      0,			 SHAREHISTORY},
+{NULL, "sharehistory",	      OPT_KSH,			 SHAREHISTORY},
 {NULL, "shfileexpansion",     OPT_EMULATE|OPT_BOURNE,	 SHFILEEXPANSION},
 {NULL, "shglob",	      OPT_EMULATE|OPT_BOURNE,	 SHGLOB},
 {NULL, "shinstdin",	      OPT_SPECIAL,		 SHINSTDIN},

-- 
Peter Stephenson <pws@ibmth.df.unipi.it>       Tel: +39 050 844536
WWW:  http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarroti 2, 56127 Pisa, Italy

Re: PATCH: history improvements for 3.1.5-pws-17 and 3.0.6-pre-2

[Wayne Davison]

Peter Stephenson writes:
> after I've typed something in one shell, and hit return in another
> shell, I expect to be able just to use up-line-or-history to get to
> what's in the other shell

I'm torn on the issue, because sometimes I want to up-arrow through
the total history, and sometimes I just want to press ^P and run the
last command that I ran in this window, no exceptions.  If you'd
like to change the current behavior for the up/down commands, apply
this patch:

Index: Src/Zle/zle_hist.c
@@ -461,7 +461,7 @@
 int
 zle_goto_hist(int ev, int n)
 {
-    Histent he = movehistent(quietgethist(ev), n, HIST_FOREIGN);
+    Histent he = movehistent(quietgethist(ev), n, 0);
     if (!he)
 	return 0;
     zle_setline(he);

Note that this change doesn't affect ! references, so !! would
still run the last command that was run in the current shell.

I'd be interested in suggestions for how we can let the user choose
between local-history and full-history movement.  Perhaps a toggle
command?  Or a bindable prefix (so I can have ^P ignore shared
history, and Up-Arrow include it)?  I like this idea.

> I'd like to suggest that any zle reference to the history [...]
> causes the newly imported stuff to be visible.

I think that some zle commands, such as accept_and_infer_next_
history, should remain unaffected by foreign commands.

> for some reason due to the internal handling it's not enough to
> make what I just typed in shell 1 appear [...] It only happens
> after I've typed a new command in shell 2, which can't be a
> history command or a blank line

I think you've misinterpreted what's going on.  The current code
waits until the command _finishes_ before adding it to the history
file.  I did this because the extended_history format contains the
finish time of the command.  I also don't like this delay in adding
the command, though, so I think we add the command after it is typed,
and just live with the fact that all the finish times will be the
same as the start times when using incremental_append_history (which
is used by shared_history).

Here's the change to append the history in hend() rather than
hbegin():

Index: Src/hist.c
@@ -671,8 +671,6 @@
     if (hist_ring && !hist_ring->ftim)
 	hist_ring->ftim = time(NULL);
     if (interact && isset(SHINSTDIN) && !strin) {
-	if (isset(SHAREHISTORY) || isset(INCREMENTALAPPENDHISTORY))
-	    savehistfile(NULL, 1, HFILE_USE_OPTIONS | HFILE_FAST);
 	histactive = HA_ACTIVE;
 	attachtty(mypgrp);
 	if (!hist_ring)
@@ -962,6 +960,8 @@
     zfree(chwords, chwordlen*sizeof(short));
     chline = NULL;
     histactive = 0;
+    if (isset(SHAREHISTORY) || isset(INCREMENTALAPPENDHISTORY))
+	savehistfile(NULL, 1, HFILE_USE_OPTIONS | HFILE_FAST);
     return !(flag & HISTFLAG_NOEXEC || errflag);
 }
 
Thanks for the feedback -- I appreciate it!

..wayne..

Re: PATCH: history improvements for 3.1.5-pws-17 and 3.0.6-pre-2

[Peter Stephenson]

I've applied both the other history patches, and it does exactly what I was
hoping, thanks.

Wayne Davison wrote:
> I'm torn on the issue, because sometimes I want to up-arrow through
> the total history, and sometimes I just want to press ^P and run the
> last command that I ran in this window, no exceptions.

You can setopt histverify and edit the line produced by !!, of course, but
I don't claim that's a perfect solution.

> I'd be interested in suggestions for how we can let the user choose
> between local-history and full-history movement.  Perhaps a toggle
> command?  Or a bindable prefix (so I can have ^P ignore shared
> history, and Up-Arrow include it)?  I like this idea.

You mean something like a toggle, either for the next command only or
permanently?  That might work.  You could then have a zle widget

up-line-or-local-history {
  zle toggle-local-history
  zle up-line-or-history
}

if it works on the next command, or

up-line-or-local-history {
  integer savnum=$NUMERIC
  NUMERIC=1
  zle toggle-local-history
  NUMERIC=$savnum
  zle up-line-or-history
  NUMERIC=0
  zle toggle-local-history
}

if it was a permanent state change.  Hmmm, it might be a good idea to
make `zle widget num' override the value of $NUMERIC with num when calling
a widget.

> > I'd like to suggest that any zle reference to the history [...]
> > causes the newly imported stuff to be visible.
> 
> I think that some zle commands, such as accept_and_infer_next_
> history, should remain unaffected by foreign commands.

OK, I hadn't thought about that one, it was really only up/down commands
that crossed my mind.

> I think you've misinterpreted what's going on.  The current code
> waits until the command _finishes_ before adding it to the history
> file.  I did this because the extended_history format contains the
> finish time of the command.  I also don't like this delay in adding
> the command, though, so I think we add the command after it is typed,
> and just live with the fact that all the finish times will be the
> same as the start times when using incremental_append_history (which
> is used by shared_history).

I don't quite understand how that was making the difference.  The command
was finishing in one window; all my comments about how the history list got
retrieved in the other window presupposed I hadn't done anything else in
the first window, i.e. its command was definitely saved.  Is the point
that reading the foreign history happened at the same time as writing the
local one, so that the line saved from the first window was getting read
later than I expected in the second?  though I don't quite believe that,
looking at the old code.

Perhaps on the question of incremental_append_history/append_history it
would be a good idea to ask on the users list if they like the idea of the
existing option being altered.  The effect is different, even if you aren't
using shared history, however.

-- 
Peter Stephenson <pws@ibmth.df.unipi.it>       Tel: +39 050 844536
WWW:  http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarroti 2, 56127 Pisa, Italy

Re: PATCH: history improvements for 3.1.5-pws-17

[Wayne Davison]

Peter Stephenson writes:
> I've applied both the other history patches, and it does exactly
> what I was hoping, thanks.

Unfortunately there's a problem with how the relocated
savehistfile() call interacts with remhist() in that 2-file tweak.
Fortunately, it's easy to fix.

> Hmmm, it might be a good idea to make `zle widget num' override the
> value of $NUMERIC with num when calling a widget.

I like this -- it makes writing an up-line-or-local-history function
much simpler.

Appended is a patch with the following changes (apply it over the
top of my previous 2-file tweak):

 + Added the zle command: set-local-history.  If called with a
   non-zero numeric argument, it enables the browsing of local-only
   history.  If called with a zero argument, it turns off local-only
   history.  If called with no argument, it toggles the current
   setting.  I didn't add a keybinding for this, but I've got it
   bound to Esc-/ in my .zshrc for the moment.

 + Made the history-browsing commands honor the setting of the set-
   local-history toggle (including the history up/down commands, and
   searching commands, but not ! references -- should they change
   too?)

 + Foreign lines no longer get UNmarked as foreign at any time.

 + The history command displays a '*' next to the history number of
   foreign lines.

 + You can now call "zle WIDGET NUM" to temporarily set the "zmult"
   value for that widget (the old value gets restored after the
   widget runs).  If you supply a non-numeric argument, the widget
   is called without the MOD_MULT flag set (which typically results
   in a zmult of '1', but there are other commands that have a
   different default).

 + Commands that call remhist() (like "history") once again remove
   the right line (this was broken in my 2-file tweak).

 + The sequence of load/save events is now:  load the shared history
   right before we store the current line, and then we write it out.
   This means that most of the time up-history will access the
   previous command even when a foreign-history command shows up.
   (Of course, if you enter an empty command then there's not current
   command to save, so the imported command(s) will be first when you
   press up-arrow.)

 + If you don't have hist_ignore_all_dups set, we import all shared
   history lines into the buffer, even lines that we already have.

 + The histfilelock() code waits a little longer before breaking a
   stale lock file (10 seconds rather than 5).  Is that long enough?

I didn't change any option names -- I figure I'll let you decide to
shorten them if you'd like to.

I'm currently using the following code to make Ctrl-P avoid foreign
history, while up-arrow (and other commands) include it:

up-line-or-local-history() {
    zle set-local-history 1
    zle up-line-or-history
    zle set-local-history 0
}
zle -N up-line-or-local-history

down-line-or-local-history() {
    zle set-local-history 1
    zle down-line-or-history
    zle set-local-history 0
}
zle -N down-line-or-local-history

..wayne..

---8<------8<------8<------8<---cut here--->8------>8------>8------>8---
Index: Doc/Zsh/options.yo
@@ -831,21 +831,20 @@
 cindex(share history)
 cindex(history, sharing)
 item(tt(SHARE_HISTORY))(
-This option both imports new commands from the history file (ones
-that are not already in your history list), and also causes your
-typed commands to be appended to the history file (like specifiying
-tt(INCREMENTAL_APPEND_HISTORY)).  The history lines are also output
-with timestamps (see tt(EXTENDED_HISTORY)) to make it easier to
-find where we were in the file after the file gets re-written.
 
-In an attempt to avoid confusing the user, most history commands
-avoid these "foreign" commands.  They can be found by using an
-incremental or line-prefix history search (not including `tt(^)' or
-`tt(!)').  You can also make them visible to all commands by using a
-command that shows the history (such as `history' or `fc -l') or
-a command that explicitly imports history lines (`fc -RI').
+This option both imports new commands from the history file, and also
+causes your typed commands to be appended to the history file (like
+specifiying tt(INCREMENTAL_APPEND_HISTORY)).  The history lines are also
+output with timestamps ala tt(EXTENDED_HISTORY) (which makes it easier to
+find the spot where we left off reading the file after it gets re-written).
 
-If you find that you want more control over when foreign commands
+By default, history movement commands visit the imported lines as well as
+the local lines, but you can toggle this on and off with the
+set-local-history zle binding.  It is also possible to create a zle
+widget that will make some commands ignore imported commands, and some
+include them.
+
+If you find that you want more control over when commands
 get imported, you may wish to turn tt(SHARE_HISTORY) off,
 tt(INCREMENTAL_APPEND_HISTORY) on, and then manually import
 commands whenever you need them using `fc -RI'.
Index: Src/Zle/iwidgets.list
@@ -91,6 +91,7 @@
 "send-break", sendbreak, 0
 "set-mark-command", setmarkcommand, ZLE_MENUCMP | ZLE_KEEPSUFFIX | ZLE_LASTCOL
 "spell-word", spellword, 0
+"set-local-history", setlocalhistory, 0
 "transpose-chars", transposechars, 0
 "transpose-words", transposewords, 0
 "undefined-key", undefinedkey, 0
Index: Src/Zle/zle_hist.c
@@ -297,7 +297,8 @@
 	srch_str = zalloc(histpos);
 	memcpy(srch_str, line, histpos);
     }
-    for (he = up_histent(quietgethist(histline)); he; he = up_histent(he)) {
+    he = quietgethist(histline);
+    while ((he = movehistent(he, -1, hist_skip_flags))) {
 	if (isset(HISTFINDNODUPS) && he->flags & HIST_DUP)
 	    continue;
 	s = ZLETEXT(he);
@@ -337,7 +338,8 @@
 	srch_str = zalloc(histpos);
 	memcpy(srch_str, line, histpos);
     }
-    for (he=down_histent(quietgethist(histline)); he; he=down_histent(he)) {
+    he = quietgethist(histline);
+    while ((he = movehistent(he, 1, hist_skip_flags))) {
 	if (isset(HISTFINDNODUPS) && he->flags & HIST_DUP)
 	    continue;
 	s = ZLETEXT(he);
@@ -452,16 +454,27 @@
     mkundoent();
     histline = he->histnum;
     setline(ZLETEXT(he));
-    /*he->flags &= ~HIST_FOREIGN;*/
     setlastline();
     clearlist = 1;
 }
 
 /**/
+void
+setlocalhistory(void)
+{
+    if (zmod.flags & MOD_MULT) {
+	hist_skip_flags = zmult? HIST_FOREIGN : 0;
+    }
+    else {
+	hist_skip_flags ^= HIST_FOREIGN;
+    }
+}
+
+/**/
 int
 zle_goto_hist(int ev, int n)
 {
-    Histent he = movehistent(quietgethist(ev), n, 0);
+    Histent he = movehistent(quietgethist(ev), n, hist_skip_flags);
     if (!he)
 	return 0;
     zle_setline(he);
@@ -682,7 +695,7 @@
 		    statusline = ibuf + NORM_PROMPT_POS;
 		    break;
 		}
-		if (!(he = dir > 0? down_histent(he) : up_histent(he))) {
+		if (!(he = movehistent(he, dir, hist_skip_flags))) {
 		    if (sbptr == (int)isrch_spots[top_spot-1].len
 		     && (isrch_spots[top_spot-1].flags & ISS_FAILING))
 			top_spot--;
@@ -1024,7 +1037,7 @@
     }
     t0 = strlen(visrchstr);
     he = quietgethist(histline);
-    while ((he = (visrchsense < 0? up_histent(he) : down_histent(he)))) {
+    while ((he = movehistent(he, visrchsense, hist_skip_flags))) {
 	if (isset(HISTFINDNODUPS) && he->flags & HIST_DUP)
 	    continue;
 	s = ZLETEXT(he);
@@ -1068,7 +1081,8 @@
 	zmult = n;
 	return;
     }
-    for (he = up_histent(quietgethist(histline)); he; he = up_histent(he)) {
+    he = quietgethist(histline);
+    while ((he = movehistent(he, -1, hist_skip_flags))) {
 	if (isset(HISTFINDNODUPS) && he->flags & HIST_DUP)
 	    continue;
 	s = ZLETEXT(he);
@@ -1102,7 +1116,8 @@
 	zmult = n;
 	return;
     }
-    for (he=down_histent(quietgethist(histline)); he; he=down_histent(he)) {
+    he = quietgethist(histline);
+    while ((he = movehistent(he, 1, hist_skip_flags))) {
 	if (isset(HISTFINDNODUPS) && he->flags & HIST_DUP)
 	    continue;
 	s = ZLETEXT(he);
Index: Src/Zle/zle_thingy.c
@@ -357,7 +357,7 @@
 
     /* check number of arguments */
     for(n = 0; args[n]; n++) ;
-    if(!op->o && n != 1) {
+    if(!op->o && n != 1 && n != 2) {
 	zerrnam(name, "wrong number of arguments", NULL, 0);
 	return 1;
     }
@@ -516,17 +516,31 @@
 bin_zle_call(char *name, char **args, char *ops, char func)
 {
     Thingy t;
+    struct modifier modsave;
 
     if(!zleactive || incompctlfunc || incompfunc) {
 	zerrnam(name, "widgets can only be called when ZLE is active",
 	    NULL, 0);
 	return 1;
     }
+    if (args[1]) {
+	modsave = zmod;
+	if (isdigit(*args[1])) {
+	    zmod.mult = atoi(args[1]);
+	    zmod.flags |= MOD_MULT;
+	}
+	else {
+	    zmod.mult = 1;
+	    zmod.flags &= ~MOD_MULT;
+	}
+    }
     t = rthingy(args[0]);
     PERMALLOC {
       execzlefunc(t);
     } LASTALLOC;
     unrefthingy(t);
+    if (args[1])
+	zmod = modsave;
     return 0;
 }
 
Index: Src/builtin.c
@@ -1353,7 +1353,6 @@
     }
 
     for (;;) {
-	ent->flags &= ~HIST_FOREIGN;
 	s = dupstring(ent->text);
 	/* this if does the pattern matching, if required */
 	if (!com || domatch(s, com, 0)) {
@@ -1361,8 +1360,10 @@
 	    fclistdone |= fcsubs(&s, subs);
 
 	    /* do numbering */
-	    if (n)
-		fprintf(f, "%5d  ", ent->histnum);
+	    if (n) {
+		fprintf(f, "%5d%c ", ent->histnum,
+			ent->flags & HIST_FOREIGN? '*' : ' ');
+	    }
 	    /* output actual time (and possibly date) of execution of the
 	    command, if required */
 	    if (d) {
Index: Src/hashtable.c
@@ -1323,9 +1323,8 @@
     HashNode oldnode = addhashnode2(ht, nam, nodeptr);
     Histent he = (Histent)nodeptr;
     if (oldnode && oldnode != nodeptr) {
-	if (he->flags & HIST_MAKEUNIQUE) {
-	    if (!(he->flags & HIST_FOREIGN))
-		oldnode->flags &= ~HIST_FOREIGN;
+	if (he->flags & HIST_MAKEUNIQUE
+	 || (he->flags & HIST_FOREIGN && (Histent)oldnode == he->up)) {
 	    he->flags |= HIST_DUP;
 	    addhashnode(ht, oldnode->nam, oldnode); /* Remove the new dup */
 	}
Index: Src/hist.c
@@ -96,9 +96,17 @@
 /**/
 int histactive;
 
+/* Current setting of the associated option, but sometimes also includes
+ * the setting of the HIST_SAVE_NO_DUPS option. */
+
 /**/
 int hist_ignore_all_dups;
 
+/* What flags (if any) we should skip when moving through the history */
+
+/**/
+int hist_skip_flags;
+
 /* Bits of histactive variable */
 #define HA_ACTIVE	(1<<0)	/* History mechanism is active */
 #define HA_NOSTORE	(1<<1)	/* Don't store the line when finished */
@@ -854,6 +862,7 @@
 hend(void)
 {
     int flag, save = 1;
+    char *hf = getsparam("HISTFILE");
 
     DPUTS(!chline, "BUG: chline is NULL in hend()");
     if (histdone & HISTFLAG_SETTY)
@@ -879,6 +888,9 @@
     if (hist_ignore_all_dups != isset(HISTIGNOREALLDUPS)
      && (hist_ignore_all_dups = isset(HISTIGNOREALLDUPS)) != 0)
 	histremovedups();
+    /* For history sharing, lock history file once for both read and write */
+    if (isset(SHAREHISTORY) && lockhistfile(hf, 0))
+	readhistfile(hf, 0, HFILE_USE_OPTIONS | HFILE_FAST);
     flag = histdone;
     histdone = 0;
     if (hptr < chline + 1)
@@ -916,7 +928,7 @@
 	Histent he;
 	int keepflags;
 
-	for (he = hist_ring; he && he->flags & HIST_FOREIGN;
+	for (he = hist_ring; he && he->flags & hist_skip_flags;
 	     he = up_histent(he)) ;
 #ifdef DEBUG
 	/* debugging only */
@@ -961,7 +973,8 @@
     chline = NULL;
     histactive = 0;
     if (isset(SHAREHISTORY) || isset(INCREMENTALAPPENDHISTORY))
-	savehistfile(NULL, 1, HFILE_USE_OPTIONS | HFILE_FAST);
+	savehistfile(hf, 1, HFILE_USE_OPTIONS | HFILE_FAST);
+    unlockhistfile(hf); /* It's OK to call this even if we aren't locked */
     return !(flag & HISTFLAG_NOEXEC || errflag);
 }
 
@@ -973,9 +986,7 @@
 {
     if (!(histactive & HA_ACTIVE)) {
 	if (!(histactive & HA_JUNKED)) {
-	    /* make sure this doesn't show up when we do firsthist() */
-	    if (hist_ring->histnum == curhist)
-		freehistnode((HashNode)hist_ring);
+	    freehistnode((HashNode)hist_ring);
 	    histactive |= HA_JUNKED;
 	    /* curhist-- is delayed until the next hbegin() */
 	}
@@ -1589,7 +1600,6 @@
 	    return;
 	lasthist.fsiz = sb.st_size;
 	lasthist.mtim = sb.st_mtime;
-	readflags |= HFILE_SKIPOLD;
     }
     else if (!lockhistfile(fn, 1))
 	return;
@@ -1614,7 +1624,8 @@
 	newflags = HIST_OLD | HIST_READ;
 	if (readflags & HFILE_FAST)
 	    newflags |= HIST_FOREIGN;
-	if (readflags & HFILE_SKIPOLD)
+	if (readflags & HFILE_SKIPOLD
+	 || (hist_ignore_all_dups && newflags & hist_skip_flags))
 	    newflags |= HIST_MAKEUNIQUE;
 	while (fpos = ftell(in), fgets(buf, bufsiz, in)) {
 	    int l = strlen(buf);
@@ -1756,13 +1767,7 @@
 	    lasthist.next_write_ev = he->histnum + 1;
 	    he = down_histent(he);
 	}
-	/* If we have something to write, lock before the (potential)
-	 * read so that we don't lock twice. */
-	if (he && !lockhistfile(fn, 0))
-	    return;
-	if (isset(SHAREHISTORY))
-	    readhistfile(fn, 0, HFILE_USE_OPTIONS | HFILE_FAST);
-	if (!he)
+	if (!he || !lockhistfile(fn, 0))
 	    return;
 	if (histfile_linect > savehist + savehist / 5)
 	    writeflags &= ~HFILE_FAST;
@@ -1890,7 +1895,7 @@
 			continue;
 		}
 		else if (keep_trying) {
-		    if (time(NULL) - sb.st_mtime < 5)
+		    if (time(NULL) - sb.st_mtime < 10)
 			sleep(1);
 		    else
 			unlink(lockfile);
@@ -1906,6 +1911,10 @@
     }
     return ct != lockhistct;
 }
+
+/* Unlock the history file if this corresponds to the last nested lock
+ * request.  If we don't have the file locked, just return.
+ */
 
 /**/
 void
---8<------8<------8<------8<---cut here--->8------>8------>8------>8---

Re: PATCH: history improvements for 3.1.5-pws-17 and 3.0.6-pre-2

[Bart Schaefer]

Another message I wish I could have replied to sooner.

On May 10,  9:53am, Peter Stephenson wrote:
} Subject: Re: PATCH: history improvements for 3.1.5-pws-17 and 3.0.6-pre-2
}
} Wayne Davison wrote:
} > I'd be interested in suggestions for how we can let the user choose
} > between local-history and full-history movement.  Perhaps a toggle
} > command?  Or a bindable prefix (so I can have ^P ignore shared
} > history, and Up-Arrow include it)?  I like this idea.
} 
} You mean something like a toggle, either for the next command only or
} permanently?  That might work.  You could then have a zle widget
} 
} up-line-or-local-history {
}   zle toggle-local-history
}   zle up-line-or-history
} }

Ugh.  I hate toggles.  You can't ask what state you're starting in, and
thus you can't know what state you should end up in.  What if I'm already
using local history when I invoke up-line-or-local-history?

If we're going to have any more toggles (overwrite-mode is the only one
we have so far, I think) then let's establish some kind of convention for
the behavior of numeric prefixes; such as, a negative prefix always turns
the toggled behavior off, a positive prefix always turns it on, and no
prefix switches between off and on.

And then somebody please fix "zle digit-argument", see zsh-workers/4099.
(Probably applies to universal-argument and neg-argument as well.)

} > I think that some zle commands, such as accept_and_infer_next_
} > history, should remain unaffected by foreign commands.

Oh, definitely.

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Re: PATCH: history improvements for 3.1.5-pws-17

[Bart Schaefer]

Man, I hate getting this far behind.

On May 11,  2:39am, Wayne Davison wrote:
} Subject: Re: PATCH: history improvements for 3.1.5-pws-17
}
} > Hmmm, it might be a good idea to make `zle widget num' override the
} > value of $NUMERIC with num when calling a widget.
} 
} I like this -- it makes writing an up-line-or-local-history function
} much simpler.

Way back in zsh-workers/4103 I griped:

    ... right now it's completely impossible for a user-defined
    widget to initiate a history search; "zle history-search-backward"
    just causes the shell to prompt the user for input, but the
    widget may already have a string it wants to search for.
    "history-search-backward string" is the natural way to perform
    that action.

If we're implementing this, why are we limiting it to *numeric* arguments?

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com