===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mansearch.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -c -r1.61 -r1.62
*** src/usr.bin/mandoc/mansearch.c	2018/11/19 19:27:29	1.61
--- src/usr.bin/mandoc/mansearch.c	2018/11/22 12:01:42	1.62
***************
*** 1,4 ****
! /*	$OpenBSD: mansearch.c,v 1.61 2018/11/19 19:27:29 schwarze Exp $ */
  /*
   * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013-2018 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mansearch.c,v 1.62 2018/11/22 12:01:42 schwarze Exp $ */
  /*
   * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013-2018 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 198,204 ****
  			mpage->names = buildnames(page);
  			mpage->output = buildoutput(outkey, page);
  			mpage->ipath = i;
- 			mpage->bits = rp->bits;
  			mpage->sec = *page->sect - '0';
  			if (mpage->sec < 0 || mpage->sec > 9)
  				mpage->sec = 10;
--- 198,203 ----
***************
*** 293,302 ****
  				break;
  			slot = ohash_lookup_memory(htab,
  			    (char *)&res, sizeof(res.page), res.page);
! 			if ((rp = ohash_find(htab, slot)) != NULL) {
! 				rp->bits |= res.bits;
  				continue;
- 			}
  			rp = mandoc_malloc(sizeof(*rp));
  			*rp = res;
  			ohash_insert(htab, slot, rp);
--- 292,299 ----
  				break;
  			slot = ohash_lookup_memory(htab,
  			    (char *)&res, sizeof(res.page), res.page);
! 			if ((rp = ohash_find(htab, slot)) != NULL)
  				continue;
  			rp = mandoc_malloc(sizeof(*rp));
  			*rp = res;
  			ohash_insert(htab, slot, rp);
***************
*** 409,416 ****
  
  	mp1 = vp1;
  	mp2 = vp2;
! 	if ((diff = mp2->bits - mp1->bits) ||
! 	    (diff = mp1->sec - mp2->sec))
  		return diff;
  
  	/* Fall back to alphabetic ordering of names. */
--- 406,412 ----
  
  	mp1 = vp1;
  	mp2 = vp2;
! 	if ((diff = mp1->sec - mp2->sec))
  		return diff;
  
  	/* Fall back to alphabetic ordering of names. */