===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mansearch.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- src/usr.bin/mandoc/mansearch.c	2014/09/03 18:08:26	1.35
+++ src/usr.bin/mandoc/mansearch.c	2014/11/11 19:03:10	1.36
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mansearch.c,v 1.35 2014/09/03 18:08:26 schwarze Exp $ */
+/*	$OpenBSD: mansearch.c,v 1.36 2014/11/11 19:03:10 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -344,6 +344,14 @@
 		sqlite3_finalize(s2);
 		sqlite3_close(db);
 		ohash_delete(&htab);
+
+		/*
+		 * In man(1) mode, prefer matches in earlier trees
+		 * over matches in later trees.
+		 */
+
+		if (cur && search->firstmatch)
+			break;
 	}
 	qsort(*res, cur, sizeof(struct manpage), manpage_compare);
 	rc = 1;