diff options
author | Bart Schaefer <barts@users.sourceforge.net> | 2000-06-10 17:30:22 +0000 |
---|---|---|
committer | Bart Schaefer <barts@users.sourceforge.net> | 2000-06-10 17:30:22 +0000 |
commit | 060ac27a1720fc7c207dfda8fc6fb4377db49971 (patch) | |
tree | dd39f8541e61af8fec550bb054159f2136fa696c | |
parent | 6b87e6fda32ce20feab9b4922c8841d5329c232f (diff) | |
download | zsh-060ac27a1720fc7c207dfda8fc6fb4377db49971.tar.gz zsh-060ac27a1720fc7c207dfda8fc6fb4377db49971.tar.xz zsh-060ac27a1720fc7c207dfda8fc6fb4377db49971.zip |
11850: Fix crash in menu-select on dumb terminals. Also, a ChangeLog entry
for PWS's 11842.
-rw-r--r-- | ChangeLog | 13 | ||||
-rw-r--r-- | Src/Zle/complist.c | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index c6fb2f1fd..64ba3617c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2000-06-10 Bart Schaefer <schaefer@zsh.org> + + * 11850: Src/Zle/complist.c: Don't try to menuselect in a listing + that isn't there, e.g., because the TERM is too dumb to draw it. + +2000-06-09 Peter Stephenson <pws@cambridgesiliconradio.com> + + * 11842 (repeat of 11838): Doc/Zsh/builtins.yo, Src/builtin.c, + Src/params.c, Src/subst.c, Src/zsh.h, Src/Modules/mapfile.c, + Src/Modules/parameter.c: add the HIDEVAL parameter attribute and + set it by default for parameters created by the mapfile and + parameter modules, to restore sanity of `typeset' output. + 2000-06-09 Clint Adams <schizo@debian.org> * 11839: Src/signals.c: prevent segmentation fault in diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index cbc39266f..c1481612b 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -1627,6 +1627,8 @@ domenuselect(Hookdef dummy, Chdata dat) int space, lbeg = 0, step = 1, wrap, pl = nlnct, broken = 0, first = 1; char *s; + if (!mtab) + return 0; if (fdat || (dummy && (!(s = getsparam("MENUSELECT")) || (dat && dat->num < atoi(s))))) { if (fdat) { |