gnumeric r16690 - in trunk: . plugins/fn-lookup

[mortenw svn gnome org]

Author: mortenw
Date: Tue Jul  1 15:38:03 2008
New Revision: 16690
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16690&view=rev

Log:
2008-07-01  Morten Welinder  <terra gnome org>

	* functions.c (find_bound_walk): When reversing direction, handle
	singleton right.  Fixes #540996.



Modified:
   trunk/NEWS
   trunk/plugins/fn-lookup/ChangeLog
   trunk/plugins/fn-lookup/functions.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Jul  1 15:38:03 2008
@@ -10,6 +10,7 @@
 	* Fix openoffice -pedantic problem.  [#540180]
 	* Fix bogus-xls problem.  [#540697]
 	* Fix problems with invalid dates in fn-financial.  [#540690]
+	* Fix MATCH problem with singletons.  [#540996]
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.1

Modified: trunk/plugins/fn-lookup/functions.c
==============================================================================
--- trunk/plugins/fn-lookup/functions.c	(original)
+++ trunk/plugins/fn-lookup/functions.c	Tue Jul  1 15:38:03 2008
@@ -179,19 +179,22 @@
 		return current;
 	}
 
+ again:
 	if (sup) {
 		current++;
 		if (current > high && sup == started) {
-			current = orig - 1;
+			current = orig;
 			sup = FALSE;
+			goto again;
 		} else if (current > high && sup != started) {
 			return -1;
 		}
 	} else {
 		current--;
 		if (current < low && sup == started) {
-			current = orig + 1;
+			current = orig;
 			sup = TRUE;
+			goto again;
 		} else if (current < low && sup != started) {
 			return -1;
 		}