Module Name: src Committed By: uwe Date: Sun Nov 18 02:39:44 UTC 2018
Modified Files: src/lib/libcurses: refresh.c Log Message: Further tweak previous. Change the check order to be more logical. No functional change intentded. While here fix indentation. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/lib/libcurses/refresh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libcurses/refresh.c diff -u src/lib/libcurses/refresh.c:1.99 src/lib/libcurses/refresh.c:1.100 --- src/lib/libcurses/refresh.c:1.99 Sun Nov 18 02:34:39 2018 +++ src/lib/libcurses/refresh.c Sun Nov 18 02:39:44 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: refresh.c,v 1.99 2018/11/18 02:34:39 uwe Exp $ */ +/* $NetBSD: refresh.c,v 1.100 2018/11/18 02:39:44 uwe Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)refresh.c 8.7 (Berkeley) 8/13/94"; #else -__RCSID("$NetBSD: refresh.c,v 1.99 2018/11/18 02:34:39 uwe Exp $"); +__RCSID("$NetBSD: refresh.c,v 1.100 2018/11/18 02:39:44 uwe Exp $"); #endif #endif /* not lint */ @@ -1250,16 +1250,15 @@ makech(int wy) _cursesi_screen->ly = wy; _cursesi_screen->lx = wx; while (wx <= lch && - (!celleq(nsp, csp) - || (wlp->flags & __ISFORCED))) + ((wlp->flags & __ISFORCED) || !celleq(nsp, csp))) { #ifndef HAVE_WCHAR if (ce != NULL && wx >= nlsp && nsp->ch == ' ' && nsp->attr == lspc) #else if (ce != NULL && wx >= nlsp - && nsp->ch == (wchar_t)btowc((int)' ') /* XXX */ - && (nsp->attr & WA_ATTRIBUTES) == lspc) + && nsp->ch == (wchar_t)btowc((int)' ') /* XXX */ + && (nsp->attr & WA_ATTRIBUTES) == lspc) #endif { /* Check for clear to end-of-line. */