X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=323d5ac2b5653c06eef3079411dc12f2644618f4;hp=e01ed4d090568b343c7d3f17b01b7845d9c62059;hb=16be8d10413bbcf822577afd4019d65aba7459e0;hpb=f2fdbd5e7c6bf27192a53de395ad79c281c4a766 diff --git a/init.c b/init.c index e01ed4d..323d5ac 100644 --- a/init.c +++ b/init.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include @@ -433,9 +433,7 @@ int query_quadoption2(int v, const char *prompt) return (v); default: - v = mutt_yesorno(prompt, (v == M_ASKYES)); - CLEARLINE (LINES - 1); - return (v); + return mutt_yesorno(prompt, (v == M_ASKYES)); } } @@ -449,12 +447,8 @@ int query_quadoption (int opt, const char *prompt) return (v); default: - v = mutt_yesorno (prompt, (v == M_ASKYES)); - CLEARLINE (LINES - 1); - return (v); + return mutt_yesorno(prompt, (v == M_ASKYES)); } - - /* not reached */ } /* always wise to do what someone else did before */ @@ -882,7 +876,7 @@ static void mutt_set_default(const char *name __attribute__ ((unused)), void* p, return; mutt_option_value(ptr->option, buf, sizeof(buf)); - if (m_strlen(ptr->init) == 0 && buf && *buf) + if (m_strlen(ptr->init) == 0 && *buf) ptr->init = m_strdup(buf); } @@ -941,18 +935,12 @@ static void mutt_restore_default (const char* name __attribute__ ((unused)), p_delete(&init); } - if (ptr->flags & R_INDEX) - set_option (OPTFORCEREDRAWINDEX); - if (ptr->flags & R_PAGER) - set_option (OPTFORCEREDRAWPAGER); - if (ptr->flags & R_RESORT_SUB) - set_option (OPTSORTSUBTHREADS); - if (ptr->flags & R_RESORT) - set_option (OPTNEEDRESORT); - if (ptr->flags & R_RESORT_INIT) - set_option (OPTRESORTINIT); - if (ptr->flags & R_TREE) - set_option (OPTREDRAWTREE); + set_option (OPTFORCEREDRAWINDEX); + set_option (OPTFORCEREDRAWPAGER); + set_option (OPTSORTSUBTHREADS); + set_option (OPTNEEDRESORT); + set_option (OPTRESORTINIT); + set_option (OPTREDRAWTREE); } static int check_num (const char* option, unsigned long p, @@ -1009,15 +997,6 @@ static const struct mapping_t* get_sortmap (struct option_t* option) { return (map); } -#define CHECK_PAGER \ - if ((CurrentMenu == MENU_PAGER) && \ - (!option || (option->flags & R_RESORT))) \ - { \ - snprintf (err->data, err->dsize, \ - _("Not available in this menu.")); \ - return (-1); \ - } - static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, BUFFER * err) { @@ -1082,7 +1061,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, set_option (OPTREDRAWTREE); return (0); } else { - CHECK_PAGER; mutt_restore_default (NULL, option, 1); } } @@ -1112,7 +1090,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, return 0; } - CHECK_PAGER; if (unset) unset_option (option->data); else if (inv) @@ -1130,7 +1107,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, /* XXX maybe we need to get unset into handlers? */ if (DTYPE (option->type) == DT_STR || DTYPE (option->type) == DT_PATH) { if (unset) { - CHECK_PAGER; p_delete((void **)(void *)&option->data); break; } @@ -1142,7 +1118,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, break; } - CHECK_PAGER; s->dptr++; mutt_extract_token (tmp, s, 0); if (!FuncTable[DTYPE (option->type)].opt_fromstr @@ -1157,7 +1132,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, } if (*s->dptr == '=') { - CHECK_PAGER; s->dptr++; mutt_extract_token (tmp, s, 0); if (ascii_strcasecmp ("yes", tmp->data) == 0) @@ -1191,18 +1165,12 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, break; } - if (option->flags & R_INDEX) - set_option (OPTFORCEREDRAWINDEX); - if (option->flags & R_PAGER) - set_option (OPTFORCEREDRAWPAGER); - if (option->flags & R_RESORT_SUB) - set_option (OPTSORTSUBTHREADS); - if (option->flags & R_RESORT) - set_option (OPTNEEDRESORT); - if (option->flags & R_RESORT_INIT) - set_option (OPTRESORTINIT); - if (option->flags & R_TREE) - set_option (OPTREDRAWTREE); + set_option (OPTFORCEREDRAWINDEX); + set_option (OPTFORCEREDRAWPAGER); + set_option (OPTSORTSUBTHREADS); + set_option (OPTNEEDRESORT); + set_option (OPTRESORTINIT); + set_option (OPTREDRAWTREE); } return (r); } @@ -1629,36 +1597,6 @@ int mutt_var_value_complete (char *buffer, ssize_t len, int pos) return 0; } -/* Implement the -Q command line flag */ -int mutt_query_variables (string_list_t * queries) -{ - string_list_t *p; - - char errbuff[STRING]; - char command[STRING]; - - BUFFER err, token; - - p_clear(&err, 1); - p_clear(&token, 1); - - err.data = errbuff; - err.dsize = sizeof(errbuff); - - for (p = queries; p; p = p->next) { - snprintf (command, sizeof(command), "set ?%s\n", p->data); - if (mutt_parse_rc_line (command, &token, &err) == -1) { - fprintf (stderr, "%s\n", err.data); - p_delete(&token.data); - return 1; - } - printf ("%s\n", err.data); - } - - p_delete(&token.data); - return 0; -} - static int mutt_execute_commands (string_list_t * p) { BUFFER err, token; @@ -1711,27 +1649,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) Realname = m_strdup(rnbuf); } -#ifdef USE_NNTP - { - FILE *f; - char *q; - - if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) { - buffer[0] = '\0'; - fgets (buffer, sizeof(buffer), f); - p = vskipspaces(buffer); - q = (char*)p; - while (*q && !isspace(*q)) - q++; - *q = '\0'; - NewsServer = m_strdup(p); - m_fclose(&f); - } - } - if ((p = getenv ("NNTPSERVER"))) - NewsServer = m_strdup(p); -#endif - if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) { Spoolfile = m_strdup(p); } else { @@ -1758,13 +1675,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) hash_map (ConfigOptions, mutt_restore_default, 0); CurrentMenu = MENU_MAIN; - -#ifdef HAVE_GETSID - /* Unset suspend by default if we're the session leader */ - if (getsid (0) == getpid ()) - unset_option (OPTSUSPEND); -#endif - mutt_init_history (); if (!Muttrc) { @@ -1867,26 +1777,3 @@ int mutt_get_hook_type (const char *name) return 0; } -/* dump out the value of all the variables we have */ -int mutt_dump_variables (int full) { - ssize_t i = 0; - - /* get all non-synonyms into list... */ - for (i = 0; MuttVars[i].option; i++) { - struct option_t *option = MuttVars + i; - char buf[LONG_STRING]; - - if (!full) { - mutt_option_value(option->option, buf, sizeof(buf)); - if (!m_strcmp(buf, option->init)) - continue; - } - - printf("set "); - FuncTable[DTYPE(option->type)].opt_tostr(buf, sizeof(buf), option); - printf ("%s\n", buf); - } - - printf ("\n# vi""m:set ft=muttrc:\n"); - return 0; -}