projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base64 implementation from madmutt--.
[apps/madmutt.git]
/
init.c
diff --git
a/init.c
b/init.c
index
f318903
..
19d3b18
100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-1232,12
+1232,12
@@
static int source_rc (const char *rcfile, BUFFER * err)
p_clear(&token, 1);
while ((linebuf = mutt_read_line(linebuf, &buflen, f, &line)) != NULL) {
p_clear(&token, 1);
while ((linebuf = mutt_read_line(linebuf, &buflen, f, &line)) != NULL) {
- conv = ConfigCharset && (*ConfigCharset) &&
MChar
set.charset;
+ conv = ConfigCharset && (*ConfigCharset) &&
mod_c
set.charset;
if (conv) {
currentline = m_strdup(linebuf);
if (!currentline)
continue;
if (conv) {
currentline = m_strdup(linebuf);
if (!currentline)
continue;
- mutt_convert_string (¤tline, ConfigCharset,
MChar
set.charset, 0);
+ mutt_convert_string (¤tline, ConfigCharset,
mod_c
set.charset, 0);
}
else
currentline = linebuf;
}
else
currentline = linebuf;
@@
-1711,7
+1711,7
@@
void mutt_init (int skip_sys_rc, string_list_t * commands)
/* Get some information about the user */
if ((pw = getpwuid (getuid ()))) {
char rnbuf[STRING];
/* Get some information about the user */
if ((pw = getpwuid (getuid ()))) {
char rnbuf[STRING];
- mutt_gecos_name(rnbuf, sizeof(rnbuf), pw,
MC
ore.gecos_mask);
+ mutt_gecos_name(rnbuf, sizeof(rnbuf), pw,
mod_c
ore.gecos_mask);
Realname = m_strdup(rnbuf);
}
Realname = m_strdup(rnbuf);
}
@@
-1739,7
+1739,7
@@
void mutt_init (int skip_sys_rc, string_list_t * commands)
if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) {
Spoolfile = m_strdup(p);
} else {
if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) {
Spoolfile = m_strdup(p);
} else {
- mutt_concat_path(buffer, sizeof(buffer), NONULL(
MC
ore.homedir), MAILPATH);
+ mutt_concat_path(buffer, sizeof(buffer), NONULL(
mod_c
ore.homedir), MAILPATH);
Spoolfile = m_strdup(buffer);
}
Spoolfile = m_strdup(buffer);
}
@@
-1772,10
+1772,10
@@
void mutt_init (int skip_sys_rc, string_list_t * commands)
mutt_init_history ();
if (!Muttrc) {
mutt_init_history ();
if (!Muttrc) {
- snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL(
MC
ore.homedir));
+ snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL(
mod_c
ore.homedir));
if (access (buffer, F_OK) == -1)
snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
if (access (buffer, F_OK) == -1)
snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
- NONULL(
MC
ore.homedir));
+ NONULL(
mod_c
ore.homedir));
default_rc = 1;
Muttrc = m_strdup(buffer);
default_rc = 1;
Muttrc = m_strdup(buffer);
@@
-1826,9
+1826,9
@@
void mutt_init (int skip_sys_rc, string_list_t * commands)
}
/* LUA {{{ */
}
/* LUA {{{ */
- snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(
MC
ore.homedir));
+ snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(
mod_c
ore.homedir));
if (access(buffer, F_OK) < 0)
if (access(buffer, F_OK) < 0)
- snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(
MC
ore.homedir));
+ snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(
mod_c
ore.homedir));
if (!access(buffer, F_OK)) {
need_pause = luaM_wrap(mutt_error, luaM_dofile(buffer));
}
if (!access(buffer, F_OK)) {
need_pause = luaM_wrap(mutt_error, luaM_dofile(buffer));
}