Merge commit 'meins/master'

diff --cc gui.c
index 36d47994c073b6fda784086378d3ffbc47934dce,499845d9dadcdb6802b6ac49ab470d969729314c..0a8f081839b97f6b0aaaac7ce3cc9e3d2bc049d1
--- 1/gui.c
--- 2/gui.c
+++ b/gui.c
@@@ -1179,13 -1180,13 +1180,13 @@@ static void com_ll_decr(void
  
  static void com_ll_incr(void)
  {
-       if (conf.loglevel_arg >= EMERG) {
+       if (loglevel >= LL_EMERG) {
                print_in_bar(COLOR_ERRMSG,
 -                      "loglevel already at miminal verbosity\n");
 +                      "loglevel already at minimal verbosity\n");
                return;
        }
-       conf.loglevel_arg++;
-       print_in_bar(COLOR_MSG, "loglevel set to %d\n", conf.loglevel_arg);
+       loglevel++;
+       print_in_bar(COLOR_MSG, "loglevel set to %d\n", loglevel);
  }
  
  /*