===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.330
retrieving revision 1.332
diff -u -p -r1.330 -r1.332
--- mandoc/main.c	2019/07/14 18:16:13	1.330
+++ mandoc/main.c	2019/07/19 20:27:25	1.332
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.330 2019/07/14 18:16:13 schwarze Exp $ */
+/*	$Id: main.c,v 1.332 2019/07/19 20:27:25 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -727,7 +727,8 @@ out:
 			signum = WSTOPSIG(status);
 		}
 		tag_unlink();
-	} else if (curp.outtype != OUTT_LINT)
+	} else if (curp.outtype != OUTT_LINT &&
+	    (search.argmode == ARG_FILE || sz > 0))
 		mandoc_msg_summary();
 
 	return (int)mandoc_msg_getrc();
@@ -1193,7 +1194,7 @@ spawn_pager(struct tag_files *tag_files)
 
 	use_ofn = 1;
 #if HAVE_LESS_T
-	if ((cmdlen = strlen(argv[0])) >= 4) {
+	if (*tag_files->tfn != '\0' && (cmdlen = strlen(argv[0])) >= 4) {
 		cp = argv[0] + cmdlen - 4;
 		if (strcmp(cp, "less") == 0) {
 			argv[argc++] = mandoc_strdup("-T");