diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2001-04-09 17:26:57 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2001-04-09 17:26:57 +0000 |
| commit | a3a59f1f3779440a0e7a8736122b4aca41e4909a (patch) | |
| tree | d30faba1d17e5e7c0b7f3c7a3a31b47daa636dcf | |
| parent | 5d0231e10545a1b5039807095b966cb14b169f3d (diff) | |
| download | zsh-a3a59f1f3779440a0e7a8736122b4aca41e4909a.tar.gz zsh-a3a59f1f3779440a0e7a8736122b4aca41e4909a.tar.xz zsh-a3a59f1f3779440a0e7a8736122b4aca41e4909a.zip | |
Fixes for 13922.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Src/Modules/termcap.mdd | 7 | ||||
| -rw-r--r-- | Src/Modules/terminfo.c | 2 | ||||
| -rw-r--r-- | Src/Modules/terminfo.mdd | 7 |
4 files changed, 11 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index f4478a0e7..5b26c8bc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2001-04-09 Bart Schaefer <schaefer@zsh.org> + * unposted: Src/modules/terminfo.c: Unset the terminfo parameter + on autoload when terminfo is not available, to suppress a warning + about autoload failure. + + * 13931: Src/Modules/termcap.mdd, Src/Modules/terminfo.mdd: Fix + `load' directives broken by 13922. + * 13922: Src/Modules/termcap.c, Src/Modules/termcap.mdd, Src/Modules/terminfo.c, Src/Modules/terminfo.mdd: Loading these modules should work even if the corresponding library is not diff --git a/Src/Modules/termcap.mdd b/Src/Modules/termcap.mdd index 9a6ddd08e..17d07aa03 100644 --- a/Src/Modules/termcap.mdd +++ b/Src/Modules/termcap.mdd @@ -10,12 +10,7 @@ link='if test "x$ac_cv_func_tgetent" = xyes; then echo either; fi ' -load='if test "x$ac_cv_func_tgetent" = xyes; then - echo yes; - else - echo no; - fi -' +load=yes autobins="echotc" diff --git a/Src/Modules/terminfo.c b/Src/Modules/terminfo.c index 0cac6e530..fd21a3de3 100644 --- a/Src/Modules/terminfo.c +++ b/Src/Modules/terminfo.c @@ -215,6 +215,8 @@ boot_(Module m) if (!createtihash()) return 1; +#else + unsetparam(terminfo_nam); #endif return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab)); } diff --git a/Src/Modules/terminfo.mdd b/Src/Modules/terminfo.mdd index 580aa2893..da79e9768 100644 --- a/Src/Modules/terminfo.mdd +++ b/Src/Modules/terminfo.mdd @@ -10,12 +10,7 @@ link='if test "x$ac_cv_func_tigetstr" = xyes; then echo either; fi ' -load='if test "x$ac_cv_func_tigetstr" = xyes; then - echo yes; - else - echo no; - fi -' +load=yes autobins="echoti" autoparams="terminfo" |