X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;ds=sidebyside;f=progs%2Freset_cmd.c;h=28829e72fe2514de772249e1286b535ea57eab75;hb=9193d076200365eeb5ff932acdbbdcc5e452292c;hp=c5d96a2e82ce4f041d70267958f9f3be370968df;hpb=a05f3a78195a9d85a5b3e612197bdbf1a348dac0;p=ncurses.git

diff --git a/progs/reset_cmd.c b/progs/reset_cmd.c
index c5d96a2e..28829e72 100644
--- a/progs/reset_cmd.c
+++ b/progs/reset_cmd.c
@@ -52,7 +52,7 @@
 #include <sys/ptem.h>
 #endif
 
-MODULE_ID("$Id: reset_cmd.c,v 1.17 2019/05/25 22:36:53 tom Exp $")
+MODULE_ID("$Id: reset_cmd.c,v 1.18 2019/07/13 21:35:13 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -495,6 +495,9 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings)
 				  ? reset_2string
 				  : init_2string);
 
+	if (VALID_STRING(clear_margins)) {
+	    need_flush |= sent_string(clear_margins);
+	} else
 #if defined(set_lr_margin)
 	if (VALID_STRING(set_lr_margin)) {
 	    need_flush |= sent_string(TPARM_2(set_lr_margin, 0,
@@ -509,10 +512,8 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings)
 					      columns - 1));
 	} else
 #endif
-	    if (VALID_STRING(clear_margins)
-		&& VALID_STRING(set_left_margin)
+	    if (VALID_STRING(set_left_margin)
 		&& VALID_STRING(set_right_margin)) {
-	    need_flush |= sent_string(clear_margins);
 	    need_flush |= to_left_margin();
 	    need_flush |= sent_string(set_left_margin);
 	    if (VALID_STRING(parm_right_cursor)) {