From 7c097dc8914e035dc4e1fb6913064e59fcb3d08c Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 10 Mar 2004 07:05:19 +0000
Subject: * struct.c (rb_struct_s_def): Struct::new executes block with  
 generated struct class. [ruby-talk:02606]

* io.c (rb_io_ungetc): raise IOError instead of calling
  rb_sys_fail().  [ruby-talk:23181]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/getoptlong.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/getoptlong.rb')

diff --git a/lib/getoptlong.rb b/lib/getoptlong.rb
index 7bb9baef2d..979554ad34 100644
--- a/lib/getoptlong.rb
+++ b/lib/getoptlong.rb
@@ -34,7 +34,7 @@ class GetoptLong
   # Error types.
   #
   class Error  < StandardError; end
-  class AmbigousOption   < Error; end
+  class AmbiguousOption   < Error; end
   class NeedlessArgument < Error; end
   class MissingArgument  < Error; end
   class InvalidOption    < Error; end
@@ -208,7 +208,7 @@ class GetoptLong
   end
 
   #
-  # Set/Unset `quit' mode.
+  # Set/Unset `quiet' mode.
   #
   attr_writer :quiet
 
@@ -351,16 +351,16 @@ class GetoptLong
 	# The option `option_name' is not registered in `@canonical_names'.
 	# It may be an abbreviated.
 	#
-	match_count = 0
+	matches = []
 	@canonical_names.each_key do |key|
 	  if key.index(pattern) == 0
 	    option_name = key
-	    match_count += 1
+	    matches << key
 	  end
 	end
-	if 2 <= match_count
-	  set_error(AmbigousOption, "option `#{argument}' is ambiguous")
-	elsif match_count == 0
+	if 2 <= matches.length
+	  set_error(AmbiguousOption, "option `#{argument}' is ambiguous between #{matches.join(', ')}")
+	elsif matches.length == 0
 	  set_error(InvalidOption, "unrecognized option `#{argument}'")
 	end
       end
-- 
cgit v1.2.3