===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.305
retrieving revision 1.307
diff -u -p -r1.305 -r1.307
--- mandoc/main.c	2018/04/19 16:25:24	1.305
+++ mandoc/main.c	2018/08/09 17:30:36	1.307
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.305 2018/04/19 16:25:24 schwarze Exp $ */
+/*	$Id: main.c,v 1.307 2018/08/09 17:30:36 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014-2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -321,7 +321,8 @@ main(int argc, char *argv[])
 
 	if (use_pager &&
 	    (conf.output.width == 0 || conf.output.indent == 0) &&
-	    ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1) {
+	    ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 &&
+	    ws.ws_col > 1) {
 		if (conf.output.width == 0 && ws.ws_col < 79)
 			conf.output.width = ws.ws_col - 1;
 		if (conf.output.indent == 0 && ws.ws_col < 66)
@@ -789,8 +790,14 @@ fs_search(const struct mansearch *cfg, const struct ma
 					return 1;
 		}
 		if (res != NULL && *ressz == lastsz &&
-		    strchr(*argv, '/') == NULL)
-			warnx("No entry for %s in the manual.", *argv);
+		    strchr(*argv, '/') == NULL) {
+			if (cfg->sec == NULL)
+				warnx("No entry for %s in the manual.",
+				    *argv);
+			else
+				warnx("No entry for %s in section %s "
+				    "of the manual.", *argv, cfg->sec);
+		}
 		lastsz = *ressz;
 		argv++;
 		argc--;