On Tue, Apr 26, 2016 at 09:54:48AM -0700, Kevin J. McCarthy wrote: > On Mon, Apr 25, 2016 at 08:19:37PM -0500, Derek Martin wrote: > > Well, to be fair, M_ is a pretty crappy prefix to use in a project's > > macros. Not that using them in system header files is much better... > > I think you have a point. What I'd like to do, though, is include this > patch in the stable branch so I can push it with 1.6.1 (hopefully next > week).
I can probably make some time for it this weekend. FWIW, here's what
I've used to find the list of symbols which would need to change (run
in the root of the mutt-1.6 source tree):
$ find . -name "*.[ch]" -exec grep -Ro '\WM_\w\+' {} \; |sed 's/^\W*//' |sort
-u > symbols
$ wc -l symbols
245 symbols
The mutt source needs to be checked for the modified versions of each
of those symbols (which I will do). It should be only slightly harder
to write a script that does that, and then only slightly harder still
to do the actual find and replace. But I'll wait for further
discussion before I do that, and if I find conflicts I won't proceed
without discussion.
And the list, should anyone like to look it over:
$ cat symbols
M_ACCOUNTHOOK
M_ACCT_LOGIN
M_ACCT_PASS
M_ACCT_PORT
M_ACCT_SSL
M_ACCT_TYPE_IMAP
M_ACCT_TYPE_NONE
M_ACCT_TYPE_POP
M_ACCT_TYPE_SMTP
M_ACCT_USER
M_ACL_ADMIN
M_ACL_CREATE
M_ACL_DELETE
M_ACL_DELMX
M_ACL_EXPUNGE
M_ACL_INSERT
M_ACL_LOOKUP
M_ACL_POST
M_ACL_READ
M_ACL_SEEN
M_ACL_WRITE
M_ADDRESS
M_ADD_FROM
M_ALIAS
M_ALL
M_AND
M_APPEND
M_ASKNO
M_ASKYES
M_AS_TEXT
M_AUTOVIEW
M_BODY
M_BUFFY
M_CC
M_CHARCONV
M_CHARSETHOOK
M_CLEAR
M_CMD
M_CM_CHARCONV
M_CM_DECODE
M_CM_DECODE_CRYPT
M_CM_DECODE_PGP
M_CM_DECODE_SMIME
M_CM_DISPLAY
M_CM_NOHEADER
M_CM_PREFIX
M_CM_PRINTING
M_CM_REPLYING
M_CM_UPDATE
M_CM_VERIFY
M_CM_WEED
M_COLLAPSED
M_COMMAND
M_COMPOSE
M_COMPOSE_NOFREEHEADER
M_CONT
M_CRYPTHOOK
M_CRYPT_ENCRYPT
M_CRYPT_SIGN
M_CRYPT_VERIFIED
M_DATE
M_DATE_RECEIVED
M_DELETE
M_DELETED
M_DETACH_PROCESS
M_DISPLAY
M_DISPLAYFLAGS
M_DUPLICATED
M_EDIT
M_EFILE
M_ENTER_C
M_ENTER_S
M_EOL
M_EXPIRED
M_FCCHOOK
M_FILE
M_FIRSTDONE
M_FLAG
M_FLAGS
M_FOLDERHOOK
M_FORMAT_ARROWCURSOR
M_FORMAT_FORCESUBJ
M_FORMAT_INDEX
M_FORMAT_MAKEPRINT
M_FORMAT_NOFILTER
M_FORMAT_OPTIONAL
M_FORMAT_STAT_FILE
M_FORMAT_TREE
M_FROM
M_FULL_MSG
M_GENERATE_UIDVALIDITY
M_GROUP
M_HEADER
M_HIDE
M_HORMEL
M_ICONVHOOK
M_ICONV_HOOK_FROM
M_ICONV_HOOK_TO
M_ID
M_IGNORE
M_IMAP
M_IMAP_CONN_NONEW
M_IMAP_CONN_NOSELECT
M_LIMIT
M_LIST
M_LOCKED
M_MAILBOXES
M_MAILCAP
M_MAILDIR
M_MATCH_FULL_ADDRESS
M_MAXRANGE
M_MBOX
M_MBOXHOOK
M_MESSAGE
M_MESSAGEHOOK
M_MH
M_MIMEATTACH
M_MMDF
M_MODEFMT
M_NEW
M_NEWFOLDER
M_NEW_MAIL
M_NEW_SOCKET
M_NEW_SSL_SOCKET
M_NO
M_NONE
M_NOSHOW
M_NOSORT
M_NOSPAM
M_NOSYSRC
M_OLD
M_OR
M_OS
M_PAGER_ATTACHMENT
M_PAGER_MARKER
M_PAGER_MESSAGE
M_PAGER_NOWRAP
M_PAGER_NSKIP
M_PAGER_RETWINCH
M_PARTS_TOPLEVEL
M_PASS
M_PATTERN
M_PDR_ABSOLUTE
M_PDR_DONE
M_PDR_ERROR
M_PDR_ERRORDONE
M_PDR_MINUS
M_PDR_NONE
M_PDR_PLUS
M_PDR_WINDOW
M_PENDINGPREFIX
M_PERSONAL_FROM
M_PERSONAL_RECIP
M_PGP_KEY
M_POP
M_PRINT
M_PRINTING
M_PROGRESS_MSG
M_PROGRESS_SIZE
M_QUIET
M_READ
M_READONLY
M_RECIPIENT
M_REDRAW_INIT
M_REDRAW_LINE
M_REFERENCE
M_REGULAR
M_REOPENED
M_REPLIED
M_REPLYHOOK
M_REPLYING
M_RO
M_SASL_MAXBUF
M_SAVEHOOK
M_SAVE_APPEND
M_SAVE_OVERWRITE
M_SCORE
M_SEARCH
M_SEARCH_DOWN
M_SEARCH_UP
M_SELECT
M_SEL_BUFFY
M_SEL_FOLDER
M_SEL_MULTI
M_SEND2HOOK
M_SENDER
M_SENDHOOK
M_SET_DRAFT
M_SET_INV
M_SET_RESET
M_SET_UNSET
M_SHOW
M_SHOWCOLOR
M_SHOWFLAT
M_SIZE
M_SOCK_LOG_CMD
M_SOCK_LOG_FULL
M_SOCK_LOG_HDR
M_SPAM
M_SUBJECT
M_SUBSCRIBED_LIST
M_SUPERSEDED
M_TAG
M_THREAD
M_THREAD_COLLAPSE
M_THREAD_GET_HIDDEN
M_THREAD_NEXT_UNREAD
M_THREAD_UNCOLLAPSE
M_THREAD_UNREAD
M_TO
M_TOKEN_COMMENT
M_TOKEN_CONDENSE
M_TOKEN_EQUAL
M_TOKEN_PATTERN
M_TOKEN_QUOTE
M_TOKEN_SEMICOLON
M_TOKEN_SPACE
M_TREE
M_TREE_
M_TREE_BTEE
M_TREE_EQUALS
M_TREE_HIDDEN
M_TREE_HLINE
M_TREE_LLCORNER
M_TREE_LTEE
M_TREE_MAX
M_TREE_MISSING
M_TREE_RARROW
M_TREE_SPACE
M_TREE_STAR
M_TREE_TTEE
M_TREE_ULCORNER
M_TREE_VLINE
M_TYPES
M_UNDELETE
M_UNGROUP
M_UNMAILBOXES
M_UNREAD
M_UNREFERENCED
M_UNTAG
M_VERIFY
M_WEED
M_WHOLE_MSG
M_XLABEL
M_YES
--
Derek D. Martin http://www.pizzashack.org/ GPG Key ID: 0xDFBEAD02
-=-=-=-=-
This message is posted from an invalid address. Replying to it will result in
undeliverable mail due to spam prevention. Sorry for the inconvenience.
pgpQX2qjPj1Wa.pgp
Description: PGP signature
