From 51cb3f0a27ea185be2d703be822b2b4b23eba0b7 Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Wed, 3 Nov 1999 09:06:17 +0000 Subject: zsh-3.1.6-bart-8 --- ChangeLog | 389 +++++++++++++++++++++++++++++++++++++++++ Completion/Base/.distfiles | 5 +- Completion/Builtins/.distfiles | 2 +- Completion/Builtins/_popd | 9 +- Completion/User/_man | 2 +- Config/version.mk | 4 +- Doc/Makefile.in | 2 +- Doc/Zsh/.distfiles | 10 +- Doc/Zsh/compsys.yo | 9 + Etc/FAQ.yo | 2 +- Functions/Prompts/.distfiles | 2 +- Functions/Prompts/promptinit | 19 +- Functions/Zle/predict-on | 7 +- Src/Modules/mathfunc.c | 2 +- Src/Zle/.distfiles | 6 +- Src/Zle/complist.c | 2 +- configure.in | 2 +- 17 files changed, 434 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 757bc7803..5b7938ff8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,392 @@ +1999-11-03 Bart Schaefer + + * Config/version.mk: Set version string to 3.1.6-bart-8. + + * Doc/Zsh/Makefile.in, Src/Zle/zle.mdd: The comp1 module is obsolete. + +1999-11-02 Bart Schaefer + + * Src/Zle/comp1.c, Src/Zle/comp1.export, Src/Zle/comp1.mdd: Sven: + 8424: These files are obsolete now. + + * Src/Zle/compcore.c: Sven: 8495: The wrong cline struct was being + tested, causing improper auto-suffix-removal behavior. + + * Completion/Core/_path_files: Sven: 8494: Fix up prefix/suffix + manipulations. + + * Completion/Base/_value: Tanaka: 8491: Call _value after + redefining it. + + * Src/Zle/compcore.c, Src/Zle/compresult.c, Src/Zle/computil.c: + Sven: 8490: Fix display bugs and a fencepost error. + + * Src/Modules/parameter.c: Sven: 8490: Use the correct scan for + disabled aliases. + + * Completion/User/_urls: Sven: 8490: Don't use "hosts" as a local + paramter name, _hosts wants to see the global when it gets called + later. + + * Src/exec.c: Sven: 8488: Pass a copy of the function name to + module wrappers in case the function undefines/redefines itself. + + * Completion/Base/_value: Tanaka: 8487: Completions after + parameter assignments. + + * Completion/User/_make: Tanaka: 8486: Some BSD-variant special cases. + + * Completion/Debian/_apt, Completion/User/_archie: Tanaka: 8485: + Fix typos and minor omissions. + + * Completion/User/_cvs, Completion/User/_whois, + Completion/Core/compinit, Completion/Base/_combination: Sven: + 8484: Use parameter module for testing function existence; fix a + couple of small bugs. + + * Src/Modules/parameter.c: Sven: 8482: Make sure special AA param + keys are set when needed. + + * Src/Zle/compcore.c, Src/Zle/compmatch.c: Sven: 8481: An empty + string in compmatchers means try global match specs. + + * Doc/Zsh/mod_parameter.yo, Src/Modules/parameter.c, + Src/Modules/parameter.mdd, Completion/Core/compinit: Sven: 8480: + Add funcstack parameter. + + * Completion/Core/_path_files: Sven: 8479: Use globdots throughout. + + * Completion/Base/_first: Sven: 8479: Fix example code (in comment). + + * Doc/Zsh/expn.yo, Src/glob.c: Sven: zsh-users/2713: Qualifier (n) + sets numeric-glob-sort for current glob. + + * Src/Zle/zle_thingy.c, Src/Zle/zle_tricky.c, Doc/Zsh/compctl.yo, + Doc/Zsh/compsys.yo, Doc/Zsh/compwid.yo, Doc/Zsh/intro.yo, + Doc/Zsh/manual.yo, Doc/Zsh/mod_complete.yo, Doc/Zsh/modules.yo, + Doc/Zsh/zle.yo, Src/Zle/comp.h, Src/Zle/compcore.c, + Src/Zle/complete.c, Src/Zle/complete.mdd, Src/Zle/complist.c, + Src/Zle/compmatch.c, Src/Zle/compresult.c, Src/Zle/zle.h, + Src/Zle/zle_main.c, Src/Zle/zle_misc.c, Doc/zsh.yo: Sven: 8478 (as + described in 8475 and 8476): Continue the re-modularization of the + new completion system, moving some doc into new sections and + moving most of the completion code from zle_tricky.c into three + new files. + + * Completion/Core/compinit: Sven: 8475: Call zmodload on parameter + and zleparameter. This may not be necessary, as it wasn't + included in the correction in 8478. + + * Src/Modules/parameter.c: Sven: 8474: Fix computation from + previous patch for whether values are needed. + + * Src/hashtable.c: Sven: 8474: Fall back on getpwent() if NIS + and/or NIS+ don't find anything. + + * Src/signals.c: Sven: 8473: Reset sigtrapped[] during dosavetrap(). + + * Src/Modules/parameter.c, Src/Zle/zleparameter.c: Sven: 8472: + Don't calculate values for special parameters unless needed. + + * Functions/Zle/predict-on: Use a "repeat 1" instead of "while + true" for a dummy loop. (Unposted.) + + * Completion/Builtins/_functions, Completion/Builtins/_unhash, + Completion/Builtins/_which, Completion/Builtins/_zle, + Completion/Builtins/_zmodload, Doc/Zsh/mod_parameter.yo, + Doc/Zsh/mod_zleparameter.yo, Src/Modules/parameter.c, + Src/Modules/parameter.mdd, Src/Zle/zleparameter.c, + Src/Zle/zleparameter.mdd, Completion/Base/_command_names, + Completion/Base/_equal, Completion/Builtins/_aliases, + Completion/Builtins/_bindkey, Completion/Builtins/_builtin, + Completion/Builtins/_disable, Completion/Builtins/_enable: Sven: + 8471: Split some paramters into enabled and disabled variants. + + * Functions/Zle/predict-on: Sven: 8470: Test list_max of 0 as a + special case. + + * configure.in: Zefram: 8459: More places to hunt for signals and + resources. + + * Completion/Core/compinit, Doc/Zsh/compsys.yo, Src/xmods.conf: + Sven: 8440: Auto-autoload the parameter modules, because + completion won't work without them. + + * Src/Zle/zle_tricky.c: Sven: 8439: Completion lists respect + NUMERIC_GLOB_SORT. + + * Src/Zle/zle_tricky.c: Sven: 8438: Force recompute of completion + list in listlist(). + + * Src/Zle/complist.c, Src/Zle/zle_tricky.c: Sven: 8437: Fix crash + in menu-select and remove old ref to ZLS_SELECT param. + + * Src/Zle/compctl.mdd, Src/Zle/complete.c, Src/Zle/complete.mdd, + Src/Zle/complist.c, Src/Zle/complist.mdd, Src/Zle/computil.mdd, + Src/Zle/zle.h, Src/Zle/zle_keymap.c, Src/Zle/zle_main.c, + Src/Zle/zle_thingy.c, Src/Zle/zle_tricky.c, + Src/Zle/zleparameter.c, Src/Zle/zleparameter.mdd, + Doc/Zsh/compwid.yo, Doc/Zsh/expn.yo, Doc/Zsh/manual.yo, + Doc/Zsh/mod_clone.yo, Doc/Zsh/mod_compctl.yo, + Doc/Zsh/mod_complete.yo, Doc/Zsh/mod_computil.yo, + Doc/Zsh/mod_parameter.yo, Doc/Zsh/mod_zle.yo, + Doc/Zsh/mod_zleparameter.yo, Doc/Zsh/modules.yo, + Src/Modules/parameter.c, Src/Modules/parameter.mdd, + Src/Zle/comp.h, Src/Zle/compctl.h, Src/hashtable.c, Src/module.c, + Src/params.c, Src/subst.c, Src/xmods.conf, Completion/User/_cvs, + Completion/User/_gdb, Completion/User/_man, Completion/User/_mh, + Completion/User/_nslookup, Completion/User/_tar, + Completion/User/_urls, Completion/User/_users, + Completion/User/_whereis, Completion/User/_whois, + Completion/X/_x_font, Completion/X/_x_window, + Completion/X/_xmodmap, Doc/Makefile.in, Doc/Zsh/compctl.yo, + Doc/Zsh/compsys.yo, Completion/Debian/_apt, + Completion/Core/_approximate, Completion/Core/_main_complete, + Completion/Core/_normal, Completion/Core/_options, + Completion/Core/_parameters, Completion/Core/_path_files, + Completion/Core/compinit, Completion/Commands/_bash_completions, + Completion/Commands/_history_complete_word, + Completion/Commands/_read_comp, Completion/Builtins/_aliases, + Completion/Builtins/_arrays, Completion/Builtins/_bg_jobs, + Completion/Builtins/_bindkey, Completion/Builtins/_builtin, + Completion/Builtins/_cd, Completion/Builtins/_command, + Completion/Builtins/_compdef, Completion/Builtins/_disable, + Completion/Builtins/_enable, Completion/Builtins/_fc, + Completion/Builtins/_functions, Completion/Builtins/_hash, + Completion/Builtins/_jobs, Completion/Builtins/_kill, + Completion/Builtins/_set, Completion/Builtins/_stat, + Completion/Builtins/_trap, Completion/Builtins/_unhash, + Completion/Builtins/_wait, Completion/Builtins/_which, + Completion/Builtins/_zle, Completion/Builtins/_zmodload, + Completion/Base/_arguments, Completion/Base/_brace_parameter, + Completion/Base/_command_names, Completion/Base/_describe, + Completion/Base/_equal, Completion/Base/_first, + Completion/Base/_job, Completion/Base/_regex_arguments, + Completion/Base/_tilde, Completion/Base/_values: Sven: 8424: + Rearrange completion code to make the new function-based system + the default and begin separating zle_tricky, the old compctl + stuff, and the new system into better-segregated modules. + + * Src/Zle/compctl.c: Port from zle_tricky.c my local stubbornness + patch to use short job names, not whole job listings, in job + completions. + + * Src/Zle/compctl.c: Sven: 8424: Rearrange completion code to make + the new function-based system the default and begin separating + zle_tricky, the old compctl stuff, and the new system into + better-segregated modules. + +1999-10-27 Bart Schaefer + + * Functions/Zle/predict-on: Better handling of automenu, and don't + generate a listing if nmatches is so big that it would generate a + "do you wish ...?" prompt. + + * Functions/Zle/predict-on, Doc/Zsh/compsys.yo: Sven: 8442: "Pour + some compconfig over" predict-on. + +1999-10-26 Bart Schaefer + + * Functions/Zle/predict-on: As per Sven's suggestion, use a + comppostfuncs function to suppress the "do you wish to see all + possibilities?" message on long listings. + +1999-10-25 Bart Schaefer + + * Src/Zle/complist.c: Alexandre Duret-Lutz: 8413: Tweak 8412 to + extend the menu-selection highlight to the full width of the + column. + + * Src/Zle/complist.c, Doc/Zsh/mod_complist.yo: Sven: 8412: Add + separate colorings for the file-type-marker and for background + spaces, to be able to more closely copy GNU color-ls. + + * Src/Modules/parameter.c: Bart: 8404: Implement "autoload -X" and + change the value of "$functions" to fit. Also fix a crash-bug + when unloading this module. + + * Src/builtin.c, Src/exec.c, Src/hashtable.c, Doc/Zsh/builtins.yo, + Doc/Zsh/func.yo: Bart: 8404: Implement "autoload -X" and change the + output of "functions" to fit. + + * Doc/Zsh/zle.yo: Sven: 8400: BLINES -> BUFFERLINES + +1999-10-24 Bart Schaefer + + * Src/zsh.mdd: Don't forcibly rebuild zshpaths.h; instead make it + depend on the usual configuration-related makefile fragments. + + * Src/parse.c: Fix function-body parsing bug introduced by earlier + optimizations. + +1999-10-22 Bart Schaefer + + * Src/Modules/stat.c: Alexandre Duret-Lutz: 8371: Make "stat -g" + correspond to the doc for it. + + * Src/hist.c: Alexandre Duret-Lutz: 8376: !# history expansion now + works during completion, as it has in 3.0 since June 1, 1997. + + * Src/main.c, Src/params.c, Src/system.h, INSTALL, acconfig.h, + configure.in: Zefram: 8372: Configure option to disable + setlocale() support, and also do a linkage test for it rather than + simply test for the LC_ALL constant. + + * Functions/Zle/predict-on: Back out Sven's suggested compmatchers + for now; turn off prediction when a delete-char-or-list is + performed. + +1999-10-21 Bart Schaefer + + * Functions/Zle/predict-on: Refine, and improve commentary. + + * Completion/Builtins/_cd, Completion/Builtins/_popd: Oliver: + 8361: Factor out handling of +/- dirstack offsets from _cd to make + completer for _popd; fix _cd handling of directory names that + actually do begin with a + or -. + + * Src/Zle/computil.c: Sven: 8360: Still more parsing fixes. + + * Completion/User/_bison: Sven: 8360: Improved option recognition. + + * Completion/Base/_arguments, Completion/Base/_values: Sven: 8360: + More computil-related tweaking. + + * Completion/Builtins/_sched: Oliver: 8359: Complete scheduled + jobs for removal. + + * Src/Zle/computil.c: Sven: 8357: More options-parsing tweaks. + + * Functions/Prompts/promptinit, + Functions/Prompts/prompt_oliver_setup: Oliver: 8353: Simplified + handling of prompt_opts. + + * Src/Zle/computil.c: Sven: 8352: Fix parsing bugs. + + * Completion/User/_bison: Sven: 8352: Complete .y files as well. + + * Completion/Base/_arguments: Sven: 8352: Delay calling _message + so it won't confuse compstate[insert]. + + * Src/Zle/zle_tricky.c: Sven: 8350: Fixes to cline handling of + position of braces and of cursor following completion in nested + braces. + + * Functions/Zle/predict-on: If history-beginning-search-backward + fails, attempt complete-word. + + * Completion/Core/_path_files: Sven: 8350: Fix prefix/suffix settings. + + * configure.in: Clint Adams: 8346: Fix typos. + + * Src/Zle/computil.c: Sven: 8340: Fix memory management bugs and + confusion about word ranges when restricting compwords. + + * Completion/Core/_path_files: Sven: 8340: Fix completion on empty + string. + +1999-10-20 Bart Schaefer + + * Functions/Prompts/promptinit: Oliver: 8335: Provide the + prompt_opts assoc. array to specify what options are needed by a + given prompt theme, and arrange to set them by putting the + localoptions-affected guts of the prompt function into set_prompt + and then calling setopt after it finishes. (Tweaked to avoid + reindentation.) + +1999-10-19 Bart Schaefer + + * Src/Zle/comp.h, Src/Zle/complist.c, Src/Zle/zle_tricky.c: Sven: + 8333: Handle completion in nested brace-expressions. + + * Src/Builtins/rlimits.c: Display the sockbufsize and maxpthreads + limits in "ulimit -a" output. + + * Src/Builtins/rlimits.awk, Doc/Zsh/builtins.yo: Add the + "maxpthreads" limit as reported by Albert Chin. + + * Src/Zle/comp1.export, Src/Zle/compctl.export, + Src/Zle/zle.export: Oliver: 8323: Declarations needed to build + shared objects on AIX. + + * Src/Zle/zle_tricky.c: Sven: 8322: Fix overeager slash-addition + and suffix-elimination. + + * Completion/Core/_path_files: Sven: 8322: Complete directories up + to a trailing slash even if there are no further subdirectories, + but continue to make any subdirectories candidates for further + completion when a trailing slash is present. + + * Src/Builtins/rlimits.awk, Doc/Zsh/builtins.yo: Rename + "sktbuffersize" as "sockbufsize". + + * Src/cond.c: Sven: 8321: Fix bug in new cmpile-once "case" handling. + +1999-10-18 Bart Schaefer + + * Src/Builtins/rlimits.awk, Src/Builtins/rlimits.c, + Src/Builtins/rlimits.mdd: Zefram: 8320: Sort the resource list for + "limit", rename "sbsize" to "sktbuffersize", fix problems handling + memory type limits vs pure numeric vs time spans. + + * Doc/Zsh/builtins.yo: Zefram: 8320: Sort the resource list for + "limit", rename "sbsize" to "sktbuffersize". + + * Src/cond.c, Src/loop.c, Src/parse.c, Src/pattern.c, Src/utils.c, + Src/zsh.h: Sven: 8319: Compile patterns in "case" statements on + demand, then keep them in the parse tree so they only have to be + compiled once. + + * Src/Zle/zle_tricky.c: Sven: 8317: Reset state so that a leading + "~" isn't assumed to be part of an extendedglob pattern. + + * Completion/Base/_tilde: Sven: 8317: Use _users. + + * Src/Zle/computil.c: Sven: 8316: Report when arguments are not + allowed at a position. + + * Completion/Base/_arguments: Sven: 8316: Extraneous "break". + + * Src/Zle/computil.c: Sven: 8315: Save and restore parser state + around "restricting rest-argument-definitions". + + * Src/Zle/zle_tricky.c: Sven: 8313: Try harder to use match specs + correctly, even when `globcomplete'. + + * Doc/Zsh/compsys.yo, Completion/Core/_path_files: Sven: 8313: + conconfig[path_expand] now has "prefix" and "suffix" choices. + + * Completion/Core/compinit: Sven: 8313: Minor cleanup of "funcall". + + * Completion/Core/_main_complete: Sven: 8313: A warning message + should be printed only when the last global match spec was tried. + + * Completion/Core/_main_complete: Sven: 8312: Missing "local" decl. + + * Doc/Zsh/builtins.yo: Document the `sbsize' limit. + + * Src/Builtins/rlimits.awk: Jos Backus: 8309: FreeBSD has an + SBSIZE limit. + +1999-10-17 Bart Schaefer + + * Completion/User/_man: Oliver: 8139: Use the "manpath" command if + available, splitting at colons. + + * Src/Modules/mathfunc.c: Oliver: 8138: Remove excess comma that + causes picky compilers to choke. + + * Src/builtin.c, Src/options.c, Src/zsh.h, Doc/Zsh/options.yo: + Bart: 8308: The `CHECK_JOBS' option, based on Clint Adams' 8109, + with sense reversed as suggested by Zefram in 8111, and adapted + doc from PWS in 8110. + + * Doc/Zsh/compsys.yo, Completion/Commands/_history_complete_word: + Adam: 8028,8063,8070; and PWS: 8098: Revised history completion. + + * Src/.cvsignore: Ignore .pro files only if they begin with + alphanumerics, to keep .indent.pro. + 1999-10-16 Bart Schaefer * Config/version.mk: Set version string to 3.1.6-bart-7. diff --git a/Completion/Base/.distfiles b/Completion/Base/.distfiles index d1118abaa..0743367c7 100644 --- a/Completion/Base/.distfiles +++ b/Completion/Base/.distfiles @@ -1,6 +1,7 @@ DISTFILES_SRC=' .distfiles _arg_compile _arguments _brace_parameter _combination _command_names - _condition _default _describe _equal _first _math _parameter - _precommand _redirect _regex_arguments _subscript _tilde _values _vars + _condition _default _describe _equal _first _job _math _parameter + _precommand _redirect _regex_arguments _subscript _tilde _value + _values _vars ' diff --git a/Completion/Builtins/.distfiles b/Completion/Builtins/.distfiles index 8fc8fcc6b..7af78417a 100644 --- a/Completion/Builtins/.distfiles +++ b/Completion/Builtins/.distfiles @@ -2,6 +2,6 @@ DISTFILES_SRC=' .distfiles _aliases _arrays _autoload _bg_jobs _bindkey _builtin _cd _command _compdef _disable _echotc _enable _fc _functions _hash _jobs _kill - _limits _nothing _sched _set _setopt _source _stat _trap _unhash + _limits _nothing _popd _sched _set _setopt _source _stat _trap _unhash _unsetopt _vars_eq _wait _which _zftp _zle _zmodload ' diff --git a/Completion/Builtins/_popd b/Completion/Builtins/_popd index 5b18ec228..9054befb7 100644 --- a/Completion/Builtins/_popd +++ b/Completion/Builtins/_popd @@ -5,7 +5,8 @@ # way round if pushdminus is set). Note that this function is also called # from _cd for cd and pushd. -setopt localoptions nonomatch +emulate -L zsh +setopt extendedglob nonomatch [[ $PREFIX = [-+]* ]] || return 1 @@ -16,17 +17,17 @@ PREFIX=$PREFIX[2,-1] # get the list of directories with their canonical number # and turn the lines into an array, removing the current directory -lines=( "$dirstack[@]" ) +lines=( ${${(f)"$(dirs -v)"}##0*} ) if [[ ( $IPREFIX = - && ! -o pushdminus ) || ( $IPREFIX = + && -o pushdminus ) ]]; then integer i revlines=( $lines ) for (( i = 1; i <= $#lines; i++ )); do - lines[$i]="$((i-1)) -- ${revlines[-$i]}" + lines[$i]="$((i-1)) -- ${revlines[-$i]##[0-9]#[ ]#}" done else for (( i = 1; i <= $#lines; i++ )); do - lines[$i]="$i -- ${lines[$i]}" + lines[$i]="$i -- ${lines[$i]##[0-9]#[ ]#}" done fi # get the array of numbers only diff --git a/Completion/User/_man b/Completion/User/_man index 50445edf6..60bd23dd7 100644 --- a/Completion/User/_man +++ b/Completion/User/_man @@ -21,7 +21,7 @@ if (( ! $#manpath )); then manpath=( $mp ) fi -(( $#manpath )) || +(( $#manpath )) || manpath=( ${(s.:.)$(manpath 2>/dev/null)} ) || manpath=( /usr/man(-/N) /(opt|usr)/(dt|share|X11R6|local)/(cat|)man(-/N) ) # `sman' is the SGML manual directory for Solaris 7. diff --git a/Config/version.mk b/Config/version.mk index bd8d4224e..9cc543e88 100644 --- a/Config/version.mk +++ b/Config/version.mk @@ -27,5 +27,5 @@ # This must also serve as a shell script, so do not add spaces around the # `=' signs. -VERSION=3.1.6-bart-7 -VERSION_DATE='October 16, 1999' +VERSION=3.1.6-bart-8 +VERSION_DATE='November 3, 1999' diff --git a/Doc/Makefile.in b/Doc/Makefile.in index a1443f2d5..4241a4622 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -133,7 +133,7 @@ zshmisc.1: Zsh/grammar.yo Zsh/redirect.yo Zsh/exec.yo Zsh/func.yo \ Zsh/prompt.yo Zsh/restricted.yo zshmodules.1: Zsh/modules.yo Zsh/mod_cap.yo Zsh/mod_clone.yo \ - Zsh/mod_comp1.yo Zsh/mod_complist.yo Zsh/mod_compctl.yo \ + Zsh/mod_complete.yo Zsh/mod_complist.yo Zsh/mod_compctl.yo \ Zsh/mod_deltochar.yo Zsh/mod_example.yo Zsh/mod_files.yo \ Zsh/mod_mapfile.yo Zsh/mod_mathfunc.yo Zsh/mod_sched.yo \ Zsh/mod_stat.yo Zsh/mod_zftp.yo Zsh/mod_zle.yo diff --git a/Doc/Zsh/.distfiles b/Doc/Zsh/.distfiles index 6c0938dd6..11d761230 100644 --- a/Doc/Zsh/.distfiles +++ b/Doc/Zsh/.distfiles @@ -2,11 +2,11 @@ DISTFILES_SRC=' .distfiles arith.yo builtins.yo compat.yo compctl.yo compsys.yo compwid.yo cond.yo exec.yo expn.yo filelist.yo files.yo func.yo grammar.yo - index.yo intro.yo invoke.yo jobs.yo manual.yo metafaq.yo - mod_cap.yo mod_clone.yo mod_comp1.yo mod_compctl.yo mod_complist.yo + index.yo intro.yo invoke.yo jobs.yo manual.yo metafaq.yo mod_cap.yo + mod_clone.yo mod_compctl.yo mod_complete.yo mod_complist.yo mod_computil.yo mod_deltochar.yo mod_example.yo mod_files.yo mod_mapfile.yo mod_mathfunc.yo mod_parameter.yo mod_sched.yo - mod_stat.yo mod_zftp.yo mod_zle.yo - modules.yo options.yo params.yo - prompt.yo redirect.yo restricted.yo seealso.yo zftpsys.yo zle.yo + mod_stat.yo mod_zftp.yo mod_zle.yo mod_zleparameter.yo modules.yo + options.yo params.yo prompt.yo redirect.yo restricted.yo seealso.yo + zftpsys.yo zle.yo ' diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo index d741ee9c0..e30586238 100644 --- a/Doc/Zsh/compsys.yo +++ b/Doc/Zsh/compsys.yo @@ -1723,6 +1723,15 @@ This is used by functions that complete color names. It should be set to the pathname of a file containing color names in the format of an X11 tt(rgb.txt) file. ) +item(tt(history_list))( +If this is set to a non-empty string, the tt(_history_complete_word) +bindable command will list all available matches. +) +item(tt(history_remove_all_dups))( +If this is set to a non-empty string, the tt(_history_complete_word) +bindable command will remove all duplicate matches, rather than just +removing consecutive duplicates. +) item(tt(history_sort))( If this is set to a non-empty string, completion functions that generate words from the history as possible matches sort these words diff --git a/Etc/FAQ.yo b/Etc/FAQ.yo index 3b149edd4..f2c596a33 100644 --- a/Etc/FAQ.yo +++ b/Etc/FAQ.yo @@ -49,7 +49,7 @@ description(\ mydit(Archive-Name:) unix-faq/shell/zsh mydit(Last-Modified:) 1999/07/30 mydit(Submitted-By:) email(pws@ibmth.df.unipi.it (Peter Stephenson)) -mydit(Version:) $Id: FAQ.yo,v 1.1.1.13 1999/10/27 21:03:21 akr Exp $ +mydit(Version:) $Id: FAQ.yo,v 1.1.1.14 1999/11/03 09:06:27 akr Exp $ mydit(Posting-Frequency:) Monthly mydit(Copyright:) (C) P.W. Stephenson, 1995--1999 (see end of document) ) diff --git a/Functions/Prompts/.distfiles b/Functions/Prompts/.distfiles index 81b4f2c07..2c8ff8497 100644 --- a/Functions/Prompts/.distfiles +++ b/Functions/Prompts/.distfiles @@ -5,5 +5,5 @@ DISTFILES_SRC=' prompt_fire_setup prompt_suse_setup prompt_blue_setup prompt_green_setup prompt_white_setup prompt_combo_setup prompt_magenta_setup prompt_yellow_setup prompt_cyan_setup - prompt_off_setup promptinit + prompt_oliver_setup prompt_off_setup promptinit ' diff --git a/Functions/Prompts/promptinit b/Functions/Prompts/promptinit index 285b9e4d9..c249412cf 100644 --- a/Functions/Prompts/promptinit +++ b/Functions/Prompts/promptinit @@ -106,21 +106,12 @@ Options: } prompt () { - local -A prompt_opts - local opt - + local prompt_opts + set_prompt "$@" - - # Set prompt options - for opt in ${(k)prompt_opts}; do - if [[ $prompt_opts[$opt] != (|un)set ]]; then - echo "${0##*/}: value of prompt option must be 'set' or 'unset'" >&2 - return 1 - else - $prompt_opts[$opt]opt prompt$opt - fi - done + + (( $#prompt_opts )) && + setopt noprompt{bang,cr,percent,subst} prompt${^prompt_opts[@]} } promptinit "$@" - diff --git a/Functions/Zle/predict-on b/Functions/Zle/predict-on index 7c4133560..3a81cb3c6 100644 --- a/Functions/Zle/predict-on +++ b/Functions/Zle/predict-on @@ -59,7 +59,8 @@ insert-and-predict () { zle complete-word ${(s.:.)compconfig[predict_completer]} # Decide where to leave the cursor. The dummy loop is used to # get out of that `case'. - while true; do + repeat 1 + do case $compconfig[predict_cursor] in (complete) # At the place where the completion left it, if it is after @@ -69,7 +70,8 @@ insert-and-predict () { (key) # Or maybe at the n'th occurrence of the character typed. pos=${BUFFER[(in:nchar:)${KEYS[-1]}]} - if [[ pos -gt curs ]]; then + if [[ pos -gt curs ]] + then CURSOR=$pos break fi @@ -78,7 +80,6 @@ insert-and-predict () { # Or else at the previous position. CURSOR=$curs esac - break done fi fi diff --git a/Src/Modules/mathfunc.c b/Src/Modules/mathfunc.c index 770894ce8..67d5fd7d1 100644 --- a/Src/Modules/mathfunc.c +++ b/Src/Modules/mathfunc.c @@ -78,7 +78,7 @@ MF_TAN, MF_TANH, MF_Y0, MF_Y1, -MF_YN, +MF_YN }; /* diff --git a/Src/Zle/.distfiles b/Src/Zle/.distfiles index 34ae06000..145174b7b 100644 --- a/Src/Zle/.distfiles +++ b/Src/Zle/.distfiles @@ -1,10 +1,12 @@ DISTFILES_SRC=' .cvsignore .distfiles .exrc - comp1.mdd comp.h comp1.c comp1.export - compctl.mdd compctl.c + comp.h complete.mdd complete.c + compcore.c compmatch.c compresult.c + compctl.mdd compctl.c compctl.h compctl.export complist.mdd complist.c computil.mdd computil.c deltochar.mdd deltochar.c + zleparameter.mdd zleparameter.c zle.mdd iwidgets.list zle.h zle_bindings.c zle_hist.c zle_keymap.c zle_main.c zle_misc.c zle_move.c zle_params.c zle_refresh.c zle_things.sed zle_thingy.c zle_tricky.c diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index 405f3a6d2..ea11edcd5 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -409,7 +409,7 @@ clprintm(Cmgroup g, Cmatch *mp, int mc, int ml, int lastc, int width, nicezputs((m->disp ? m->disp : m->str), shout); len = niceztrlen(m->disp ? m->disp : m->str); - if (isset(LISTTYPES) && buf) { + if (isset(LISTTYPES) && buf) { if (m->gnum != mselect) { zcoff(); zcputs(&mcolors, COL_TC); diff --git a/configure.in b/configure.in index aa93bf95e..e23e777e7 100644 --- a/configure.in +++ b/configure.in @@ -1241,7 +1241,7 @@ dnl ----------- dnl if found tcsetpgrp, test to see if it actually works dnl for instance, BeOS R4.51 does not support it yet dnl ----------- -if test -t 0 -a $ac_cv_func_tcsetpgrp=yes; then +if test $ac_cv_func_tcsetpgrp=yes; then AC_CACHE_CHECK(if tcsetpgrp() actually works, zsh_cv_sys_tcsetpgrp, [AC_TRY_RUN([ -- cgit 1.4.1