[continued from previous message]

! init_defaults(global ? READ_FLAG_GLOBAL_ONLY : 0);

while ((c = ELM_GETOPT(argc, argv, OPTION_LETTERS)) != EOF) {
switch(c) {
--- 68,84 ----
}
optind = 1; /* Reset scanning */

locale_init();

REGHELPER_INIT(argv[0]);
+
+ read_flags = global ? READ_FLAG_GLOBAL_ONLY : 0;

user_init();

! init_addrlib(read_flags);
! init_aliaslib(read_flags);
! init_defaults(read_flags);

while ((c = ELM_GETOPT(argc, argv, OPTION_LETTERS)) != EOF) {
switch(c) {
***************
*** 163,171 ****
#endif

if (!global)
! read_rc_file(0);
else
! post_init_check(0);

if (optind < argc) {
int errcount = 0;
--- 166,174 ----
#endif

if (!global)
! read_rc_file(read_flags);
else
! post_init_check(read_flags);

if (optind < argc) {
int errcount = 0;
Index: elmME+.2.5.alpha49-cvs/utils/elmbindata.c
*** elmME+.2.5.alpha48/utils/elmbindata.c Sun Jun 18 20:46:54 2017
--- elmME+.2.5.alpha49-cvs/utils/elmbindata.c Fri Dec 21 13:21:43 2018 ***************
*** 1,7 ****
! static char rcsid[] = "@(#)$Id: elmbindata.c,v 2.8