From 53d36e795b26a945048e7a87a1a91224f8e1663a Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Sun, 2 May 1999 15:19:50 +0000 Subject: zsh-3.1.5-pws-17 --- Doc/Zsh/builtins.yo | 10 ++++++++-- Doc/Zsh/compsys.yo | 47 +++++++++++++++++++++++++++++++++++++++++++++++ Doc/Zsh/compwid.yo | 15 ++++++++++++++- Doc/Zsh/expn.yo | 8 +++++--- Doc/Zsh/options.yo | 2 +- Doc/Zsh/redirect.yo | 2 +- 6 files changed, 76 insertions(+), 8 deletions(-) (limited to 'Doc') diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo index ffc9f3cfe..e9bc2ab16 100644 --- a/Doc/Zsh/builtins.yo +++ b/Doc/Zsh/builtins.yo @@ -1175,9 +1175,12 @@ xitem(tt(zmodload) tt(-d) [ tt(-L) ] [ var(name) [ var(dep) ... ] ]) xitem(tt(zmodload) tt(-du) var(name) [ var(dep) ... ]) xitem(tt(zmodload) tt(-a) [ tt(-iL) ] [ var(name) [ var(builtin) ... ] ]) xitem(tt(zmodload) tt(-au) [ tt(-i) ] var(builtin) ...) -xitem(tt(zmodload) tt(-c) [ tt(-iI) ] [ var(name) [ var(cond) ... ] ]) +xitem(tt(zmodload) tt(-c) [ tt(-iI) ] var(name) [ var(cond) ... ]) xitem(tt(zmodload) tt(-cu) [ tt(-iI) ] var(cond) ...) -item(tt(zmodload) tt(-c) [ tt(-IL) ])( +xitem(tt(zmodload) tt(-c) [ tt(-IL) ]) +xitem(tt(zmodload) tt(-p) [ tt(-i) ] var(name) [ var(parameter) ... ]) +xitem(tt(zmodload) tt(-pu) [ tt(-i) ] var(parameter) ... ]) +item(tt(zmodload) tt(-p) [ tt(-L) ])( tt(zmodload) performs operations relating to zsh's loadable modules. This feature is not available on all operating systems, or on all installations on a particular operating system. @@ -1253,5 +1256,8 @@ names. Without this option prefix condition names are defined. Together with the tt(-u) option definitions for autoloaded conditions are removed. If given no condition names all defined names are listed (as a series of tt(zmodload) commands if the tt(-L) option is given). + +The tt(-p) option is like the tt(-c) option, but makes tt(zmodload) +work on autoloaded parameters instead of condition codes. ) enditem() diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo index 159f944c3..cedc4ec8c 100644 --- a/Doc/Zsh/compsys.yo +++ b/Doc/Zsh/compsys.yo @@ -528,6 +528,53 @@ tt(MENU_COMPLETE) option and does not work with the other menucompletion widgets such as tt(reverse-menu-complete), or tt(accept-and-menu-complete). ) +item(tt(_oldlist))( +This completer controls how the standard completion widgets behave when +there is an existing list of completions which may have been generated by a +special completion (i.e. a separately-bound completion command). It should +appear in the list of completers before any of the widgets which generate +matches. It understands two configuration keys: + +startitem() +item(tt(oldlist_list))( +If this is set to tt(always), then standard widgets which perform listing +will retain the current list of matches, however they were generated. If +it is set to tt(never), this will not be done (the behaviour without the +tt(_oldlist) completer). If it is unset, or any other value, then the +existing list of completions will be displayed if it is not already; +otherwise, the standard completion list will be generated: this is the +default behaviour of tt(_oldlist). + +For example, suppose you type tt(^Xc) to use the tt(_correct_word) +widget, which generates a list of corrections for the word under the +cursor. Usually, typing tt(^D) would generate a standard list of +completions for the word on the command line, and show that. With +tt(_oldlist), it will instead show the list of corrections already +generated. +) +item(tt(oldlist_menu))( +Controls how menu completion behaves when a completion has already been +inserted and the user types a standard completion key type as tt(TAB). +The default behaviour of tt(_oldlist) is that menu completion always +continues with the existing list of completions. If this key is set to +tt(never), however, a new completion is started if the old list was +generated by a different completion command (the behaviour without the +tt(_oldlist) completer). +For example, suppose you type tt(^Xc) to generate a list of corrections, +and menu completion is started in one of the usual ways. Usually, typing +tt(TAB) at this point would start trying to complete the line as it now +appears. With tt(_oldlist), it will instead continue to cycle through the +list of completions. +) +enditem() +) +item(tt(_closequotes))( +When a completion starts in quotes, this completer will recognise the fact +and insert a matching closing quote if there is not already one later on +the line. It should come earlier in the list of completers than any of the +completers which generate matches. It can be confused by some of the more +sophisticated forms of completion. +) enditem() texinode(Completion Functions)()(Control Functions)(Completion System) diff --git a/Doc/Zsh/compwid.yo b/Doc/Zsh/compwid.yo index 34f1140b9..79577d13d 100644 --- a/Doc/Zsh/compwid.yo +++ b/Doc/Zsh/compwid.yo @@ -140,6 +140,12 @@ with tt(${). ) enditem() ) +item(tt(vared))( +If completion is called while editing a line using the tt(vared) +builtin, the value of this key is set to the name of the parameter +given as argument to tt(vared). If tt(vared) is not currently used, +this key is unset. +) item(tt(parameter))( The name of the parameter when completing in a subscript or in the value of a parameter assignment. @@ -340,7 +346,7 @@ xitem([ tt(-W) var(file-prefix) ]) xitem([ tt(-J) var(name) ] [ tt(-V) var(name) ] [ tt(-X) var(explanation) ]) xitem([ tt(-r) var(remove-chars) ] [ tt(-R) var(remove-func) ]) xitem([ tt(-M) var(match-spec) ] [ tt(-O) var(array) ] [ tt(-A) var(array) ]) -item([ tt(--) ] [ var(words) ... ])( +item([ tt(-D) var(array) ] [ tt(--) ] [ var(words) ... ])( This builtin command can be used to add matches directly and control all the information the completion code stores with each possible @@ -518,6 +524,13 @@ on the command line and the string `tt(foo)' as one of the var(words), this option stores the string `tt(nofoo)' in the array, whereas the tt(-O) option stores the `tt(foo)' originally given. ) +item(tt(-D) var(array))( +As with tt(-O), the var(words) are not added to the set of possible +completions. Instead, the completion code tests every var(word) if +it matches what is on the line. If the var(n)'th var(word) does not +match, the var(n)'th element of the var(array) is removed. Elements +for which the corresponding var(word) is matched are retained. +) item(tt(-), tt(--))( This flag ends the list of flags and options. All arguments after it will be taken as the words to use as matches even if they begin with diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo index 1dced5b7d..0326e646d 100644 --- a/Doc/Zsh/expn.yo +++ b/Doc/Zsh/expn.yo @@ -361,6 +361,7 @@ the parameter is then substituted. item(tt(${)var(name)tt(:?)var(word)tt(}))( If var(name) is set and is non-null, then substitute its value; otherwise, print var(word) and exit from the shell. +Interactive shells do not exit. If var(word) is omitted, then a standard message is printed. ) item(tt(${)var(name)tt(:PLUS())var(word)tt(}))( @@ -596,11 +597,12 @@ Pad the resulting words on the left. Each word will be truncated if required and placed in a field var(expr) characters wide. The space to the left will be filled with var(string1) (concatenated as often as needed) or spaces if var(string1) is not given. If both -var(string1) and var(string2) are given, this string will be placed -exactly once directly to the left of the resulting word. +var(string1) and var(string2) are given, this string is inserted +once directly to the left of each word, before padding. ) item(tt(r:)var(expr)tt(::)var(string1)tt(::)var(string2)tt(:))( -As tt(l), but pad the words on the right. +As tt(l), but pad the words on the right and insert var(string2) +on the right. ) item(tt(j:)var(string)tt(:))( Join the words of arrays together using var(string) as a separator. diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo index c4a8a084e..92de8c2d8 100644 --- a/Doc/Zsh/options.yo +++ b/Doc/Zsh/options.yo @@ -670,7 +670,7 @@ tt(trap) and tt(unset). ) pindex(PRINT_EIGHT_BIT) -cindex(exit status, printing) +cindex(eight bit characters, printing) item(tt(PRINT_EIGHT_BIT))( Print eight bit characters literally in completion lists, etc. This option is not necessary if your system correctly returns the diff --git a/Doc/Zsh/redirect.yo b/Doc/Zsh/redirect.yo index 71f03f4cf..b642f1b5f 100644 --- a/Doc/Zsh/redirect.yo +++ b/Doc/Zsh/redirect.yo @@ -180,4 +180,4 @@ the command named in the shell variable tt(READNULLCMD) is assumed. nofill(tt(< file)) -prints the contents of tt(file). +copies the contents of tt(file) to the standard output. -- cgit 1.4.1