diff options
author | Bart Schaefer <barts@users.sourceforge.net> | 2000-04-08 21:04:47 +0000 |
---|---|---|
committer | Bart Schaefer <barts@users.sourceforge.net> | 2000-04-08 21:04:47 +0000 |
commit | d2ece376a3b50f0ca361d27fb8e55372771532dd (patch) | |
tree | 5c328d0123f28866e88227db55c893c348932c27 | |
parent | b4a2b47b64c9fbe9df1d80e84c5d08786bd29eac (diff) | |
download | zsh-d2ece376a3b50f0ca361d27fb8e55372771532dd.tar.gz zsh-d2ece376a3b50f0ca361d27fb8e55372771532dd.tar.xz zsh-d2ece376a3b50f0ca361d27fb8e55372771532dd.zip |
10594: Fix index into $history in prompt_bart_precmd.
10591: Completion/User/_fakeroot: Completion for the fakeroot program. 10590: Completion/Linux/_rpm: Signature checking completes only local package files.
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | Completion/Linux/_rpm | 2 | ||||
-rw-r--r-- | Completion/User/.distfiles | 2 | ||||
-rw-r--r-- | Functions/Prompts/prompt_bart_setup | 23 |
4 files changed, 20 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog index d2e5a6ee3..60dbaaf5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2000-04-08 Bart Schaefer <schaefer@zsh.org> + + * 10594: Functions/Prompts/prompt_bart_setup: Fix index into + $history in prompt_bart_precmd. + + * 10591: Chmouel Boudjnah: Completion/User/_fakeroot: Completion + for the fakeroot program. + + * 10590: Chmouel Boudjnah: Completion/Linux/_rpm: Signature + checking completes only local package files. + 2000-04-07 Peter Stephenson <pws@pwstephenson.fsnet.co.uk> * 10584: Doc/Zsh/mod_stat.yo, Src/Modules/stat.c: -o shows diff --git a/Completion/Linux/_rpm b/Completion/Linux/_rpm index 3b027dc09..ff388fe22 100644 --- a/Completion/Linux/_rpm +++ b/Completion/Linux/_rpm @@ -174,7 +174,7 @@ while [[ -n "$state" ]]; do '--ftpproxy:FTP proxy server:_hosts' \ '--ftpport:FTP port number:' \ --no{pgp,md5} \ - '*:RPM package file:->package_or_file' && ret=0 + '*:RPM package file:->package_file' && ret=0 ;; rebuild) _arguments -s \ diff --git a/Completion/User/.distfiles b/Completion/User/.distfiles index a65d03c39..fb2d8d66b 100644 --- a/Completion/User/.distfiles +++ b/Completion/User/.distfiles @@ -2,7 +2,7 @@ DISTFILES_SRC=' .distfiles _a2ps _archie _bison _bunzip2 _bzip2 _chown _compress _configure _cvs _dd _diff _diff_options _dir_list _dirs - _domains _dvi _find _finger _flex _gcc _gdb _getconf _gprof _groups + _domains _dvi _find _finger _fakeroot _flex _gcc _gdb _getconf _gprof _groups _gs _gunzip _gv _gzip _hosts _imagemagick _ispell _killall _lp _lynx _mailboxes _make _man _mh _mount _mutt _my_accounts _mysql_utils _nedit _netscape _nslookup _other_accounts _pack _patch _pbm _pdf _perl diff --git a/Functions/Prompts/prompt_bart_setup b/Functions/Prompts/prompt_bart_setup index d602cc9ec..0713a48af 100644 --- a/Functions/Prompts/prompt_bart_setup +++ b/Functions/Prompts/prompt_bart_setup @@ -57,22 +57,13 @@ prompt_bart_precmd () { setopt localoptions noxtrace extendedglob noksharrays # Using psvar here protects against unwanted promptsubst expansions. - psvar[8]="$history[$#history]" # Use history text, not just number - psvar[9]='' # Padding before upper right prompt - - if [[ -o promptsubst ]] - then - # This is a bug workaround; ${(%)...} mishandles promptsubst - repeat $[COLUMNS-${#${(%f)${${(e)PS1}//[%]\{[^%]#%\}/}}[1]}-1] - do - psvar[9]="$psvar[9] " - done - else - repeat $[COLUMNS-${#${(%f)${PS1//[%]\{[^%]#%\}/}}[1]}-1] - do - psvar[9]="$psvar[9] " - done - fi + psvar[8]="$history[$[${(%):-%h}-1]]" # Use history text, not just number + psvar[9]='' # Padding before upper right prompt + + repeat $[COLUMNS-${#${(%%f)${PS1//[%]\{[^%]#%\}/}}[1]}-1] + do + psvar[9]="$psvar[9] " + done } prompt_bart_ps1 () { |