From 6536b37d33ba2cf11aa5d95de4a6a1537b60afdb Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sat, 19 Feb 2022 04:46:54 +0300 Subject: [PATCH] .fvwmrc: Fix quoting Use double-quoting to avoid macro expansion too early. --- .fvwm/main.m4 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.fvwm/main.m4 b/.fvwm/main.m4 index 2f960c5..23c7f5d 100644 --- a/.fvwm/main.m4 +++ b/.fvwm/main.m4 @@ -77,10 +77,10 @@ define(`TERM_EN_UTF8', `Exec LC_CTYPE=en_US.UTF-8 exec TERM -name URxvt') define(`TERM_HEB_UTF8', `Exec LC_CTYPE=he_IL.UTF-8 exec TERM -name URxvt') define(`TERM_KOI8_BOTLT', `TERM_KOI8 -geometry TERM_GEOM_BOTLT') define(`TERM_RU_UTF8_BOTLT', `TERM_RU_UTF8 -geometry TERM_GEOM_BOTLT') -define(`TERM_KOI8_BOTRT', `TERM_KOI8 -geometry TERM_GEOM_BOTRT') +define(`TERM_KOI8_BOTRT', ``TERM_KOI8' -geometry TERM_GEOM_BOTRT') define(`TERM_RU_UTF8_BOTRT', `TERM_RU_UTF8 -geometry TERM_GEOM_BOTRT') -define(`TERM_KOI8_BIG', TERM_KOI8 -geometry TERM_GEOM_BIG) -define(`TERM_UTF8_BIG', TERM_RU_UTF8 -geometry TERM_GEOM_BIG) +define(`TERM_KOI8_BIG', `TERM_KOI8 -geometry TERM_GEOM_BIG') +define(`TERM_UTF8_BIG', `TERM_RU_UTF8 -geometry TERM_GEOM_BIG') define(`SSH', `cgmem_nice 300 ssh') @@ -90,7 +90,7 @@ define(`TERM_SSH', `$1 -e SSH $2') define(`TERM_TITLE_SSH', `$1 -title "$3" -n "$3" -e SSH $2') define(`TERM_KOI8_SSH', -TERM_TITLE_SSH(TERM_KOI8, $1, $2)) +TERM_TITLE_SSH(`TERM_KOI8', $1, $2)) define(`SSH_SCREEN_KOI8', `SSH -t $1 TZ="$(cat /etc/timezone)" exec /usr/bin/screen -xRR -S default-koi8') @@ -107,10 +107,10 @@ define(`MENU_TERM_KOI8_SSH', "$2 (koi8)" TERM_KOI8_SSH($1, $2)) define(`TERM_KOI8_BOTLT_SSH', -TERM_TITLE_SSH(TERM_KOI8_BOTLT, $1, $2)) +TERM_TITLE_SSH(`TERM_KOI8_BOTLT', $1, $2)) define(`TERM_KOI8_BOTRT_SSH', -TERM_TITLE_SSH(TERM_KOI8_BOTRT, $1, $2)) +TERM_TITLE_SSH(`TERM_KOI8_BOTRT', $1, $2)) define(`MENU_TERM_KOI8_BOTLT_SSH', "$2 (btlt,koi8)" TERM_KOI8_BOTLT_SSH($1, $2)) @@ -119,16 +119,16 @@ define(`MENU_TERM_KOI8_BOTRT_SSH', "$2 (btrt,koi8)" TERM_KOI8_BOTRT_SSH($1, $2)) define(`TERM_KOI8_SSH_SCREEN', -TERM_TITLE_SSH_SCREEN_KOI8(TERM_KOI8, $1, $2)) +TERM_TITLE_SSH_SCREEN_KOI8(``TERM_KOI8'', $1, $2)) define(`MENU_TERM_KOI8_SSH_SCREEN', -"$2 (koi8,scr)" TERM_TITLE_SSH_SCREEN_KOI8(TERM_KOI8, $1, $2)) +"$2 (koi8,scr)" TERM_TITLE_SSH_SCREEN_KOI8(`TERM_KOI8', $1, $2)) define(`TERM_KOI8_BOTLT_SSH_SCREEN', -TERM_TITLE_SSH_SCREEN_KOI8(TERM_KOI8_BOTLT, $1, $2)) +TERM_TITLE_SSH_SCREEN_KOI8(`TERM_KOI8_BOTLT', $1, $2)) define(`TERM_KOI8_BOTRT_SSH_SCREEN', -TERM_TITLE_SSH_SCREEN_KOI8(TERM_KOI8_BOTRT, $1, $2)) +TERM_TITLE_SSH_SCREEN_KOI8(`TERM_KOI8_BOTRT', $1, $2)) define(`MENU_TERM_KOI8_BOTLT_SSH_SCREEN', "$2 (btlt,koi8,scr)" TERM_KOI8_BOTLT_SSH_SCREEN($1, $2)) @@ -137,16 +137,16 @@ define(`MENU_TERM_KOI8_BOTRT_SSH_SCREEN', "$2 (btrt,koi8,scr)" TERM_KOI8_BOTRT_SSH_SCREEN($1, $2)) define(`TERM_UTF8_SSH', -TERM_TITLE_SSH(TERM_RU_UTF8, $1, $2)) +TERM_TITLE_SSH(`TERM_RU_UTF8', $1, $2)) define(`MENU_TERM_UTF8_SSH', "$2 (utf8)" TERM_UTF8_SSH($1, $2)) define(`TERM_UTF8_BOTLT_SSH', -TERM_TITLE_SSH(TERM_RU_UTF8_BOTLT, $1, $2)) +TERM_TITLE_SSH(`TERM_RU_UTF8_BOTLT', $1, $2)) define(`TERM_UTF8_BOTRT_SSH', -TERM_TITLE_SSH(TERM_RU_UTF8_BOTRT, $1, $2)) +TERM_TITLE_SSH(`TERM_RU_UTF8_BOTRT', $1, $2)) define(`MENU_TERM_UTF8_BOTLT_SSH', "$2 (btlt,utf8)" TERM_UTF8_BOTLT_SSH($1, $2)) @@ -155,16 +155,16 @@ define(`MENU_TERM_UTF8_BOTRT_SSH', "$2 (btrt,utf8)" TERM_UTF8_BOTRT_SSH($1, $2)) define(`TERM_UTF8_SSH_SCREEN', -TERM_TITLE_SSH_SCREEN_UTF8(TERM_RU_UTF8, $1, $2)) +TERM_TITLE_SSH_SCREEN_UTF8(`TERM_RU_UTF8', $1, $2)) define(`MENU_TERM_UTF8_SSH_SCREEN', "$2 (utf8,scr)" TERM_UTF8_SSH_SCREEN($1, $2)) define(`TERM_UTF8_BOTLT_SSH_SCREEN', -TERM_TITLE_SSH_SCREEN_UTF8(TERM_RU_UTF8_BOTLT, $1, $2)) +TERM_TITLE_SSH_SCREEN_UTF8(`TERM_RU_UTF8_BOTLT', $1, $2)) define(`TERM_UTF8_BOTRT_SSH_SCREEN', -TERM_TITLE_SSH_SCREEN_UTF8(TERM_RU_UTF8_BOTRT, $1, $2)) +TERM_TITLE_SSH_SCREEN_UTF8(`TERM_RU_UTF8_BOTRT', $1, $2)) define(`MENU_TERM_UTF8_BOTLT_SSH_SCREEN', "$2 (btlt,utf8,scr)" TERM_UTF8_BOTLT_SSH_SCREEN($1, $2)) -- 2.39.5