diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | Completion/Unix/Command/_raggle | 40 |
2 files changed, 35 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 0bd31960e..73a30f6d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-05-26 Doug Kearns <djkea2@gus.gscit.monash.edu.au> + + * 21275 (modified): Completion/Unix/Command/_raggle: update raggle + completion for version 0.4.0 + 2005-05-23 Bart Schaefer <schaefer@zsh.org> * unposted: Functions/Prompts/prompt_bart_setup: print whitespace @@ -19,6 +24,7 @@ * unposted: Completion/Base/Widget/_complete_debug: add a colon command so name and version of zsh appear in debug output. +>>>>>>> 1.2661 2005-05-21 Doug Kearns <djkea2@gus.gscit.monash.edu.au> * unposted: Completion/Unix/Command/_webbrowser: add firefox to diff --git a/Completion/Unix/Command/_raggle b/Completion/Unix/Command/_raggle index 4516e2eb7..d65b8ff2b 100644 --- a/Completion/Unix/Command/_raggle +++ b/Completion/Unix/Command/_raggle @@ -1,29 +1,47 @@ #compdef raggle -# Raggle v0.3.0 +# Raggle v0.4.0 -_arguments \ - '(-a --add --add-feed)'{-a,--add,--add-feed}"[add a new feed (requires '--url')]" \ - '--ascii[use ASCII characters instead of ANSI for window borders]' \ - '(-c --config)'{-c,--config}'[specify an alternate config file]:config file:_files' \ - '(-d --delete --delete-feed)'{-d,--delete,--delete-feed}'[delete an existing feed]:feed ID:' \ - '(-e --edit --edit-feed)'{-e,--edit,--edit-feed}'[edit an existing feed]:feed ID:' \ +local curcontext="$curcontext" state line +typeset -A opt_args + +_arguments -C -s \ + '(-a --add)'{-a,--add}"[add a new feed (requires '--url')]" \ + '(-A --ascii)'{-A,--ascii}'[use ASCII characters instead of ANSI for window borders]' \ + '(-c --config)'{-c,--config}'[specify an alternate config file]:config file:_files -g "*.rb(-.)"' \ + '--default-config[print out the default configuration of Raggle in a format suitable for your config.rb file]' \ + '(-d --delete)'{-d,--delete}'[delete an existing feed]:feed ID:->feed' \ + '--diag[run raggle in diagnostics/debug mode]' \ + '(-e --edit)'{-e,--edit}'[edit an existing feed]:feed ID:->feed' \ '(--import-opml)--export-opml[export feeds to OPML]:OPML file:_files -g "*.opml(-.)"' \ + '(-f --find)'{-f,--find}'[find feeds containing a string, via Syndic8]:search string:' \ "--force[force behavior Raggle won't normally allow]" \ '(-)'{-h,--help,--usage}'[display help information]' \ '(--export-opml)--import-opml[import feeds from an OPML file]:OPML file:_files -g "*.opml(-.)"' \ - '(-i --invalidate)'{-i,--invalidate}'[invalidate a feed (force an update)]:feed ID:' \ + '(-i --invalidate)'{-i,--invalidate}'[invalidate a feed (force an update)]:feed ID:->feed' \ '(-l --list)'{-l,--list}"[list existing feeds (use '--verbose' to show URLs as well)]" \ "--lock-title[lock Title attribute of feed (for '--add' and '--edit')]" \ - "--max-items[set the maximum number of items for a feed (for '--add' and '--edit')]" \ + "--max[set the maximum number of items for a feed (for '--add' and '--edit')]" \ + '(-p --priority)'{-p,--priority}"[feed sorting priority: 0 by default, higher values will sort feeds to the top (for '--add' and '--edit')]:sorting priority:" \ '--purge[purge deleted feeds from feed cache]' \ '(-r --refresh)'{-r,--refresh}"[refresh attribute of feed (for '--add' and '--edit')]:refresh time (minutes):" \ "--save-items[save old items of feed (for '--add' and '--edit')]" \ '--server[run Raggle in HTTP server mode]:port:_ports' \ - '(--sort --sort-feeds)'{--sort,--sort-feeds}'[sort feeds by title (case-insensitive)]' \ + '(--sort --sort-feeds)'{--sort,--sort-feeds}'[sort feeds by priority then title (case-insensitive)]' \ '(-t --title)'{-t,--title}"[title attribute of feed (for '--add' and '--edit')]:feed title:" \ "--unlock-title[unlock Title attribute of feed (for '--add' and '--edit')]" \ "--unsave-items[don't save old items of feed (for '--add' and '--edit')]" \ '(-u --url)'{-u,--url}"[URL attribute of feed (for '--add' and '--edit')]:URL:_urls" \ '--verbose[turn on verbose output]' \ - '(-)'{-v,--version}'[display version information]' + '(-)'{-v,--version}'[display version information]' && return 0 + +if [[ "$state" = feed ]]; then + local feeds + feeds=( + ${${(M)${${(f)"$(_call_program screen-sessions $words[1] \ + --list)"}/(#s)[[:blank:]]/}:#[0-9]##,*}/, /:} + ) + _describe -t feeds "RSS feed" feeds && return 0 +fi + +return 1 |