summaryrefslogtreecommitdiff
path: root/src/option.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-12-06 19:59:18 +0000
committerBram Moolenaar <Bram@vim.org>2005-12-06 19:59:18 +0000
commit9372a11ca67d6bdec9c16407a941cb8094eec3b6 (patch)
tree9633dee37b98fab6fe12d78ee30bc761f2f21a73 /src/option.c
parentcef9dcc37ef6dce3d98cf1550c3731fff9d451b5 (diff)
downloadvim-git-9372a11ca67d6bdec9c16407a941cb8094eec3b6.tar.gz
updated for version 7.0163
Diffstat (limited to 'src/option.c')
-rw-r--r--src/option.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/option.c b/src/option.c
index 1b724dca4..14d40c9ae 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1075,14 +1075,14 @@ static struct vimoption
#endif
},
{"guiheadroom", "ghr", P_NUM|P_VI_DEF,
-#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11) || defined(FEAT_GUI_KDE)
+#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11)
(char_u *)&p_ghr, PV_NONE,
#else
(char_u *)NULL, PV_NONE,
#endif
{(char_u *)50L, (char_u *)0L}},
{"guioptions", "go", P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST,
-#if defined(FEAT_GUI) || defined(FEAT_GUI_KDE)
+#if defined(FEAT_GUI)
(char_u *)&p_go, PV_NONE,
# if defined(UNIX) && !defined(MACOS)
{(char_u *)"agimrLtT", (char_u *)0L}
@@ -1168,7 +1168,7 @@ static struct vimoption
(char_u *)&p_ic, PV_NONE,
{(char_u *)FALSE, (char_u *)0L}},
{"imactivatekey","imak",P_STRING|P_VI_DEF,
-#if defined(FEAT_XIM) && (defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE))
+#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
(char_u *)&p_imak, PV_NONE,
#else
(char_u *)NULL, PV_NONE,
@@ -5305,7 +5305,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
}
#endif
-#if defined(FEAT_XIM) && ( defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE) )
+#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
else if (varp == &p_imak)
{
if (gui.in_use && !im_xim_isvalid_imactivate())
@@ -5574,7 +5574,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
if (gui.in_use)
{
p = p_guifont;
-# if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE)
+# if defined(FEAT_GUI_GTK)
/*
* Put up a font dialog and let the user select a new value.
* If this is cancelled go back to the old value but don't