From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Tue, 2 Feb 1999 17:01:24 +0000 (+0000)
Subject: Update Getopt::Long to 2.19.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f9a400e4de9de85aa0dcfc165ff8321e87f96004;p=p5sagit%2Fp5-mst-13.2.git

Update Getopt::Long to 2.19.

p4raw-id: //depot/cfgperl@2792
---

diff --git a/lib/Getopt/Long.pm b/lib/Getopt/Long.pm
index 90ddd77..c125ccf 100644
--- a/lib/Getopt/Long.pm
+++ b/lib/Getopt/Long.pm
@@ -6,13 +6,13 @@ package Getopt::Long;
 # Author          : Johan Vromans
 # Created On      : Tue Sep 11 15:00:12 1990
 # Last Modified By: Johan Vromans
-# Last Modified On: Sun Jun 14 13:17:22 1998
-# Update Count    : 705
+# Last Modified On: Fri Jan  8 14:48:43 1999
+# Update Count    : 707
 # Status          : Released
 
 ################ Copyright ################
 
-# This program is Copyright 1990,1998 by Johan Vromans.
+# This program is Copyright 1990,1999 by Johan Vromans.
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
@@ -24,8 +24,8 @@ package Getopt::Long;
 # GNU General Public License for more details.
 # 
 # If you do not have a copy of the GNU General Public License write to
-# the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, 
+# MA 02139, USA.
 
 ################ Module Preamble ################
 
@@ -35,7 +35,7 @@ BEGIN {
     require 5.004;
     use Exporter ();
     use vars     qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-    $VERSION     = "2.17";
+    $VERSION     = "2.19";
 
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&GetOptions $REQUIRE_ORDER $PERMUTE $RETURN_IN_ORDER);
@@ -547,6 +547,7 @@ sub FindOption ($$$$$$$) {
 
 	# If bundling == 2, long options can override bundles.
 	if ( $bundling == 2 and
+	     defined ($rest) and
 	     defined ($type = $opctl->{$tryopt.$rest}) ) {
 	    print STDERR ("=> $starter$tryopt rebundled to ",
 			  "$starter$tryopt$rest\n") if $debug;
@@ -1363,7 +1364,7 @@ Johan Vromans E<lt>jvromans@squirrel.nlE<gt>
 
 =head1 COPYRIGHT AND DISCLAIMER
 
-This program is Copyright 1990,1998 by Johan Vromans.
+This program is Copyright 1990,1999 by Johan Vromans.
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2
@@ -1375,7 +1376,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 If you do not have a copy of the GNU General Public License write to
-the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-MA 02111-1307, USA.
+the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, 
+MA 02139, USA.
 
 =cut