diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Doc/Zsh/compctl.yo | 18 | ||||
-rw-r--r-- | Doc/Zsh/contrib.yo | 7 |
3 files changed, 17 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index 267a5b355..d8c091eab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-05 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 23091: Doc/Zsh/compctl.yo, Doc/Zsh/contrib.yo: fixes + for some *roff problems noted by doclifter. + 2007-01-05 Peter Stephenson <pws@csr.com> * 23090: configure.ac: make ncurses preferred over curses diff --git a/Doc/Zsh/compctl.yo b/Doc/Zsh/compctl.yo index d6c40a1c4..caa1a9793 100644 --- a/Doc/Zsh/compctl.yo +++ b/Doc/Zsh/compctl.yo @@ -559,15 +559,19 @@ If the list of flags contains a tt(-t) with a tt(PLUS()) character, the next list of flags is used even if the current list produced matches. texinode(Extended Completion)(Example)(Alternative Completion)(Completion Using compctl) + +Additional options are available that restrict completion to some part +of the command line; this is referred to as `extended completion'. + sect(Extended Completion) startlist() -list(nofill(tt(compctl) [ tt(-CDT) ] var(options) \ -tt(-x) var(pattern) var(options) tt(-) ... tt(-)tt(-) - [ var(command) ... ])) -list(nofill(tt(compctl) [ tt(-CDT) ] var(options) \ -[ tt(-x) var(pattern) var(options) tt(-) ... tt(-)tt(-) ] - [ tt(PLUS()) var(options) [ tt(-x) ... tt(-)tt(-) ] ... [tt(PLUS())] ] \ -[ var(command) ... ])) +list(tt(compctl) [ tt(-CDT) ] var(options) \ +tt(-x) var(pattern) var(options) tt(-) ... tt(-)tt(-)) +list( [ var(command) ... ]) +list(tt(compctl) [ tt(-CDT) ] var(options) \ +[ tt(-x) var(pattern) var(options) tt(-) ... tt(-)tt(-) ]) +list( [ tt(PLUS()) var(options) [ tt(-x) ... tt(-)tt(-) ] ... \ +[tt(PLUS())] ] [ var(command) ... ]) endlist() The form with `tt(-x)' specifies extended completion for the diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo index e6a69ecd7..f2592c85e 100644 --- a/Doc/Zsh/contrib.yo +++ b/Doc/Zsh/contrib.yo @@ -1624,8 +1624,6 @@ As there are several steps to dispatching a command, the following should be checked if attempting to execute a file by extension tt(.)var(ext) does not have the expected effect. -startitem() -item()( The command `tt(alias -s) var(ext)' should show `tt(ps=zsh-mime-handler)'. If it shows something else, another suffix alias was already installed and was not overwritten. If it shows @@ -1633,8 +1631,7 @@ nothing, no handler was installed: this is most likely because no handler was found in the tt(.mime.types) and tt(mailcap) combination for tt(.ext) files. In that case, appropriate handling should be added to tt(~/.mime.types) and tt(mailcap). -) -item()( + If the extension is handled by tt(zsh-mime-handler) but the file is not opened correctly, either the handler defined for the type is incorrect, or the flags associated with it are in appropriate. Running @@ -1648,8 +1645,6 @@ An example of a suitable tt(mailcap) entry for such a program is: example(text/html; /usr/bin/lynx '%s'; needsterminal) ) -enditem() -) findex(pick-web-browser) item(tt(pick-web-browser))( This function is separate from the two MIME functions described above |