===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/command.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- src/usr.bin/less/command.c	2011/09/21 19:01:49	1.10
+++ src/usr.bin/less/command.c	2011/10/08 19:55:39	1.11
@@ -55,6 +55,8 @@
 extern int oldbot;
 extern int forw_prompt;
 extern int be_helpful;
+extern int less_is_more;
+extern int quit_at_eof;
 
 #if SHELL_ESCAPE
 static char *shellcmd = NULL;	/* For holding last shell command for "!!" */
@@ -1232,6 +1234,8 @@
 			 */
 			if (sigs && !ABORT_SIGS())
 				newaction = A_F_FOREVER;
+			if (less_is_more)
+				quit_at_eof = OPT_ON;
 			break;
 
 		case A_F_SCROLL: