From 68d92974c5785799ffb24f6577ae030594f91b29 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Mon, 2 Apr 2007 01:16:41 +0200 Subject: [PATCH] move record as well (yeah, I'm a selfish bitch, I migrate things in my own folder-hooks first) Signed-off-by: Pierre Habouzit --- alias.cpkg | 16 ++++++++++++++-- globals.h | 1 - hook.c | 4 ++-- init.h | 11 ----------- lib-lua/lua-token.sh | 1 + muttlib.c | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/alias.cpkg b/alias.cpkg index 8823875..2efa1ef 100644 --- a/alias.cpkg +++ b/alias.cpkg @@ -65,7 +65,7 @@ rx_t *SubscribedLists = NULL, *UnSubscribedLists = NULL; ** \fBNote:\fP Madmutt will not automatically source this file; you must ** explicitly use the ``$source'' command for it to be executed. */ - path_t alias_file = m_strdup("~/.madmutt/aliases"); + path_t alias_file = m_strdup("~/.madmutt/aliases"); /* ** .pp @@ -74,7 +74,19 @@ rx_t *SubscribedLists = NULL, *UnSubscribedLists = NULL; ** assumed that filename is a shell command and input should be read from ** its stdout. */ - path_t signature = m_strdup("~/.signature"); + path_t signature = m_strdup("~/.signature"); + + /* + ** .pp + ** This specifies the file into which your outgoing messages should be + ** appended. (This is meant as the primary method for saving a copy of + ** your messages, but another way to do this is using the ``$my_hdr'' + ** command to create a \fTBcc:\fP header field with your email address in it.) + ** .pp + ** The value of \fI$$record\fP is overridden by the ``$$force_name'' and + ** ``$$save_name'' variables, and the ``$fcc-hook'' command. + */ + path_t record = NULL; void alternates(rx_t rx) { rx_list_remove(&UnAlternates, rx); diff --git a/globals.h b/globals.h index f015651..0519dfb 100644 --- a/globals.h +++ b/globals.h @@ -85,7 +85,6 @@ WHERE char *NntpUser; WHERE char *NntpPass; WHERE char *NewsRc; #endif -WHERE char *Outbox; WHERE char *Pager; WHERE char *PagerFmt; WHERE char *PipeSep; diff --git a/hook.c b/hook.c index 6b82917..7361bba 100644 --- a/hook.c +++ b/hook.c @@ -371,10 +371,10 @@ void mutt_select_fcc (char *path, ssize_t pathlen, HEADER * hdr) mutt_safe_path (buf, sizeof (buf), adr); mutt_concat_path(path, pathlen, NONULL(Maildir), buf); if (!option (OPTFORCENAME) && mx_access (path, W_OK) != 0) - m_strcpy(path, pathlen, NONULL(Outbox)); + m_strcpy(path, pathlen, NONULL(MAlias.record)); } else - m_strcpy(path, pathlen, NONULL(Outbox)); + m_strcpy(path, pathlen, NONULL(MAlias.record)); } mutt_pretty_mailbox (path); } diff --git a/init.h b/init.h index c74c94d..9133d82 100644 --- a/init.h +++ b/init.h @@ -2573,17 +2573,6 @@ struct option_t MuttVars[] = { ** Setting this variable to \fIyes\fP is not generally useful, and thus not ** recommended. */ - {"record", DT_PATH, R_NONE, UL &Outbox, ""}, - /* - ** .pp - ** This specifies the file into which your outgoing messages should be - ** appended. (This is meant as the primary method for saving a copy of - ** your messages, but another way to do this is using the ``$my_hdr'' - ** command to create a \fTBcc:\fP header field with your email address in it.) - ** .pp - ** The value of \fI$$record\fP is overridden by the ``$$force_name'' and - ** ``$$save_name'' variables, and the ``$fcc-hook'' command. - */ {"reply_regexp", DT_RX, R_INDEX|R_RESORT, UL &ReplyRegexp, "^(re([\\[0-9\\]+])*|aw):[ \t]*"}, /* ** .pp diff --git a/lib-lua/lua-token.sh b/lib-lua/lua-token.sh index 1692d05..e524119 100644 --- a/lib-lua/lua-token.sh +++ b/lib-lua/lua-token.sh @@ -136,6 +136,7 @@ exit 0 ## no ## operating_system ## quit +## record ## send_charset ## sendmail ## sendmail_wait diff --git a/muttlib.c b/muttlib.c index 48644d8..3f223a6 100644 --- a/muttlib.c +++ b/muttlib.c @@ -115,7 +115,7 @@ ssize_t _mutt_expand_path(char *buf, ssize_t len, const char *s, int rx) break; case '<': - m_strcpy(p, sizeof(p), Outbox); + m_strcpy(p, sizeof(p), MAlias.record); tail = s + 1; break; -- 2.20.1