Be more careful handling no_init flag. It should be enforced

in *all* less_is_more cases, On the other hand, quit_if_one_screen
should apply iff less_is_more *and* -e.

This change revises the previous change further, which tried
to make less(1) not to send @ti:@te before and after view of
one file in more(1) mode, but affected less -e behavior by
accident.

This is essentially the same patch desichen@ has posted on
-current@.  I have adjusted it a bit in order to minimize
difference between our version and the vendor branch.

Approved by:	re (bmah, earlier logically equivalent version)

1 files changed, 4 insertions, 2 deletions

diff --git a/contrib/less/main.c b/contrib/less/main.c
index d1d07ff..17201a9 100644
--- a/contrib/less/main.c
+++ b/contrib/less/main.c
@@ -165,8 +165,10 @@ main(argc, argv)
 		quit(QUIT_OK);
 	}
 
-	if (less_is_more || get_quit_at_eof())
-		no_init = quit_if_one_screen = TRUE;
+	if (less_is_more)
+		no_init = TRUE;
+	if (less_is_more && get_quit_at_eof())
+		quit_if_one_screen = TRUE;
 
 #if EDITOR
 	editor = lgetenv("VISUAL");