diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Base/Widget/_most_recent_file | 16 |
2 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 3c760d0bf..b8606a541 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-05-14 Peter Stephenson <pws@csr.com> + + * 14330: Completion/Base/Widget/_most_recent_file: handle filenames + which need quoted characters better. + 2001-05-14 Sven Wischnowsky <wischnow@zsh.org> * 14327: Src/exec.c: set list_pipe_job only for real pipelines diff --git a/Completion/Base/Widget/_most_recent_file b/Completion/Base/Widget/_most_recent_file index 868da8993..fd13044e8 100644 --- a/Completion/Base/Widget/_most_recent_file +++ b/Completion/Base/Widget/_most_recent_file @@ -1,22 +1,24 @@ #compdef -k complete-word \C-xm -# Complete the most recent file matching the pattern on the line so -# far: globbing is active, i.e. *.txt will be expanded to the most recent +# Complete the most recently modified file matching the pattern on the line +# so far: globbing is active, i.e. *.txt will be expanded to the most recent # file ending in .txt # # With a prefix argument, select the Nth most recent matching file; # negative arguments work in the opposite direction, so for example # `Esc - \C-x m' gets you the oldest file. -# -# (`Most recent' means most recently modified.) local file tilde etilde if [[ $PREFIX = \~*/* ]]; then tilde=${PREFIX%%/*} etilde=${~tilde} - file=($~PREFIX*$~SUFFIX(om[${NUMERIC:-1}]N)) - file=(${file/#$etilde/$tilde}) + # PREFIX and SUFFIX have full command line quoting in, but we want + # any globbing characters which are quoted to stay quoted. + eval "file=($PREFIX*$SUFFIX(om[${NUMERIC:-1}]N))" + file=(${file/#$etilde}) + file=($tilde${(q)^file}) else - file=($~PREFIX*$~SUFFIX(om[${NUMERIC:-1}]N)) + eval "file=($PREFIX*$SUFFIX(om[${NUMERIC:-1}]N))" + file=(${(q)file}) fi (( $#file )) && compadd -U -i "$IPREFIX" -I "$ISUFFIX" -f -Q $file |