From 18e4460929c0a820dc3434c334f88d97cfc61fc1 Mon Sep 17 00:00:00 2001 From: Egmont Koblinger Date: Mon, 12 Jan 2026 12:08:41 +0100 Subject: [PATCH] Ticket #4954: skins: Rename the [Lines] section to lowercase [lines] Still accept [Lines] for backwards compatibility. Signed-off-by: Egmont Koblinger --- doc/man/es/mc.1.in | 6 +++--- doc/man/ru/mc.1.in | 4 ++-- doc/man/sr/mc.1.in | 4 ++-- lib/skin/hc-skins.c | 2 +- lib/skin/lines.c | 7 ++++++- misc/skins/README.txt | 2 +- misc/skins/dark.ini | 2 +- misc/skins/darkfar.ini | 2 +- misc/skins/default.ini | 2 +- misc/skins/double-lines.ini | 2 +- misc/skins/featured-plus.ini | 2 +- misc/skins/featured.ini | 2 +- misc/skins/gotar.ini | 2 +- misc/skins/gray-green-purple256.ini | 2 +- misc/skins/gray-orange-blue256.ini | 2 +- misc/skins/julia256.ini | 2 +- misc/skins/julia256root.ini | 2 +- misc/skins/mc46.ini | 2 +- misc/skins/modarcon16-defbg-thin.ini | 2 +- misc/skins/modarcon16-defbg.ini | 2 +- misc/skins/modarcon16-thin.ini | 2 +- misc/skins/modarcon16.ini | 2 +- misc/skins/modarcon16root-defbg-thin.ini | 2 +- misc/skins/modarcon16root-defbg.ini | 2 +- misc/skins/modarcon16root-thin.ini | 2 +- misc/skins/modarcon16root.ini | 2 +- misc/skins/modarin256-defbg-thin.ini | 2 +- misc/skins/modarin256-defbg.ini | 2 +- misc/skins/modarin256-thin.ini | 2 +- misc/skins/modarin256.ini | 2 +- misc/skins/modarin256root-defbg-thin.ini | 2 +- misc/skins/modarin256root-defbg.ini | 2 +- misc/skins/modarin256root-thin.ini | 2 +- misc/skins/modarin256root.ini | 2 +- misc/skins/nicedark.ini | 2 +- misc/skins/sand256.ini | 2 +- misc/skins/seasons-autumn16M.ini | 2 +- misc/skins/seasons-spring16M.ini | 2 +- misc/skins/seasons-summer16M.ini | 2 +- misc/skins/seasons-winter16M.ini | 2 +- misc/skins/xoria256-thin.ini | 2 +- misc/skins/xoria256.ini | 2 +- misc/skins/xoria256root-thin.ini | 2 +- misc/skins/yadt256-defbg.ini | 2 +- misc/skins/yadt256.ini | 2 +- 45 files changed, 54 insertions(+), 49 deletions(-) diff --git a/doc/man/es/mc.1.in b/doc/man/es/mc.1.in index 7870206d8b..b92b734a6e 100644 --- a/doc/man/es/mc.1.in +++ b/doc/man/es/mc.1.in @@ -103,7 +103,7 @@ como un alias para el correspondiente guión de shell. .I \-s, \-\-slow Activa el modo para terminales lentos. En este modo el programa no dibuja bordes con líneas de caracteres y desactiva el modo detallado. -Si no se rellena la sección [Lines] el marco pseudo\-gráfico estará +Si no se rellena la sección [lines] el marco pseudo\-gráfico estará formado por espacios; en caso contrario el marco se contruye con caracteres de texto según los parámetros siguientes: .TP @@ -3723,14 +3723,14 @@ Colores\&. .\"NODE " Skins lines" .SH " Trazado de líneas" Trazos de líneas de la sección -.B [Lines] +.B [lines] del archivo de skins. Por defecto se utilizan líneas sencillas, pero se pueden redefinir empleando cualquier símbolo utf\-8 (por ejemplo, líneas dobles). .PP Descripción de parámetros de la sección -.BR [Lines] : +.BR [lines] : .TP .I lefttop esquina superior izquierda. diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in index 49eca62791..6f0467646d 100644 --- a/doc/man/ru/mc.1.in +++ b/doc/man/ru/mc.1.in @@ -4396,13 +4396,13 @@ menuhotsel=yellow;black;bold+underline .\"NODE " Skins lines" .SH " Линии для отрисовки рамок" Линии задаются в секции -.B [Lines] +.B [lines] в скин\-файле. По умолчанию используются одинарные линии, но возможно переназначить на использование любых utf\-8 символов, похожих на линии .PP Описание параметров секции -.BR [Lines] : +.BR [lines] : .TP .I lefttop изображение левого верхнего угла рамки diff --git a/doc/man/sr/mc.1.in b/doc/man/sr/mc.1.in index c641043628..27026b7ce0 100644 --- a/doc/man/sr/mc.1.in +++ b/doc/man/sr/mc.1.in @@ -3810,13 +3810,13 @@ menuhotsel=yellow;black;bold+underline .\"NODE " Skins lines" .SH " Линије за исцртавање" Линије се подешавају у одељку -.B [Lines] +.B [lines] датотеке скина. Подразумевано, користе се једноструке линије, али можете поставити да се користе било који utf\-8 симболи (на пример, линије). .PP Описи параметара -.BR [Lines] : +.BR [lines] : .TP .I lefttop горњи леви фрагмент линије. diff --git a/lib/skin/hc-skins.c b/lib/skin/hc-skins.c index ef720dea3d..66223a6f35 100644 --- a/lib/skin/hc-skins.c +++ b/lib/skin/hc-skins.c @@ -33,7 +33,7 @@ /*** file scope macro definitions ****************************************************************/ -#define set_lines(x, y) mc_config_set_string (mc_skin->config, "Lines", x, y) +#define set_lines(x, y) mc_config_set_string (mc_skin->config, "lines", x, y) /*** file scope type declarations ****************************************************************/ diff --git a/lib/skin/lines.c b/lib/skin/lines.c index e064022e09..35947b5294 100644 --- a/lib/skin/lines.c +++ b/lib/skin/lines.c @@ -91,7 +91,12 @@ skin_get_char (mc_skin_t *mc_skin, const char *name, gunichar def, mc_tty_char_t estr_t conv_res; char *value_utf8; - value_utf8 = mc_config_get_string_raw (mc_skin->config, "Lines", name, NULL); + value_utf8 = mc_config_get_string_raw (mc_skin->config, "lines", name, NULL); + if (value_utf8 == NULL) + { + // it was called "Lines" (uppercase L) in mc <= 4.8.33, accept that for compatibility + value_utf8 = mc_config_get_string_raw (mc_skin->config, "Lines", name, NULL); + } if (value_utf8 != NULL) { c = g_utf8_get_char_validated (value_utf8, -1); diff --git a/misc/skins/README.txt b/misc/skins/README.txt index 9c7e57eb46..d1f0462e59 100644 --- a/misc/skins/README.txt +++ b/misc/skins/README.txt @@ -320,7 +320,7 @@ Character sections The following keys define characters to be shown at various positions on the display. The characters in the skin files need to be encoded in UTF-8. - [Lines] + [lines] Frame characters used all throughout mc. horiz diff --git a/misc/skins/dark.ini b/misc/skins/dark.ini index 4fb4c473d4..b70ed5d404 100644 --- a/misc/skins/dark.ini +++ b/misc/skins/dark.ini @@ -1,7 +1,7 @@ [skin] description = Dark skin -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/darkfar.ini b/misc/skins/darkfar.ini index ae50dd6485..9e87f8bbf9 100644 --- a/misc/skins/darkfar.ini +++ b/misc/skins/darkfar.ini @@ -1,7 +1,7 @@ [skin] description = Dark Far skin -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/default.ini b/misc/skins/default.ini index 0f0cb7d18a..635c46916d 100644 --- a/misc/skins/default.ini +++ b/misc/skins/default.ini @@ -1,7 +1,7 @@ [skin] description = Standard skin -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/double-lines.ini b/misc/skins/double-lines.ini index 0b81b838ae..4705584ed2 100644 --- a/misc/skins/double-lines.ini +++ b/misc/skins/double-lines.ini @@ -1,7 +1,7 @@ [skin] description = Far-like skin -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/featured-plus.ini b/misc/skins/featured-plus.ini index d669921157..520c751f85 100644 --- a/misc/skins/featured-plus.ini +++ b/misc/skins/featured-plus.ini @@ -1,7 +1,7 @@ [skin] description = Enhanced standard skin with alternative directory and file select/mark colors -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/featured.ini b/misc/skins/featured.ini index c663cc2552..25a3f13ed5 100644 --- a/misc/skins/featured.ini +++ b/misc/skins/featured.ini @@ -1,7 +1,7 @@ [skin] description = Enhanced standard skin -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/gotar.ini b/misc/skins/gotar.ini index ee1449384f..5f979b3220 100644 --- a/misc/skins/gotar.ini +++ b/misc/skins/gotar.ini @@ -1,7 +1,7 @@ [skin] description = GoTaR @PLD Linux -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/gray-green-purple256.ini b/misc/skins/gray-green-purple256.ini index f2b0347739..4fda66a556 100644 --- a/misc/skins/gray-green-purple256.ini +++ b/misc/skins/gray-green-purple256.ini @@ -2,7 +2,7 @@ description = Gray-Green-Purple Skin 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/gray-orange-blue256.ini b/misc/skins/gray-orange-blue256.ini index 600c32c388..d30bdfa927 100644 --- a/misc/skins/gray-orange-blue256.ini +++ b/misc/skins/gray-orange-blue256.ini @@ -2,7 +2,7 @@ description = Gray-Orange-Blue Skin 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/julia256.ini b/misc/skins/julia256.ini index c85473d98e..c41b65cc23 100644 --- a/misc/skins/julia256.ini +++ b/misc/skins/julia256.ini @@ -4,7 +4,7 @@ description = Dark skin with calm colors and good contrast 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/julia256root.ini b/misc/skins/julia256root.ini index f87854c396..15141d5b61 100644 --- a/misc/skins/julia256root.ini +++ b/misc/skins/julia256root.ini @@ -4,7 +4,7 @@ description = Dark skin with calm colors and good contrast (root) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/mc46.ini b/misc/skins/mc46.ini index b0ecc7f2ed..d76089d17d 100644 --- a/misc/skins/mc46.ini +++ b/misc/skins/mc46.ini @@ -1,7 +1,7 @@ [skin] description = mc-4.6 skin -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16-defbg-thin.ini b/misc/skins/modarcon16-defbg-thin.ini index 183732736c..1a54c9a002 100644 --- a/misc/skins/modarcon16-defbg-thin.ini +++ b/misc/skins/modarcon16-defbg-thin.ini @@ -43,7 +43,7 @@ description = MoDarCon16-DefaultBG (user) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16-defbg.ini b/misc/skins/modarcon16-defbg.ini index 31f23fec67..d21ee6142b 100644 --- a/misc/skins/modarcon16-defbg.ini +++ b/misc/skins/modarcon16-defbg.ini @@ -43,7 +43,7 @@ description = MoDarCon16-DefaultBG (user) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16-thin.ini b/misc/skins/modarcon16-thin.ini index 2415525560..5eb93e084d 100644 --- a/misc/skins/modarcon16-thin.ini +++ b/misc/skins/modarcon16-thin.ini @@ -43,7 +43,7 @@ description = MoDarCon16 (user) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16.ini b/misc/skins/modarcon16.ini index 307c44aec3..782d5f9299 100644 --- a/misc/skins/modarcon16.ini +++ b/misc/skins/modarcon16.ini @@ -43,7 +43,7 @@ description = MoDarCon16 (user) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16root-defbg-thin.ini b/misc/skins/modarcon16root-defbg-thin.ini index fbbdfd7f23..3ad88af4f7 100644 --- a/misc/skins/modarcon16root-defbg-thin.ini +++ b/misc/skins/modarcon16root-defbg-thin.ini @@ -43,7 +43,7 @@ description = MoDarCon16root-DefaultBG (root) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16root-defbg.ini b/misc/skins/modarcon16root-defbg.ini index 62a67f1f6e..4fc5eb88a8 100644 --- a/misc/skins/modarcon16root-defbg.ini +++ b/misc/skins/modarcon16root-defbg.ini @@ -43,7 +43,7 @@ description = MoDarCon16root-DefaultBG (root) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16root-thin.ini b/misc/skins/modarcon16root-thin.ini index 25cf51fabb..1eabe8af9d 100644 --- a/misc/skins/modarcon16root-thin.ini +++ b/misc/skins/modarcon16root-thin.ini @@ -43,7 +43,7 @@ description = MoDarCon16root (root) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16root.ini b/misc/skins/modarcon16root.ini index 1208a12b53..a588a67481 100644 --- a/misc/skins/modarcon16root.ini +++ b/misc/skins/modarcon16root.ini @@ -43,7 +43,7 @@ description = MoDarCon16root (root) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256-defbg-thin.ini b/misc/skins/modarin256-defbg-thin.ini index ab117661ea..4e9d787764 100644 --- a/misc/skins/modarin256-defbg-thin.ini +++ b/misc/skins/modarin256-defbg-thin.ini @@ -43,7 +43,7 @@ description = MoDarIn256-DefaultBG (user) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256-defbg.ini b/misc/skins/modarin256-defbg.ini index 51645d1a77..2cfd414316 100644 --- a/misc/skins/modarin256-defbg.ini +++ b/misc/skins/modarin256-defbg.ini @@ -43,7 +43,7 @@ description = MoDarIn256-DefaultBG (user) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256-thin.ini b/misc/skins/modarin256-thin.ini index 3aad78afc5..3729276d63 100644 --- a/misc/skins/modarin256-thin.ini +++ b/misc/skins/modarin256-thin.ini @@ -43,7 +43,7 @@ description = MoDarIn256 (user) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256.ini b/misc/skins/modarin256.ini index 28b17eb28c..69394706c3 100644 --- a/misc/skins/modarin256.ini +++ b/misc/skins/modarin256.ini @@ -43,7 +43,7 @@ description = MoDarIn256 (user) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256root-defbg-thin.ini b/misc/skins/modarin256root-defbg-thin.ini index 15631a919a..9f745df53c 100644 --- a/misc/skins/modarin256root-defbg-thin.ini +++ b/misc/skins/modarin256root-defbg-thin.ini @@ -43,7 +43,7 @@ description = MoDarIn256root-DefaultBG (root) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256root-defbg.ini b/misc/skins/modarin256root-defbg.ini index 4ed0abaa5e..f06b4c557c 100644 --- a/misc/skins/modarin256root-defbg.ini +++ b/misc/skins/modarin256root-defbg.ini @@ -43,7 +43,7 @@ description = MoDarIn256root-DefaultBG (root) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256root-thin.ini b/misc/skins/modarin256root-thin.ini index f686b47c99..66c71b169a 100644 --- a/misc/skins/modarin256root-thin.ini +++ b/misc/skins/modarin256root-thin.ini @@ -43,7 +43,7 @@ description = MoDarIn256root (root) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256root.ini b/misc/skins/modarin256root.ini index 87aeef175d..3ffdd5c8be 100644 --- a/misc/skins/modarin256root.ini +++ b/misc/skins/modarin256root.ini @@ -43,7 +43,7 @@ description = MoDarIn256root (root) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/nicedark.ini b/misc/skins/nicedark.ini index 032833ce49..0f18c5aab9 100644 --- a/misc/skins/nicedark.ini +++ b/misc/skins/nicedark.ini @@ -1,7 +1,7 @@ [skin] description = Nice and Dark -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/sand256.ini b/misc/skins/sand256.ini index f38a496e27..0930ace00a 100644 --- a/misc/skins/sand256.ini +++ b/misc/skins/sand256.ini @@ -2,7 +2,7 @@ description = Sand skin using 256 colors 256colors = true -[Lines] +[lines] horiz = ╌ vert = ┆ lefttop = ╭ diff --git a/misc/skins/seasons-autumn16M.ini b/misc/skins/seasons-autumn16M.ini index aa4f3b602e..2eccaa3ae4 100644 --- a/misc/skins/seasons-autumn16M.ini +++ b/misc/skins/seasons-autumn16M.ini @@ -6,7 +6,7 @@ description = Four Seasons – Autumn truecolors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/seasons-spring16M.ini b/misc/skins/seasons-spring16M.ini index 33be9c4503..44b79582ed 100644 --- a/misc/skins/seasons-spring16M.ini +++ b/misc/skins/seasons-spring16M.ini @@ -6,7 +6,7 @@ description = Four Seasons – Spring truecolors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/seasons-summer16M.ini b/misc/skins/seasons-summer16M.ini index 593afebec1..0192d18ba1 100644 --- a/misc/skins/seasons-summer16M.ini +++ b/misc/skins/seasons-summer16M.ini @@ -6,7 +6,7 @@ description = Four Seasons – Summer truecolors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/seasons-winter16M.ini b/misc/skins/seasons-winter16M.ini index d12d8e9b8b..b5a7f203d0 100644 --- a/misc/skins/seasons-winter16M.ini +++ b/misc/skins/seasons-winter16M.ini @@ -6,7 +6,7 @@ description = Four Seasons – Winter truecolors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/xoria256-thin.ini b/misc/skins/xoria256-thin.ini index 8e30f2a246..6808c3971f 100644 --- a/misc/skins/xoria256-thin.ini +++ b/misc/skins/xoria256-thin.ini @@ -11,7 +11,7 @@ description = Xoria256-Thin 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/xoria256.ini b/misc/skins/xoria256.ini index a529150421..fab80ed6ac 100644 --- a/misc/skins/xoria256.ini +++ b/misc/skins/xoria256.ini @@ -11,7 +11,7 @@ description = Xoria256 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/xoria256root-thin.ini b/misc/skins/xoria256root-thin.ini index b1fb66cba9..fedd67b9de 100644 --- a/misc/skins/xoria256root-thin.ini +++ b/misc/skins/xoria256root-thin.ini @@ -11,7 +11,7 @@ description = Xoria256root-Thin 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/yadt256-defbg.ini b/misc/skins/yadt256-defbg.ini index ad4bb455d2..01b4cd7fdf 100644 --- a/misc/skins/yadt256-defbg.ini +++ b/misc/skins/yadt256-defbg.ini @@ -10,7 +10,7 @@ description = Yet Another Dark Theme, 256 colors, default background 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/yadt256.ini b/misc/skins/yadt256.ini index a3d2c22fe6..0d99e4a2c5 100644 --- a/misc/skins/yadt256.ini +++ b/misc/skins/yadt256.ini @@ -9,7 +9,7 @@ description = Yet Another Dark Theme, 256 colors, black background 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌