[continued from previous message]

! sizeof hostname, NULL_TAILCOND },
{"hpkeypad", ZZZ_DT_SYN("keypad"), ZZZ_TAIL },
{"hpsoftkeys", ZZZ_DT_SYN("softkeys"), ZZZ_TAIL },
#ifdef REMOTE_MBX
{"imap-charset", ZZZ_DT_STR(raw_imap_charset),
! sizeof raw_imap_charset, NULL_TAILCOND },
{"imap-connection-cache", ZZZ_DT_BOL(&IMAP_connection_cache), ZZZ_TAIL },
{"imap-dir-sortby", ZZZ_DT_SORT(&imap_dir_sortby), ZZZ_TAIL },
{"imap-fast-lookup", ZZZ_DT_BOL(&imap_fast_lookup), ZZZ_TAIL },
***************
*** 531,548 ****
{"iso646-charsets", ZZZ_DT_OBS0, ZZZ_TAIL },
{"keep", ZZZ_DT_SYN("keepempty"), ZZZ_TAIL },
{"keepempty", ZZZ_DT_BOL(&keep_empty_files), ZZZ_TAIL },
! {"keeppassfor", ZZZ_DT_NUM(&pgp_keeppassfor), 0, &use_PGP },
{"keypad", ZZZ_DT_OBS0, ZZZ_TAIL },
{"local-dir-sortby", ZZZ_DT_SORT(&local_dir_sortby), ZZZ_TAIL },
{"local-fast-lookup", ZZZ_DT_BOL(&local_fast_lookup), ZZZ_TAIL },
{"local-fs-charset", ZZZ_DT_STR(raw_local_fs_charset),
! sizeof raw_local_fs_charset, NULL },
#ifdef PIDCHECK
{"local-lockfile-pidcheck",
ZZZ_DT_ENUM_(FL_SYS,&local_lockfile_pidcheck), ZZZ_TAIL },
#endif
{"local-sessionlock-dir", ZZZ_DT_STR_(FL_SYS,local_sessionlock_dir),
! sizeof local_sessionlock_dir, NULL },
{"local-sessionlock-use-home",
ZZZ_DT_ENUM_(FL_SYS,&local_sessionlock_use_home), ZZZ_TAIL },
#if defined(WCHAR) && defined(__STDC_ISO_10646__)
--- 546,563 ----
{"iso646-charsets", ZZZ_DT_OBS0, ZZZ_TAIL },
{"keep", ZZZ_DT_SYN("keepempty"), ZZZ_TAIL },
{"keepempty", ZZZ_DT_BOL(&keep_empty_files), ZZZ_TAIL },
! {"keeppassfor", ZZZ_DT_NUM(&pgp_keeppassfor), 0, TAILCOND_INT(&use_PGP) },
{"keypad", ZZZ_DT_OBS0, ZZZ_TAIL },
{"local-dir-sortby", ZZZ_DT_SORT(&local_dir_sortby), ZZZ_TAIL },
{"local-fast-lookup", ZZZ_DT_BOL(&local_fast_lookup), ZZZ_TAIL },
{"local-fs-charset", ZZZ_DT_STR(raw_local_fs_charset),
! sizeof raw_local_fs_charset, NULL_TAILCOND },
#ifdef PIDCHECK
{"local-lockfile-pidcheck",
ZZZ_DT_ENUM_(FL_SYS,&local_lockfile_pidcheck), ZZZ_TAIL },
#endif
{"local-sessionlock-dir", ZZZ_DT_STR_(FL_SYS,local_sessionlock_dir),
! sizeof loc