Hi Derek,
On Sun, May 08, 2016 at 12:58:27PM -0500, Derek Martin wrote:
> Finally got around to this. The patch is obviously quite long; I
> suppose there's nothing to be done about that.
You could make a first patch where you replace the enum/defines with the
new symbols and alias the old symbols to the new ones. For that, you can
use #define or even do it in enums. Then, you could split your changes
into as many patches as you want. And finally, a cleanup patch where you
remove the old symbols M_*.
With defines:
enum
{
- M_ACCT_TYPE_NONE = 0,
- M_ACCT_TYPE_IMAP,
- M_ACCT_TYPE_POP,
- M_ACCT_TYPE_SMTP
+ MUTT_ACCT_TYPE_NONE = 0,
+ MUTT_ACCT_TYPE_IMAP,
+ MUTT_ACCT_TYPE_POP,
+ MUTT_ACCT_TYPE_SMTP
};
+#define M_ACCT_TYPE_NONE MUTT_ACCT_TYPE_NONE
+#define M_ACCT_TYPE_IMAP MUTT_ACCT_TYPE_IMAP
+#define M_ACCT_TYPE_POP MUTT_ACCT_TYPE_POP
+#define M_ACCT_TYPE_SMTP MUTT_ACCT_TYPE_SMTP
In enums:
enum
{
- M_ACCT_TYPE_NONE = 0,
- M_ACCT_TYPE_IMAP,
- M_ACCT_TYPE_POP,
- M_ACCT_TYPE_SMTP
+ MUTT_ACCT_TYPE_NONE = 0,
+ MUTT_ACCT_TYPE_IMAP,
+ MUTT_ACCT_TYPE_POP,
+ MUTT_ACCT_TYPE_SMTP,
+ M_ACCT_TYPE_NONE = MUTT_ACCT_TYPE_NONE,
+ M_ACCT_TYPE_IMAP = MUTT_ACCT_TYPE_IMAP,
+ M_ACCT_TYPE_POP = MUTT_ACCT_TYPE_POP,
+ M_ACCT_TYPE_SMTP = MUTT_ACCT_TYPE_SMTP,
};
Alternatively, you could change change each symbol one at a time. Well,
maybe each enum ou group of defines could be done in one commit, but it
doesn't make sense to change all M_* to MUTT_* in one giant commit. It
makes it impossible to sent it to the list or to review it thoroughly.
M_* and MUTT_* symbols would co-exist for a few patches, but I think
that's perfectly fine for a such a broad renaming.
As a sidenote, you linked a diff, not a patch, so there is no commit
message attached to the changes.
Thanks,
--
Damien
