From 374bb4872e65b87efc9d1208372479dcf2196923 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Fri, 22 Sep 2023 15:58:29 +0100 Subject: [PATCH] Remove spurious 'clipboard' storage enumeration. It's not used! The only config items that specified it are doing their load/save in a custom way anyway, and they _don't_ use anything resembling that enum - instead, they map the integer values in Conf to strings in the storage format. That enum was a total lie and an artefact of my conversion macros. Ahem. --- conf-enums.h | 7 ------- conf.h | 3 --- 2 files changed, 10 deletions(-) diff --git a/conf-enums.h b/conf-enums.h index c76d43d8..4820bef3 100644 --- a/conf-enums.h +++ b/conf-enums.h @@ -156,13 +156,6 @@ CONF_ENUM(mouse_buttons, VALUE(MOUSE_WINDOWS, 2), ) -CONF_ENUM(clipboard, - VALUE(CLIPUI_NONE, 0), - VALUE(CLIPUI_IMPLICIT, 1), - VALUE(CLIPUI_EXPLICIT, 2), - VALUE(CLIPUI_CUSTOM, 3), -) - CONF_ENUM(line_drawing, VALUE(VT_XWINDOWS, 0), VALUE(VT_OEMANSI, 1), diff --git a/conf.h b/conf.h index 6b517886..b00300b6 100644 --- a/conf.h +++ b/conf.h @@ -991,7 +991,6 @@ CONF_OPTION(mouseautocopy, ) CONF_OPTION(mousepaste, /* clipboard used by one-mouse-click paste actions */ VALUE_TYPE(INT), - STORAGE_ENUM(clipboard), /* * SAVE_KEYWORD("MousePaste"), but loading and saving is done by * custom code, because the saved value is a string, and also sets @@ -1000,7 +999,6 @@ CONF_OPTION(mousepaste, /* clipboard used by one-mouse-click paste actions */ ) CONF_OPTION(ctrlshiftins, /* clipboard used by Ctrl+Ins and Shift+Ins */ VALUE_TYPE(INT), - STORAGE_ENUM(clipboard), /* * SAVE_KEYWORD("CtrlShiftIns"), but loading and saving is done by * custom code, because the saved value is a string, and also sets @@ -1009,7 +1007,6 @@ CONF_OPTION(ctrlshiftins, /* clipboard used by Ctrl+Ins and Shift+Ins */ ) CONF_OPTION(ctrlshiftcv, /* clipboard used by Ctrl+Shift+C and Ctrl+Shift+V */ VALUE_TYPE(INT), - STORAGE_ENUM(clipboard), /* * SAVE_KEYWORD("CtrlShiftCV"), but loading and saving is done by * custom code, because the saved value is a string, and also sets