From d5a25994954a724d9359bd25720234b1725e6805 Mon Sep 17 00:00:00 2001 From: handa Date: Fri, 20 Apr 2007 11:34:16 +0000 Subject: [PATCH] *** empty log message *** --- src/ChangeLog | 8 ++++++++ src/input.c | 17 ++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6623623..0fcee60 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2007-04-20 Kenichi Handa + + * input.c (config_command): Fix previous change again. + (config_variable): Likewise. + (minput_config_command): Fix for the case of setting back to + default. + (minput_config_variable): Likewise. + 2007-04-05 Kenichi Handa * input.c (config_command): Fix previous change. diff --git a/src/input.c b/src/input.c index 171c4d2..9d562df 100644 --- a/src/input.c +++ b/src/input.c @@ -1782,7 +1782,7 @@ config_command (MPlist *plist, MPlist *global_cmds, MPlist *custom_cmds, } else if (custom_cmds && (custom = mplist__assq (custom_cmds, name))) { - custom = MPLIST_NEXT (MPLIST_PLIST (custom)); + custom = MPLIST_NEXT (MPLIST_NEXT (MPLIST_PLIST (custom))); if (! MPLIST_TAIL_P (custom)) { status = Mcustomized; @@ -2075,7 +2075,7 @@ config_variable (MPlist *plist, MPlist *global_vars, MPlist *custom_vars, } else if (custom_vars && (custom = mplist__assq (custom_vars, name))) { - custom = MPLIST_NEXT (MPLIST_PLIST (custom)); + custom = MPLIST_NEXT (MPLIST_NEXT (MPLIST_PLIST (custom))); if (! MPLIST_TAIL_P (custom)) { value = custom; @@ -5465,11 +5465,14 @@ minput_config_variable (MSymbol language, MSymbol name, MSymbol variable, } else { - plist = MPLIST_PLIST (plist); /* (NAME nil VALUE) */ - plist = MPLIST_NEXT (plist); /* ([nil VALUE]) */ - if (! MPLIST_TAIL_P (plist)) - return 0; - mplist_set (plist, Mnil ,NULL); + if (no_custom) + mplist__pop_unref (plist); + else + { + plist = MPLIST_PLIST (plist); /* (NAME nil VALUE) */ + plist = MPLIST_NEXT (plist); /* ([nil VALUE]) */ + mplist_set (plist, Mnil ,NULL); + } } } else -- 1.7.10.4