[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-224-g6597429

[Ivy Foster]

The following commit has been merged in the master branch:
commit 6597429bf2bf071cd8bc71e8081f36334bd19120
Author: Ivy Foster <joyfulgirl at archlinux.us>
Date:   Wed Jun 27 16:29:37 2012 -0400

    Removed -p from elvi/duckduckgo.
    
        - Prevents clobbering -p[rint].
        - Also fixed ChangeLog dates from previous commit.

diff --git a/ChangeLog b/ChangeLog
index b0b955b..f33425d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
-2012-07-27  Ivy Foster  <joyfulgirl at archlinux.us>
+2012-06-27  Ivy Foster  <joyfulgirl at archlinux.us>
 
 	* Fixed arg parsing in searchable bookmarks
 	* New variable: SURFRAW_bookmark_search_elvis
 	  + When using searchable bookmarks, if all else fails
 	    run this elvis. Defaults to google
 	* Updated manual to reflect changes to bookmarks
+	* duckduckgo: Removed -p option. -safe still works.
+	  + Prevents clobbering global option -p[rint].
 
-2012-07-27  Thomas Zervogiannis <tzervo at gmail.com>
+2012-06-27  Thomas Zervogiannis <tzervo at gmail.com>
 
 	* Added searchable bookmarks
 
diff --git a/elvi/duckduckgo b/elvi/duckduckgo
index 9f82ff2..0f5feaf 100755
--- a/elvi/duckduckgo
+++ b/elvi/duckduckgo
@@ -25,7 +25,7 @@ Description:
 Local options:
     -d,-ducky,-l,-lucky         use in case of overwhelming feeling of duckiness
     -j,-javascript              use javascript
-    -p,-safe                    enable safe search
+    -safe                       enable safe search
     -r,-redirect                use redirection
     -s,-insecure                disable SSL search
 EOF
@@ -38,7 +38,7 @@ w3_parse_option_hook () {
     case "$opt" in
     -d*|-l|-lu*)            setoptyn    SURFRAW_duckduckgo_got_a_ducky_feeling 1 ;;
     -j|-javascript*)    setoptyn    SURFRAW_duckduckgo_use_javascript      1 ;;
-    -p|-safe*)		setoptyn    SURFRAW_duckduckgo_safe_arg            1 ;;
+    -safe*)				setoptyn    SURFRAW_duckduckgo_safe_arg            1 ;;
     -r|-redirect*)      setoptyn    SURFRAW_duckduckgo_redirect_arg        1 ;;
     -s|-sec*)           setoptyn    SURFRAW_duckduckgo_https_arg           1 ;;
     *) return 1 ;;

-- 
surfraw -  a fast unix command line interface to WWW