===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- mandoc/main.c	2017/04/18 15:27:09	1.288
+++ mandoc/main.c	2017/04/18 16:01:20	1.289
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.288 2017/04/18 15:27:09 schwarze Exp $ */
+/*	$Id: main.c,v 1.289 2017/04/18 16:01:20 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -193,8 +193,12 @@ main(int argc, char *argv[])
 	show_usage = 0;
 	outmode = OUTMODE_DEF;
 
-	while (-1 != (c = getopt(argc, argv,
-			"aC:cfhI:iK:klM:m:O:S:s:T:VW:w"))) {
+	while ((c = getopt(argc, argv,
+	    "aC:cfhI:iK:klM:m:O:S:s:T:VW:w")) != -1) {
+		if (c == 'i' && search.argmode == ARG_EXPR) {
+			optind--;
+			break;
+		}
 		switch (c) {
 		case 'a':
 			outmode = OUTMODE_ALL;