diff options
| author | cos <cos> | 2013-05-25 16:46:30 +0200 |
|---|---|---|
| committer | cos <cos> | 2013-05-25 16:46:30 +0200 |
| commit | 7c559f00bacaf65d8c1c58aad20b519f9acded93 (patch) | |
| tree | bf8a50b58794927af16786ee7b20b509f889f774 /src/actions.c | |
| parent | 5ffd64be5b962e8bd8923f31e3bb14a9c8fd228c (diff) | |
| parent | 77f6e9fa21658bb7954b84c64d460b9d58124bf2 (diff) | |
| download | ratpoison-7c559f00bacaf65d8c1c58aad20b519f9acded93.zip | |
Merge branch 'cr/deprecate_winliststyle'
Diffstat (limited to 'src/actions.c')
| -rw-r--r-- | src/actions.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/actions.c b/src/actions.c index e31df72..a79f19b 100644 --- a/src/actions.c +++ b/src/actions.c @@ -68,7 +68,9 @@ static cmdret * set_bgcolor (struct cmdarg **args); static cmdret * set_fwcolor (struct cmdarg **args); static cmdret * set_bwcolor (struct cmdarg **args); static cmdret * set_barpadding (struct cmdarg **args); +#ifdef WINLISTSTYLE static cmdret * set_winliststyle (struct cmdarg **args); +#endif static cmdret * set_framesels (struct cmdarg **args); static cmdret * set_maxundos (struct cmdarg **args); static cmdret * set_infofmt (struct cmdarg **args); @@ -138,7 +140,9 @@ init_set_vars(void) add_set_var ("fwcolor", set_fwcolor, 1, "", arg_STRING); add_set_var ("bwcolor", set_bwcolor, 1, "", arg_STRING); add_set_var ("barpadding", set_barpadding, 2, "", arg_NUMBER, "", arg_NUMBER); +#ifdef WINLISTSTYLE add_set_var ("winliststyle", set_winliststyle, 1, "", arg_STRING); +#endif add_set_var ("framesels", set_framesels, 1, "", arg_STRING); add_set_var ("infofmt", set_infofmt, 1, "", arg_REST); add_set_var ("topkmap", set_topkmap, 1, "", arg_STRING); @@ -2127,6 +2131,13 @@ read_variable (struct argspec *spec, struct sbuf *s, struct cmdarg **arg) if (var == NULL) { cmdret *ret = cmdret_new (RET_FAILURE, "unknown variable '%s'", input); +#ifndef WINLISTSTYLE + if (!strcmp (input, "winliststyle")) + { + cmdret_free(ret); + ret = cmdret_new (RET_FAILURE, "'%s' is deprecated. Please notify ratpoison-devel@nongnu.org if you miss it.", input); + } +#endif free (input); return ret; } @@ -5021,6 +5032,7 @@ cmd_verbexec (int interactive UNUSED, struct cmdarg **args) return cmdret_new (RET_SUCCESS, NULL); } +#ifdef WINLISTSTYLE static cmdret * set_winliststyle (struct cmdarg **args) { @@ -5036,6 +5048,7 @@ set_winliststyle (struct cmdarg **args) return cmdret_new (RET_SUCCESS, NULL); } +#endif cmdret * cmd_gnext (int interactive UNUSED, struct cmdarg **args UNUSED) @@ -5938,6 +5951,7 @@ cmd_compat (int interactive UNUSED, struct cmdarg **args UNUSED) add_alias ("deffgcolor", "set fgcolor"); add_alias ("defbgcolor", "set bgcolor"); add_alias ("defbarpadding", "set barpadding"); +/* FIXME Deprecate the following alias together with everything else WINLISTSTYLE */ add_alias ("defwinliststyle", "set winliststyle"); add_alias ("defframesels", "set framesels"); add_alias ("defmaxundos", "set maxundos"); |