From bd0d66a3d8e58a9049768bb098753d3ca5eb1de7 Mon Sep 17 00:00:00 2001 From: Floyd Anderson Date: Sun, 18 Mar 2018 16:14:52 +0100 Subject: [PATCH] opcodes.h: Sort opcodes --- opcodes.h | 93 +++++++++++++++++++++++++++---------------------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/opcodes.h b/opcodes.h index 0d1e18121..9e9f8a41f 100644 --- a/opcodes.h +++ b/opcodes.h @@ -28,24 +28,21 @@ // clang-format off #define OPS_CORE(_fmt) \ _fmt(OP_NULL, N_("null operation")) \ - _fmt(OP_SHOW_MESSAGES, N_("show messages")) \ - _fmt(OP_END_COND, N_("end of conditional execution (noop)")) \ + _fmt(OP_ATTACH_COLLAPSE, N_("toggle display of subparts")) \ _fmt(OP_ATTACH_VIEW_MAILCAP, N_("force viewing of attachment using mailcap")) \ _fmt(OP_ATTACH_VIEW_TEXT, N_("view attachment as text")) \ - _fmt(OP_ATTACH_COLLAPSE, N_("toggle display of subparts")) \ _fmt(OP_BOTTOM_PAGE, N_("move to the bottom of the page")) \ _fmt(OP_BOUNCE_MESSAGE, N_("remail a message to another user")) \ _fmt(OP_BROWSER_GOTO_FOLDER, N_("swap the current folder position with $folder if it exists")) \ _fmt(OP_BROWSER_NEW_FILE, N_("select a new file in this directory")) \ - _fmt(OP_BROWSER_VIEW_FILE, N_("view file")) \ - _fmt(OP_BROWSER_TELL, N_("display the currently selected file's name")) \ _fmt(OP_BROWSER_SUBSCRIBE, N_("subscribe to current mbox (IMAP/NNTP only)")) \ - _fmt(OP_BROWSER_UNSUBSCRIBE, N_("unsubscribe from current mbox (IMAP/NNTP only)")) \ + _fmt(OP_BROWSER_TELL, N_("display the currently selected file's name")) \ _fmt(OP_BROWSER_TOGGLE_LSUB, N_("toggle view all/subscribed mailboxes (IMAP only)")) \ + _fmt(OP_BROWSER_UNSUBSCRIBE, N_("unsubscribe from current mbox (IMAP/NNTP only)")) \ + _fmt(OP_BROWSER_VIEW_FILE, N_("view file")) \ _fmt(OP_BUFFY_LIST, N_("list mailboxes with new mail")) \ _fmt(OP_CATCHUP, N_("mark all articles in newsgroup as read")) \ _fmt(OP_CHANGE_DIRECTORY, N_("change directories")) \ - _fmt(OP_GOTO_PARENT, N_("go to parent directory")) \ _fmt(OP_CHECK_NEW, N_("check mailboxes for new mail")) \ _fmt(OP_COMPOSE_ATTACH_FILE, N_("attach file(s) to this message")) \ _fmt(OP_COMPOSE_ATTACH_MESSAGE, N_("attach message(s) to this message")) \ @@ -56,33 +53,32 @@ _fmt(OP_COMPOSE_EDIT_ENCODING, N_("edit attachment transfer-encoding")) \ _fmt(OP_COMPOSE_EDIT_FCC, N_("enter a file to save a copy of this message in")) \ _fmt(OP_COMPOSE_EDIT_FILE, N_("edit the file to be attached")) \ + _fmt(OP_COMPOSE_EDIT_FOLLOWUP_TO, N_("edit the Followup-To field")) \ _fmt(OP_COMPOSE_EDIT_FROM, N_("edit the from field")) \ _fmt(OP_COMPOSE_EDIT_HEADERS, N_("edit the message with headers")) \ _fmt(OP_COMPOSE_EDIT_MESSAGE, N_("edit the message")) \ _fmt(OP_COMPOSE_EDIT_MIME, N_("edit attachment using mailcap entry")) \ _fmt(OP_COMPOSE_EDIT_NEWSGROUPS, N_("edit the newsgroups list")) \ _fmt(OP_COMPOSE_EDIT_REPLY_TO, N_("edit the Reply-To field")) \ - _fmt(OP_COMPOSE_EDIT_FOLLOWUP_TO, N_("edit the Followup-To field")) \ - _fmt(OP_COMPOSE_EDIT_X_COMMENT_TO, N_("edit the X-Comment-To field")) \ _fmt(OP_COMPOSE_EDIT_SUBJECT, N_("edit the subject of this message")) \ _fmt(OP_COMPOSE_EDIT_TO, N_("edit the TO list")) \ - _fmt(OP_CREATE_MAILBOX, N_("create a new mailbox (IMAP only)")) \ - _fmt(OP_EDIT_TYPE, N_("edit attachment content type")) \ + _fmt(OP_COMPOSE_EDIT_X_COMMENT_TO, N_("edit the X-Comment-To field")) \ _fmt(OP_COMPOSE_GET_ATTACHMENT, N_("get a temporary copy of an attachment")) \ _fmt(OP_COMPOSE_ISPELL, N_("run ispell on the message")) \ _fmt(OP_COMPOSE_NEW_MIME, N_("compose new attachment using mailcap entry")) \ - _fmt(OP_COMPOSE_TOGGLE_RECODE, N_("toggle recoding of this attachment")) \ _fmt(OP_COMPOSE_POSTPONE_MESSAGE, N_("save this message to send later")) \ _fmt(OP_COMPOSE_RENAME_ATTACHMENT, N_("send attachment with a different name")) \ _fmt(OP_COMPOSE_RENAME_FILE, N_("rename/move an attached file")) \ - _fmt(OP_COMPOSE_TO_SENDER, N_("compose a new message to the sender")) \ _fmt(OP_COMPOSE_SEND_MESSAGE, N_("send the message")) \ _fmt(OP_COMPOSE_TOGGLE_DISPOSITION, N_("toggle disposition between inline/attachment")) \ + _fmt(OP_COMPOSE_TOGGLE_RECODE, N_("toggle recoding of this attachment")) \ _fmt(OP_COMPOSE_TOGGLE_UNLINK, N_("toggle whether to delete file after sending it")) \ + _fmt(OP_COMPOSE_TO_SENDER, N_("compose a new message to the sender")) \ _fmt(OP_COMPOSE_UPDATE_ENCODING, N_("update an attachment's encoding info")) \ _fmt(OP_COMPOSE_WRITE_MESSAGE, N_("write the message to a folder")) \ _fmt(OP_COPY_MESSAGE, N_("copy a message to a file/mailbox")) \ _fmt(OP_CREATE_ALIAS, N_("create an alias from a message sender")) \ + _fmt(OP_CREATE_MAILBOX, N_("create a new mailbox (IMAP only)")) \ _fmt(OP_CURRENT_BOTTOM, N_("move entry to bottom of screen")) \ _fmt(OP_CURRENT_MIDDLE, N_("move entry to middle of screen")) \ _fmt(OP_CURRENT_TOP, N_("move entry to top of screen")) \ @@ -95,32 +91,34 @@ _fmt(OP_DISPLAY_ADDRESS, N_("display full address of sender")) \ _fmt(OP_DISPLAY_HEADERS, N_("display message and toggle header weeding")) \ _fmt(OP_DISPLAY_MESSAGE, N_("display a message")) \ - _fmt(OP_EDIT_LABEL, N_("add, change, or delete a message's label")) \ - _fmt(OP_EDIT_RAW_MESSAGE, N_("edit the raw message (edit and edit-raw-message are synonyms)")) \ - _fmt(OP_EDIT_OR_VIEW_RAW_MESSAGE, N_("edit the raw message if the mailbox is not read-only, otherwise view it")) \ _fmt(OP_EDITOR_BACKSPACE, N_("delete the char in front of the cursor")) \ _fmt(OP_EDITOR_BACKWARD_CHAR, N_("move the cursor one character to the left")) \ _fmt(OP_EDITOR_BACKWARD_WORD, N_("move the cursor to the beginning of the word")) \ _fmt(OP_EDITOR_BOL, N_("jump to the beginning of the line")) \ _fmt(OP_EDITOR_BUFFY_CYCLE, N_("cycle among incoming mailboxes")) \ + _fmt(OP_EDITOR_CAPITALIZE_WORD, N_("capitalize the word")) \ _fmt(OP_EDITOR_COMPLETE, N_("complete filename or alias")) \ _fmt(OP_EDITOR_COMPLETE_QUERY, N_("complete address with query")) \ _fmt(OP_EDITOR_DELETE_CHAR, N_("delete the char under the cursor")) \ + _fmt(OP_EDITOR_DOWNCASE_WORD, N_("convert the word to lower case")) \ _fmt(OP_EDITOR_EOL, N_("jump to the end of the line")) \ _fmt(OP_EDITOR_FORWARD_CHAR, N_("move the cursor one character to the right")) \ _fmt(OP_EDITOR_FORWARD_WORD, N_("move the cursor to the end of the word")) \ _fmt(OP_EDITOR_HISTORY_DOWN, N_("scroll down through the history list")) \ - _fmt(OP_EDITOR_HISTORY_UP, N_("scroll up through the history list")) \ _fmt(OP_EDITOR_HISTORY_SEARCH, N_("search through the history list")) \ + _fmt(OP_EDITOR_HISTORY_UP, N_("scroll up through the history list")) \ _fmt(OP_EDITOR_KILL_EOL, N_("delete chars from cursor to end of line")) \ _fmt(OP_EDITOR_KILL_EOW, N_("delete chars from the cursor to the end of the word")) \ _fmt(OP_EDITOR_KILL_LINE, N_("delete all chars on the line")) \ _fmt(OP_EDITOR_KILL_WORD, N_("delete the word in front of the cursor")) \ _fmt(OP_EDITOR_QUOTE_CHAR, N_("quote the next typed key")) \ _fmt(OP_EDITOR_TRANSPOSE_CHARS, N_("transpose character under cursor with previous")) \ - _fmt(OP_EDITOR_CAPITALIZE_WORD, N_("capitalize the word")) \ - _fmt(OP_EDITOR_DOWNCASE_WORD, N_("convert the word to lower case")) \ _fmt(OP_EDITOR_UPCASE_WORD, N_("convert the word to upper case")) \ + _fmt(OP_EDIT_LABEL, N_("add, change, or delete a message's label")) \ + _fmt(OP_EDIT_OR_VIEW_RAW_MESSAGE, N_("edit the raw message if the mailbox is not read-only, otherwise view it")) \ + _fmt(OP_EDIT_RAW_MESSAGE, N_("edit the raw message (edit and edit-raw-message are synonyms)")) \ + _fmt(OP_EDIT_TYPE, N_("edit attachment content type")) \ + _fmt(OP_END_COND, N_("end of conditional execution (noop)")) \ _fmt(OP_ENTER_COMMAND, N_("enter a neomuttrc command")) \ _fmt(OP_ENTER_MASK, N_("enter a file mask")) \ _fmt(OP_EXIT, N_("exit this menu")) \ @@ -128,18 +126,20 @@ _fmt(OP_FIRST_ENTRY, N_("move to the first entry")) \ _fmt(OP_FLAG_MESSAGE, N_("toggle a message's 'important' flag")) \ _fmt(OP_FOLLOWUP, N_("followup to newsgroup")) \ - _fmt(OP_FORWARD_TO_GROUP, N_("forward to newsgroup")) \ _fmt(OP_FORWARD_MESSAGE, N_("forward a message with comments")) \ + _fmt(OP_FORWARD_TO_GROUP, N_("forward to newsgroup")) \ _fmt(OP_GENERIC_SELECT_ENTRY, N_("select the current entry")) \ _fmt(OP_GET_CHILDREN, N_("get all children of the current message")) \ _fmt(OP_GET_MESSAGE, N_("get message with Message-Id")) \ _fmt(OP_GET_PARENT, N_("get parent of the current message")) \ + _fmt(OP_GOTO_PARENT, N_("go to parent directory")) \ _fmt(OP_GROUP_REPLY, N_("reply to all recipients")) \ _fmt(OP_HALF_DOWN, N_("scroll down 1/2 page")) \ _fmt(OP_HALF_UP, N_("scroll up 1/2 page")) \ _fmt(OP_HELP, N_("this screen")) \ _fmt(OP_JUMP, N_("jump to an index number")) \ _fmt(OP_LAST_ENTRY, N_("move to the last entry")) \ + _fmt(OP_LIMIT_CURRENT_THREAD, N_("limit view to current thread")) \ _fmt(OP_LIST_REPLY, N_("reply to specified mailing list")) \ _fmt(OP_LOAD_ACTIVE, N_("load list of all newsgroups from NNTP server")) \ _fmt(OP_MACRO, N_("execute a macro")) \ @@ -150,33 +150,38 @@ _fmt(OP_MAIN_CHANGE_GROUP, N_("open a different newsgroup")) \ _fmt(OP_MAIN_CHANGE_GROUP_READONLY, N_("open a different newsgroup in read only mode")) \ _fmt(OP_MAIN_CLEAR_FLAG, N_("clear a status flag from a message")) \ + _fmt(OP_MAIN_COLLAPSE_ALL, N_("collapse/uncollapse all threads")) \ + _fmt(OP_MAIN_COLLAPSE_THREAD, N_("collapse/uncollapse current thread")) \ _fmt(OP_MAIN_DELETE_PATTERN, N_("delete messages matching a pattern")) \ + _fmt(OP_MAIN_FETCH_MAIL, N_("retrieve mail from POP server")) \ _fmt(OP_MAIN_IMAP_FETCH, N_("force retrieval of mail from IMAP server")) \ _fmt(OP_MAIN_IMAP_LOGOUT_ALL, N_("logout from all IMAP servers")) \ - _fmt(OP_MAIN_FETCH_MAIL, N_("retrieve mail from POP server")) \ _fmt(OP_MAIN_LIMIT, N_("show only messages matching a pattern")) \ _fmt(OP_MAIN_LINK_THREADS, N_("link tagged message to the current one")) \ - _fmt(OP_MAIN_NEXT_UNREAD_MAILBOX, N_("open next mailbox with new mail")) \ + _fmt(OP_MAIN_MODIFY_TAGS, N_("modify (notmuch/imap) tags")) \ + _fmt(OP_MAIN_MODIFY_TAGS_THEN_HIDE, N_("modify (notmuch/imap) tags and then hide message")) \ _fmt(OP_MAIN_NEXT_NEW, N_("jump to the next new message")) \ _fmt(OP_MAIN_NEXT_NEW_THEN_UNREAD, N_("jump to the next new or unread message")) \ _fmt(OP_MAIN_NEXT_SUBTHREAD, N_("jump to the next subthread")) \ _fmt(OP_MAIN_NEXT_THREAD, N_("jump to the next thread")) \ _fmt(OP_MAIN_NEXT_UNDELETED, N_("move to the next undeleted message")) \ _fmt(OP_MAIN_NEXT_UNREAD, N_("jump to the next unread message")) \ + _fmt(OP_MAIN_NEXT_UNREAD_MAILBOX, N_("open next mailbox with new mail")) \ _fmt(OP_MAIN_PARENT_MESSAGE, N_("jump to parent message in thread")) \ - _fmt(OP_MAIN_PREV_THREAD, N_("jump to previous thread")) \ - _fmt(OP_MAIN_PREV_SUBTHREAD, N_("jump to previous subthread")) \ - _fmt(OP_MAIN_PREV_UNDELETED, N_("move to the previous undeleted message")) \ _fmt(OP_MAIN_PREV_NEW, N_("jump to the previous new message")) \ _fmt(OP_MAIN_PREV_NEW_THEN_UNREAD, N_("jump to the previous new or unread message")) \ + _fmt(OP_MAIN_PREV_SUBTHREAD, N_("jump to previous subthread")) \ + _fmt(OP_MAIN_PREV_THREAD, N_("jump to previous thread")) \ + _fmt(OP_MAIN_PREV_UNDELETED, N_("move to the previous undeleted message")) \ _fmt(OP_MAIN_PREV_UNREAD, N_("jump to the previous unread message")) \ - _fmt(OP_MAIN_READ_THREAD, N_("mark the current thread as read")) \ + _fmt(OP_MAIN_QUASI_DELETE, N_("delete from NeoMutt, don't touch on disk")) \ _fmt(OP_MAIN_READ_SUBTHREAD, N_("mark the current subthread as read")) \ + _fmt(OP_MAIN_READ_THREAD, N_("mark the current thread as read")) \ _fmt(OP_MAIN_ROOT_MESSAGE, N_("jump to root message in thread")) \ _fmt(OP_MAIN_SET_FLAG, N_("set a status flag on a message")) \ + _fmt(OP_MAIN_SHOW_LIMIT, N_("show currently active limit pattern")) \ _fmt(OP_MAIN_SYNC_FOLDER, N_("save changes to mailbox")) \ _fmt(OP_MAIN_TAG_PATTERN, N_("tag messages matching a pattern")) \ - _fmt(OP_MAIN_QUASI_DELETE, N_("delete from NeoMutt, don't touch on disk")) \ _fmt(OP_MAIN_UNDELETE_PATTERN, N_("undelete messages matching a pattern")) \ _fmt(OP_MAIN_UNTAG_PATTERN, N_("untag messages matching a pattern")) \ _fmt(OP_MARK_MSG, N_("create a hotkey macro for the current message")) \ @@ -208,11 +213,12 @@ _fmt(OP_RESEND, N_("use the current message as a template for a new one")) \ _fmt(OP_SAVE, N_("save message/attachment to a mailbox/file")) \ _fmt(OP_SEARCH, N_("search for a regular expression")) \ - _fmt(OP_SEARCH_REVERSE, N_("search backwards for a regular expression")) \ _fmt(OP_SEARCH_NEXT, N_("search for next match")) \ _fmt(OP_SEARCH_OPPOSITE, N_("search for next match in opposite direction")) \ + _fmt(OP_SEARCH_REVERSE, N_("search backwards for a regular expression")) \ _fmt(OP_SEARCH_TOGGLE, N_("toggle search pattern coloring")) \ _fmt(OP_SHELL_ESCAPE, N_("invoke a command in a subshell")) \ + _fmt(OP_SHOW_MESSAGES, N_("show messages")) \ _fmt(OP_SORT, N_("sort messages")) \ _fmt(OP_SORT_REVERSE, N_("sort messages in reverse order")) \ _fmt(OP_SUBSCRIBE_PATTERN, N_("subscribe to newsgroups matching a pattern")) \ @@ -221,43 +227,37 @@ _fmt(OP_TAG_PREFIX_COND, N_("apply next function ONLY to tagged messages")) \ _fmt(OP_TAG_SUBTHREAD, N_("tag the current subthread")) \ _fmt(OP_TAG_THREAD, N_("tag the current thread")) \ + _fmt(OP_TOGGLE_MAILBOXES, N_("toggle whether to browse mailboxes or all files")) \ _fmt(OP_TOGGLE_NEW, N_("toggle a message's 'new' flag")) \ _fmt(OP_TOGGLE_READ, N_("toggle view of read messages")) \ _fmt(OP_TOGGLE_WRITE, N_("toggle whether the mailbox will be rewritten")) \ - _fmt(OP_TOGGLE_MAILBOXES, N_("toggle whether to browse mailboxes or all files")) \ _fmt(OP_TOP_PAGE, N_("move to the top of the page")) \ _fmt(OP_UNCATCHUP, N_("mark all articles in newsgroup as unread")) \ _fmt(OP_UNDELETE, N_("undelete the current entry")) \ - _fmt(OP_UNDELETE_THREAD, N_("undelete all messages in thread")) \ _fmt(OP_UNDELETE_SUBTHREAD, N_("undelete all messages in subthread")) \ + _fmt(OP_UNDELETE_THREAD, N_("undelete all messages in thread")) \ _fmt(OP_UNSUBSCRIBE_PATTERN, N_("unsubscribe from newsgroups matching a pattern")) \ _fmt(OP_VERSION, N_("show the NeoMutt version number and date")) \ _fmt(OP_VIEW_ATTACH, N_("view attachment using mailcap entry if necessary")) \ _fmt(OP_VIEW_ATTACHMENTS, N_("show MIME attachments")) \ _fmt(OP_VIEW_RAW_MESSAGE, N_("show the raw message")) \ _fmt(OP_WHAT_KEY, N_("display the keycode for a key press")) \ - _fmt(OP_LIMIT_CURRENT_THREAD, N_("limit view to current thread")) \ - _fmt(OP_MAIN_SHOW_LIMIT, N_("show currently active limit pattern")) \ - _fmt(OP_MAIN_COLLAPSE_THREAD, N_("collapse/uncollapse current thread")) \ - _fmt(OP_MAIN_COLLAPSE_ALL, N_("collapse/uncollapse all threads")) \ - _fmt(OP_MAIN_MODIFY_TAGS, N_("modify (notmuch/imap) tags")) \ - _fmt(OP_MAIN_MODIFY_TAGS_THEN_HIDE, N_("modify (notmuch/imap) tags and then hide message")) \ #define OPS_CRYPT(_fmt) \ - _fmt(OP_DECRYPT_SAVE, N_("make decrypted copy and delete")) \ _fmt(OP_DECRYPT_COPY, N_("make decrypted copy")) \ - _fmt(OP_FORGET_PASSPHRASE, N_("wipe passphrase(s) from memory")) \ + _fmt(OP_DECRYPT_SAVE, N_("make decrypted copy and delete")) \ _fmt(OP_EXTRACT_KEYS, N_("extract supported public keys")) \ + _fmt(OP_FORGET_PASSPHRASE, N_("wipe passphrase(s) from memory")) \ #ifdef MIXMASTER #define OPS_MIX(_fmt) \ - _fmt(OP_MIX_USE, N_("accept the chain constructed")) \ + _fmt(OP_COMPOSE_MIX, N_("send the message through a mixmaster remailer chain")) \ _fmt(OP_MIX_APPEND, N_("append a remailer to the chain")) \ - _fmt(OP_MIX_INSERT, N_("insert a remailer into the chain")) \ - _fmt(OP_MIX_DELETE, N_("delete a remailer from the chain")) \ - _fmt(OP_MIX_CHAIN_PREV, N_("select the previous element of the chain")) \ _fmt(OP_MIX_CHAIN_NEXT, N_("select the next element of the chain")) \ - _fmt(OP_COMPOSE_MIX, N_("send the message through a mixmaster remailer chain")) + _fmt(OP_MIX_CHAIN_PREV, N_("select the previous element of the chain")) \ + _fmt(OP_MIX_DELETE, N_("delete a remailer from the chain")) \ + _fmt(OP_MIX_INSERT, N_("insert a remailer into the chain")) \ + _fmt(OP_MIX_USE, N_("accept the chain constructed")) #else #define OPS_MIX(_) #endif @@ -265,21 +265,21 @@ #ifdef USE_NOTMUCH #define OPS_NOTMUCH(_fmt) \ _fmt(OP_MAIN_CHANGE_VFOLDER, N_("open a different virtual folder")) \ + _fmt(OP_MAIN_ENTIRE_THREAD, N_("read entire thread of the current message")) \ _fmt(OP_MAIN_VFOLDER_FROM_QUERY, N_("generate virtual folder from query")) \ - _fmt(OP_MAIN_WINDOWED_VFOLDER_FORWARD, N_("shifts virtual folder time window forwards")) \ _fmt(OP_MAIN_WINDOWED_VFOLDER_BACKWARD, N_("shifts virtual folder time window backwards")) \ - _fmt(OP_MAIN_ENTIRE_THREAD, N_("read entire thread of the current message")) + _fmt(OP_MAIN_WINDOWED_VFOLDER_FORWARD, N_("shifts virtual folder time window forwards")) #else #define OPS_NOTMUCH(_) #endif #define OPS_PGP(_fmt) \ + _fmt(OP_CHECK_TRADITIONAL, N_("check for classic PGP")) \ _fmt(OP_COMPOSE_ATTACH_KEY, N_("attach a PGP public key")) \ _fmt(OP_COMPOSE_PGP_MENU, N_("show PGP options")) \ _fmt(OP_MAIL_KEY, N_("mail a PGP public key")) \ _fmt(OP_VERIFY_KEY, N_("verify a PGP public key")) \ _fmt(OP_VIEW_ID, N_("view the key's user id")) \ - _fmt(OP_CHECK_TRADITIONAL, N_("check for classic PGP")) \ #define OPS_SIDEBAR(_fmt) \ _fmt(OP_SIDEBAR_NEXT, N_("move the highlight to next mailbox")) \ @@ -295,7 +295,6 @@ #define OPS_SMIME(_fmt) \ _fmt(OP_COMPOSE_SMIME_MENU, N_("show S/MIME options")) \ - #define OPS(_fmt) \ OPS_CORE(_fmt) \ OPS_SIDEBAR(_fmt) \ -- 2.40.0