[PATCH] improve surfraw subcommands list

[Marc Chantreux <eiro@phear.org>]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]

hello people,

i wrote this patch for the _surfraw completion, it

    * add bookmarks support
    * remove the header from the final list

i don't know if it's good enough to be merged but
bookmark support is very useful so this is my proposal.
any review will be warmly welcome.

regards,
marc

---
 Completion/Unix/Command/_surfraw | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)


[-- Attachment #2: 0001-improve-surfraw-subcommands-list.patch --]
[-- Type: text/x-patch, Size: 1158 bytes --]

diff --git a/Completion/Unix/Command/_surfraw b/Completion/Unix/Command/_surfraw
index f945f1ca9..343d275cc 100644
--- a/Completion/Unix/Command/_surfraw
+++ b/Completion/Unix/Command/_surfraw
@@ -424,12 +424,26 @@ case $state in
       yubnub)
         _message -e command 'Yubnub Command'
       ;;
+      *)
+        _message -e string 'search string'
+      ;;
     esac
   ;;
   elvi)
+    local -UT XDG_CONFIG_DIRS xcd
+    # as it starts with a space, the header becomes an empty
+    # string removed by the list expansion
     _wanted elvi expl elvi compadd \
-      ${${${(f)"$(_call_program elvi surfraw -elvi)"}%%[[:space:]]##--*}%:*} && ret=0
+        ${${(f)"$(surfraw -elvi)"}%%[[:space:]]*} $(
+          # extract the keys of all bookmarks (should be in surfraw itself)
+          awk '{keys[$1]=1} END {for (k in keys) print k}' \
+          $^xcd/surfraw/bookmarks(Nr) \
+          /etc/xdg/surfraw/bookmarks(Nr) \
+          /etc/surfraw.bookmarks(Nr) \
+          ${XDG_CONFIG_HOME-${HOME?homeless}/.config}/surfraw/bookmarks(Nr) \
+          ${HOME?homeless}/.surfraw.bookmarks(Nr)
+        ) && ret=0
   ;;
-esac  
+esac
 
 return ret