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

[Ian Beckwith]

The following commit has been merged in the master branch:
commit 88b22d6e352fe7cb0649ca94ce7e600862eb8106
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Tue Mar 2 03:26:42 2010 +0000

    remove unused "-quiet" option

diff --git a/ChangeLog b/ChangeLog
index f49e298..75ec189 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
 	* cnn.test: Disable. Bloody CNN now needs javascript for search,
 	  so should be tested manually.
 	* W, yahoo: fix tests.
+	* Remove unused '-quiet' option.
 	* Update AUTHORS.
 	* Add a note to appendix 1 of HACKING about updating AUTHORS.
 	* runtests: explicitly use elvi and config from source tree,
diff --git a/README b/README
index 7cac799..cedc898 100644
--- a/README
+++ b/README
@@ -296,9 +296,6 @@ Global options:
   -help                         What you're reading now, dude
   -p | -print                   Just print search URL, don't pass to browser
   -o | -o=FILE                  Fetch URL and dump to stdout or FILE.
-  -quiet=yes|no                 I can't enjoy it with you talking all the time
-                                Default: no
-                                Environment: SURFRAW_quiet
   -new[=yes|no]                 Start in a new window
                                 Default: no
                                 Environment: SURFRAW_new_window
diff --git a/elvi.1sr.IN b/elvi.1sr.IN
index 0073a5e..47c3c67 100644
--- a/elvi.1sr.IN
+++ b/elvi.1sr.IN
@@ -108,10 +108,6 @@ for example:
 
 and the quoting is passed on to the search engine
 
-.TP
-.B \-quiet=yes|no
-I can't enjoy it with you talking all the time (default: no)
-
 .SH EXAMPLES
 
  $ sr ask why is jeeves gay?
diff --git a/surfraw-bash-completion.IN b/surfraw-bash-completion.IN
index d5d1374..09444fc 100644
--- a/surfraw-bash-completion.IN
+++ b/surfraw-bash-completion.IN
@@ -9,7 +9,7 @@ _surfraw()
 	local cur=${COMP_WORDS[COMP_CWORD]}
 	local prev=${COMP_WORDS[COMP_CWORD-1]}
 	local opts='-browser -elvi -escape-url-args -graphical \
-		-help -q -quote -quiet -text -version'
+		-help -q -quote -text -version'
 	local elvi="$(cut -f1 @sysconfdir@/surfraw.bookmarks ~/.surfraw.bookmarks 2>&-
 			cd @ELVIDIR@ && echo * 2>&-
 			[ -d ~/.surfraw.d ] && cd ~/.surfraw.d && echo * 2>&-)"
diff --git a/surfraw.1.IN b/surfraw.1.IN
index 6521569..f93d59f 100644
--- a/surfraw.1.IN
+++ b/surfraw.1.IN
@@ -121,10 +121,6 @@ for example:
 
 and the quoting is passed on to the search engine
 
-.TP
-.B \-quiet=yes|no
-I can't enjoy it with you talking all the time (default: no)
-
 .SH EXAMPLES
 
  $ sr ask why is jeeves gay?
@@ -277,14 +273,6 @@ Default:
  def SURFRAW_screen_args ""
 
 .TP
-.B SURFRAW_quiet
-I can't enjoy it with you talking all the time.
-
-Default:
-
- defyn SURFRAW_quiet no
-
-.TP
 .B SURFRAW_quote_args
 Whether to "quote" all the arguments.
 
diff --git a/surfraw.IN b/surfraw.IN
index 76cb009..b10340a 100644
--- a/surfraw.IN
+++ b/surfraw.IN
@@ -276,9 +276,6 @@ Global options:
   -help				What you're reading now, dude
   -p | -print			Just print search URL, don't pass to browser
   -o | -o=FILE			Fetch URL and dump to stdout or FILE.
-  -quiet=yes|no			I can't enjoy it with you talking all the time
-				Default: $SURFRAW_quiet
-				Environment: SURFRAW_quiet
   -new[=yes|no]			Start in a new window
 				Default: $SURFRAW_new_window
 				Environment: SURFRAW_new_window
@@ -332,7 +329,6 @@ w3_parse_option () {
 	-escape-url-args=*) setoptyn SURFRAW_escape_url_args	$optarg ;;
 	-g | -graphical)    setoptyn SURFRAW_graphical		yes	;;
 	-help | --help)     do_help=1					;;
-	-quiet=*)	    setoptyn SURFRAW_quiet	    	$optarg ;;
 	-q | -quote)	    setoptyn SURFRAW_quote_args	    	yes	;;
 	-new)		    setoptyn SURFRAW_new_window		yes	;;
 	-new=*)		    setoptyn SURFRAW_new_window		$optarg ;;
@@ -461,9 +457,7 @@ w3_browse_url () {
 			$SURFRAW_browser $SURFRAW_browser_args "$@"
 		 fi
 	fi
-		
     fi
-#    ifno SURFRAW_quiet && echo "Thank you for supporting the Shell Users' Revolutionary Front Rage Against the Web"
 }
 
 quote () {
diff --git a/surfraw.conf.IN b/surfraw.conf.IN
index 08845bc..0e62148 100644
--- a/surfraw.conf.IN
+++ b/surfraw.conf.IN
@@ -60,9 +60,6 @@ defyn SURFRAW_new_screen	no
 # arguments for the screen command
 def   SURFRAW_screen_args	""
 
-# I can't enjoy it with you talking all the time
-defyn SURFRAW_quiet		no
-
 # "quote" arguments
 defyn SURFRAW_quote_args	no
 

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