storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 03945] Re: application/xhtml+xml support

Browse Source 
* Makefile.in (ETC_DIR): added
	(CONF_DIR): added
	(DEFS): add CONF_DIR
	(MAKE_ARGS): add CONF_DIR
* config.h.in (SYS_MAILCAP): use CONF_DIR
	(SYS_URIMETHODMAP): use CONF_DIR
* func.c (sys_current_keymap_file): added
	(interpret_keymap): added
	(initKeymap): use interpret_keymap
	(interpret_mouse_action): added
	(initMouseAction): use interpret_mouse_action
* indep.c (w3m_conf_dir): added
* indep.h (w3m_conf_dir): added
* menu.c (interpret_menu): added
	(initMenu): use interpret_menu
* proto.h (confFile): added
* rc.c (init_rc): read config file by interpret_rc
	(confFile): added
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2003-07-26 17:16:24 +00:00
parent e6c62de50c
commit c913794f0c
9 changed files with 140 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rc.c
View File

@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.84 2003/04/08 16:01:40 ukai Exp $ */
/* $Id: rc.c,v 1.85 2003/07/26 17:16:24 ukai Exp $ */
/*
* Initialization file etc.
*/
@@ -1397,6 +1397,10 @@ init_rc(void)
interpret_rc(f);
fclose(f);
}
if ((f = fopen(confFile(CONFIG_FILE), "rt")) != NULL) {
interpret_rc(f);
fclose(f);
}
if ((f = fopen(config_file, "rt")) != NULL) {
interpret_rc(f);
fclose(f);
@@ -1584,6 +1588,12 @@ etcFile(char *base)
return expandPath(Strnew_m_charp(w3m_etc_dir(), "/", base, NULL)->ptr);
}
char *
confFile(char *base)
{
return expandPath(Strnew_m_charp(w3m_conf_dir(), "/", base, NULL)->ptr);
}
#ifndef USE_HELP_CGI
char *
helpFile(char *base)