Module Name: src
Committed By: martin
Date: Thu May 16 12:19:49 UTC 2024
Modified Files:
src/usr.bin/tic [netbsd-10]: tic.c
Log Message:
Pull up following revision(s) (requested by wiz in ticket #688):
usr.bin/tic/tic.c: revision 1.41
Only mark the terminfo entry promoted if actually was.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.6.1 src/usr.bin/tic/tic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/tic/tic.c
diff -u src/usr.bin/tic/tic.c:1.40 src/usr.bin/tic/tic.c:1.40.6.1
--- src/usr.bin/tic/tic.c:1.40 Mon Mar 30 00:09:06 2020
+++ src/usr.bin/tic/tic.c Thu May 16 12:19:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: tic.c,v 1.40 2020/03/30 00:09:06 roy Exp $ */
+/* $NetBSD: tic.c,v 1.40.6.1 2024/05/16 12:19:48 martin Exp $ */
/*
* Copyright (c) 2009, 2010, 2020 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: tic.c,v 1.40 2020/03/30 00:09:06 roy Exp $");
+__RCSID("$NetBSD: tic.c,v 1.40.6.1 2024/05/16 12:19:48 martin Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -468,7 +468,7 @@ merge_use(int flags)
if (!promoted && rtic->rtype != TERMINFO_RTYPE) {
if (promote(rtic, utic) == -1)
err(EXIT_FAILURE, "promote");
- promoted = true;
+ promoted = rtic->rtype == TERMINFO_RTYPE;
}
merge(rtic, utic, flags);
