mirror of
https://github.com/rkd77/elinks.git
synced 2025-02-02 15:09:23 -05:00
Merge with /srv/git/elinks.git
This commit is contained in:
commit
a1866332d3
@ -234,15 +234,16 @@ remote_cmd(struct option *o, unsigned char ***argv, int *argc)
|
||||
skip_space(arg);
|
||||
|
||||
argend = strchr(arg, ')');
|
||||
|
||||
if (!argend) {
|
||||
/* Just open any passed URLs in new tabs */
|
||||
remote_session_flags |= SES_REMOTE_NEW_TAB;
|
||||
return NULL;
|
||||
}
|
||||
skipback_whitespace(arg, argend);
|
||||
}
|
||||
|
||||
if (!argend) {
|
||||
/* Just open any passed URLs in new tabs */
|
||||
remote_session_flags |= SES_REMOTE_NEW_TAB;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
skipback_whitespace(arg, argend);
|
||||
|
||||
for (method = 0; remote_methods[method].name; method++) {
|
||||
unsigned char *name = remote_methods[method].name;
|
||||
|
||||
|
@ -503,10 +503,13 @@ static struct option_info config_options_info[] = {
|
||||
"threshold. (Then of course no other documents can be cached.)")),
|
||||
|
||||
/* FIXME: Write more. */
|
||||
INIT_OPT_INT("document.cache", N_("revalidation_Interval"),
|
||||
INIT_OPT_INT("document.cache", N_("Revalidation interval"),
|
||||
"revalidation_interval", 0, -1, 86400, -1,
|
||||
N_("Interval (in seconds) between a server is poked about changes in an\n"
|
||||
"already cached document.")),
|
||||
N_("Period that a cache entry is considered to be up-to-date.\n"
|
||||
"When a document is loaded and this interval has elapsed since the\n"
|
||||
"document was initially loaded or most recently revalidated\n"
|
||||
"with the server, the server will be checked in case there is\n"
|
||||
"a more up-to-date version of the document.")),
|
||||
|
||||
INIT_OPT_TREE("document.cache", N_("Memory cache"),
|
||||
"memory", 0,
|
||||
|
@ -159,9 +159,9 @@ _nl_init_domain_conv(struct loaded_l10nfile *domain_file,
|
||||
else {
|
||||
outcharset = getenv("OUTPUT_CHARSET");
|
||||
if (outcharset == NULL || outcharset[0] == '\0') {
|
||||
extern const unsigned char *locale_charset(void);
|
||||
extern const unsigned char *elinks_locale_charset(void);
|
||||
|
||||
outcharset = locale_charset();
|
||||
outcharset = elinks_locale_charset();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -193,13 +193,13 @@ get_charset_aliases(void)
|
||||
name. */
|
||||
|
||||
/* Should be in .h file, used in _nl_init_domain_conv() function. */
|
||||
const unsigned char *locale_charset(void);
|
||||
const unsigned char *elinks_locale_charset(void);
|
||||
|
||||
#ifdef STATIC
|
||||
STATIC
|
||||
#endif
|
||||
const unsigned char *
|
||||
locale_charset(void)
|
||||
elinks_locale_charset(void)
|
||||
{
|
||||
const unsigned char *codeset;
|
||||
const unsigned char *aliases;
|
||||
|
Loading…
x
Reference in New Issue
Block a user