tags 226500 + patch
thanks
# HG changeset patch
# User Christoph Berg <[EMAIL PROTECTED]>
# Date 1174860003 -7200
# Node ID a9ce9fc0185bb9afff31ee571a120134d688b0f4
# Parent 82d3e0a90f91a2c41b72d14903c0196bfd7c06e3
Use ~/.muttrc as default for alias_file as the documentation claims if there is
no user muttrc found. Document that default is actually the used muttrc.
(Closes Debian #226500.)
diff -r 82d3e0a90f91 -r a9ce9fc0185b init.c
--- a/init.c Sat Mar 24 18:05:25 2007 +0100
+++ b/init.c Mon Mar 26 00:00:03 2007 +0200
@@ -2967,7 +2967,9 @@ void mutt_init (int skip_sys_rc, LIST *c
snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc-%s",
NONULL(Homedir), MUTT_VERSION);
if (access(buffer, F_OK) == -1)
snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc", NONULL(Homedir));
-
+ if (access(buffer, F_OK) == -1) /* default to .muttrc for alias_file */
+ snprintf (buffer, sizeof(buffer), "%s/.muttrc", NONULL(Homedir));
+
default_rc = 1;
Muttrc = safe_strdup (buffer);
}
diff -r 82d3e0a90f91 -r a9ce9fc0185b init.h
--- a/init.h Sat Mar 24 18:05:25 2007 +0100
+++ b/init.h Mon Mar 26 00:00:03 2007 +0200
@@ -107,6 +107,9 @@ struct option_t MuttVars[] = {
** .pp
** \fBNote:\fP Mutt will not automatically source this file; you must
** explicitly use the ``$source'' command for it to be executed.
+ ** .pp
+ ** The default for this option is the currently used muttrc file, or
+ ** ``~/.muttrc'' if no user muttrc was found.
*/
{ "alias_format", DT_STR, R_NONE, UL &AliasFmt, UL "%4n %2f %t %-10a
%r" },
/*
