mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-10 12:40:58 +02:00
Code Releases Activity

34784: fix old bug with history word selection

Browse source
This commit is contained in:
Peter Stephenson 2015-03-26 20:28:13 +00:00
parent 784a9f786d
commit 3774bae034
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-03-26 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 34784: Src/input.c, Src/zsh.h: fix old bug with history
selection.
2015-03-25 Barton E. Schaefer <schaefer@zsh.org> 2015-03-25 Barton E. Schaefer <schaefer@zsh.org>
* 34779: Test/A02alias.ztst: tests for 34776 * 34779: Test/A02alias.ztst: tests for 34776

27
Src/input.c
View file

@ -56,8 +56,9 @@
* inpop(), which effectively flushes any unread input as well as restoring * inpop(), which effectively flushes any unread input as well as restoring
* the previous input state. * the previous input state.
* *
* The internal flag INP_ALCONT shows that the stack element was pushed * The internal flags INP_ALCONT and INP_HISTCONT show that the stack
* by an alias expansion; it should not be needed elsewhere. * element was pushed by an alias or history expansion; they should not
* be needed elsewhere.
* *
* The global variable inalmore is set to indicate aliases should * The global variable inalmore is set to indicate aliases should
* continue to be expanded because the last alias expansion ended * continue to be expanded because the last alias expansion ended
@ -446,7 +447,8 @@ inungetc(int c)
* we may need to restore an alias popped from the stack. * we may need to restore an alias popped from the stack.
* Note this may be a dummy (history expansion) entry. * Note this may be a dummy (history expansion) entry.
*/ */
if (inbufptr == inbufpush && inbufflags & INP_ALCONT) { if (inbufptr == inbufpush &&
(inbufflags & (INP_ALCONT|INP_HISTCONT))) {
/* /*
* Go back up the stack over all entries which were alias * Go back up the stack over all entries which were alias
* expansions and were pushed with nothing remaining to read. * expansions and were pushed with nothing remaining to read.
@ -455,8 +457,12 @@ inungetc(int c)
if (instacktop->alias) if (instacktop->alias)
instacktop->alias->inuse = 1; instacktop->alias->inuse = 1;
instacktop++; instacktop++;
} while ((instacktop->flags & INP_ALCONT) && !instacktop->bufleft); } while ((instacktop->flags & (INP_ALCONT|INP_HISTCONT))
inbufflags = INP_CONT|INP_ALIAS; && !instacktop->bufleft);
if (inbufflags & INP_HISTCONT)
inbufflags = INP_CONT|INP_ALIAS|INP_HIST;
else
inbufflags = INP_CONT|INP_ALIAS;
inbufleft = 0; inbufleft = 0;
inbuf = inbufptr = ""; inbuf = inbufptr = "";
} }
@ -522,7 +528,7 @@ inpush(char *str, int flags, Alias inalias)
instacktop->bufptr = inbufptr; instacktop->bufptr = inbufptr;
instacktop->bufleft = inbufleft; instacktop->bufleft = inbufleft;
instacktop->bufct = inbufct; instacktop->bufct = inbufct;
inbufflags &= ~INP_ALCONT; inbufflags &= ~(INP_ALCONT|INP_HISTCONT);
if (flags & (INP_ALIAS|INP_HIST)) { if (flags & (INP_ALIAS|INP_HIST)) {
/* /*
* Text is expansion for history or alias, so continue * Text is expansion for history or alias, so continue
@ -531,7 +537,10 @@ inpush(char *str, int flags, Alias inalias)
* and mark alias as in use. * and mark alias as in use.
*/ */
flags |= INP_CONT|INP_ALIAS; flags |= INP_CONT|INP_ALIAS;
instacktop->flags = inbufflags | INP_ALCONT; if (flags & INP_HIST)
instacktop->flags = inbufflags | INP_HISTCONT;
else
instacktop->flags = inbufflags | INP_ALCONT;
if ((instacktop->alias = inalias)) if ((instacktop->alias = inalias))
inalias->inuse = 1; inalias->inuse = 1;
} else { } else {
@ -570,7 +579,7 @@ static void
inpoptop(void) inpoptop(void)
{ {
if (!lexstop) { if (!lexstop) {
inbufflags &= ~INP_ALCONT; inbufflags &= ~(INP_ALCONT|INP_HISTCONT);
while (inbufptr > inbuf) { while (inbufptr > inbuf) {
inbufptr--; inbufptr--;
inbufct++; inbufct++;
@ -598,7 +607,7 @@ inpoptop(void)
inbufct = instacktop->bufct; inbufct = instacktop->bufct;
inbufflags = instacktop->flags; inbufflags = instacktop->flags;
if (!(inbufflags & INP_ALCONT)) if (!(inbufflags & (INP_ALCONT|INP_HISTCONT)))
return; return;
if (instacktop->alias) { if (instacktop->alias) {

5
Src/zsh.h
View file

@ -411,8 +411,9 @@ enum {
#define INP_HIST (1<<2) /* expanding history */ #define INP_HIST (1<<2) /* expanding history */
#define INP_CONT (1<<3) /* continue onto previously stacked input */ #define INP_CONT (1<<3) /* continue onto previously stacked input */
#define INP_ALCONT (1<<4) /* stack is continued from alias expn. */ #define INP_ALCONT (1<<4) /* stack is continued from alias expn. */
#define INP_LINENO (1<<5) /* update line number */ #define INP_HISTCONT (1<<5) /* stack is continued from history expn. */
#define INP_APPEND (1<<6) /* Append new lines to allow backup */ #define INP_LINENO (1<<6) /* update line number */
#define INP_APPEND (1<<7) /* Append new lines to allow backup */
/* Flags for metafy */ /* Flags for metafy */
#define META_REALLOC 0 #define META_REALLOC 0