From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sun, 14 Mar 2004 22:37:29 +0000 (+0000)
Subject: r8724: Automated commit for Debian build of getopt upstream-version-1.1.0
X-Git-Tag: debian-1.1.0-3~5
X-Git-Url: http://git.kpe.io/?p=getopt.git;a=commitdiff_plain;h=eef26086e56d5cc18542dd8a7c10bed4c4341b25

r8724: Automated commit for Debian build of getopt upstream-version-1.1.0
---

diff --git a/debian/changelog b/debian/changelog
index a685af5..512f25c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-getopt (1.1.0-1) unstable; urgency=low
+
+  * Add patch from Mark Simpson. Bug fix and new test.
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 14 Mar 2004 15:37:04 -0700
+
 cl-getopt (1.0.1-1) unstable; urgency=low
 
   * Remove extraneous fasls
diff --git a/main.lisp b/main.lisp
index 885ab09..b6b5070 100644
--- a/main.lisp
+++ b/main.lisp
@@ -109,7 +109,7 @@ opts is a list of option lists. The fields of the list are
 	(multiple-value-bind (option-list option-type base-name argument)
 	    (match-option (car pos) options)
 	  (cond
-	    (option-list
+	    ((and option-list (not (eq option-type :arg)))
 	     (cond
 	       (argument
 		(case (second option-list)
diff --git a/tests.lisp b/tests.lisp
index 26b2c48..5790baa 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -66,5 +66,7 @@
 	       (getopt '("--a=10") '(("along" :optional)))) 
       (test-mv '(nil nil ("a"))
 	       (getopt '("--a=10") '(("along" :optional) ("aboot" :optional))))
+      (test-mv '(("a") nil nil)
+               (getopt '("a") '(("a" :none))))
       ))
   t)