From 2a82096749a93eed3b157ad002ef1bbadfbb6940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Fri, 18 Dec 2020 17:32:54 +0100 Subject: [PATCH 1/2] term: fix builds with debug logging enabled DPI_AWARE_ON has been renamed to DPI_AWARE_YES --- terminal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terminal.c b/terminal.c index 489d7e3c..208c8700 100644 --- a/terminal.c +++ b/terminal.c @@ -1710,7 +1710,7 @@ term_font_dpi_changed(struct terminal *term) "DPI: %.2f -> %.2f, scale: %d -> %d, " "sizing font based on monitor's %s", term->conf->dpi_aware == DPI_AWARE_AUTO ? "auto" : - term->conf->dpi_aware == DPI_AWARE_ON ? "yes" : "no", + term->conf->dpi_aware == DPI_AWARE_YES ? "yes" : "no", term->font_dpi, dpi, term->font_scale, scale, will_scale_using_dpi ? "DPI" : "scaling factor"); } From da47deee1009c9a5cc9b360b978dc69d7a724f0b Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Sat, 19 Dec 2020 22:50:18 +0000 Subject: [PATCH 2/2] changelog: fix link to "1.6.0" heading --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7ebe440..826c95c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog * [Unreleased](#Unreleased) -* [1.6.0](#1.6.0) +* [1.6.0](#1-6-0) * [1.5.4](#1-5-4) * [1.5.3](#1-5-3) * [1.5.2](#1-5-2)