tidy some comments/whitespace

diff --git a/auto.def b/auto.def
index 3d02a01973f6153d4b4b296e3b70ff69e91d07f8..9179949046cbcceba1e3b7287e1ffd20c72b1a2c 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -621,13 +621,13 @@ if {[get-define want-notmuch]} {
 ###############################################################################
 # Native Language Support (NLS)
 if {[get-define want-nls]} {
- if {![check-gettext [opt-val with-nls $prefix]]} {
-   user-error "Unable to find gettext. Consider --disable-nls"
- }
- if {![cc-check-progs msgfmt msgmerge xgettext]} {
-   user-error "Unable to find gettext tools (msgfmt, msgmerge, xgettext).\
-               Consider --disable-nls"
- }
+  if {![check-gettext [opt-val with-nls $prefix]]} {
+    user-error "Unable to find gettext. Consider --disable-nls"
+  }
+  if {![cc-check-progs msgfmt msgmerge xgettext]} {
+    user-error "Unable to find gettext tools (msgfmt, msgmerge, xgettext).\
+                Consider --disable-nls"
+  }
 }
 
 ###############################################################################

diff --git a/functions.h b/functions.h
index 4786d51ead9b50a7fabde37191cfd7b7f405aa0d..b8a9551a3ab3413e32fde9c4ebd3b6d14c4e2874 100644 (file)
--- a/functions.h
+++ b/functions.h
@@ -81,7 +81,7 @@ const struct Binding OpGeneric[] = { /* map: generic */
   { "previous-entry",  OP_PREV_ENTRY,           "k" },
   { "previous-line",   OP_PREV_LINE,            "<" },
   { "previous-page",   OP_PREV_PAGE,            "Z" },
-  { "refresh",         OP_REDRAW,               "\014" },                       // Ctrl-L
+  { "refresh",         OP_REDRAW,               "\014" },                       // <Ctrl-L>
   { "search",          OP_SEARCH,               "/" },
   { "search-next",     OP_SEARCH_NEXT,          "n" },
   { "search-opposite", OP_SEARCH_OPPOSITE,      NULL },
@@ -113,7 +113,7 @@ const struct Binding OpMain[] = { /* map: index */
   { "change-folder-readonly",    OP_MAIN_CHANGE_FOLDER_READONLY,    "\033c" },  // <Alt-c>
 #ifdef USE_NNTP
   { "change-newsgroup",          OP_MAIN_CHANGE_GROUP,              "i" },
-  { "change-newsgroup-readonly", OP_MAIN_CHANGE_GROUP_READONLY,     "\033i" },
+  { "change-newsgroup-readonly", OP_MAIN_CHANGE_GROUP_READONLY,     "\033i" },  // <Alt-i>
 #endif
 #ifdef USE_NOTMUCH
   { "change-vfolder",            OP_MAIN_CHANGE_VFOLDER,            NULL },
@@ -132,20 +132,20 @@ const struct Binding OpMain[] = { /* map: index */
   { "delete-message",            OP_DELETE,                         "d" },
   { "delete-pattern",            OP_MAIN_DELETE_PATTERN,            "D" },
   { "delete-subthread",          OP_DELETE_SUBTHREAD,               "\033d" },  // <Alt-d>
-  { "delete-thread",             OP_DELETE_THREAD,                  "\004" },   // Ctrl-D
+  { "delete-thread",             OP_DELETE_THREAD,                  "\004" },   // <Ctrl-D>
   { "display-address",           OP_DISPLAY_ADDRESS,                "@" },
-  { "display-message",           OP_DISPLAY_MESSAGE,                "\n" },
+  { "display-message",           OP_DISPLAY_MESSAGE,                "\n" },     // <Enter>
   { "display-message",           OP_DISPLAY_MESSAGE,                "\r" },
   { "display-toggle-weed",       OP_DISPLAY_HEADERS,                "h" },
   { "edit",                      OP_EDIT_RAW_MESSAGE,               NULL },
   { "edit-label",                OP_EDIT_LABEL,                     "Y" },
   { "edit-or-view-raw-message",  OP_EDIT_OR_VIEW_RAW_MESSAGE,       "e" },
   { "edit-raw-message",          OP_EDIT_RAW_MESSAGE,               NULL },
-  { "edit-type",                 OP_EDIT_TYPE,                      "\005" },   // Ctrl-E
+  { "edit-type",                 OP_EDIT_TYPE,                      "\005" },   // <Ctrl-E>
 #ifdef USE_NOTMUCH
   { "entire-thread",             OP_MAIN_ENTIRE_THREAD,             NULL },
 #endif
-  { "extract-keys",              OP_EXTRACT_KEYS,                   "\013" },   // Ctrl-K
+  { "extract-keys",              OP_EXTRACT_KEYS,                   "\013" },   // <Ctrl-K>
 #ifdef USE_POP
   { "fetch-mail",                OP_MAIN_FETCH_MAIL,                "G" },
 #endif
@@ -153,7 +153,7 @@ const struct Binding OpMain[] = { /* map: index */
 #ifdef USE_NNTP
   { "followup-message",          OP_FOLLOWUP,                       NULL },
 #endif
-  { "forget-passphrase",         OP_FORGET_PASSPHRASE,              "\006" },   // Ctrl-F
+  { "forget-passphrase",         OP_FORGET_PASSPHRASE,              "\006" },   // <Ctrl-F>
   { "forward-message",           OP_FORWARD_MESSAGE,                "f" },
 #ifdef USE_NNTP
   { "forward-to-group",          OP_FORWARD_TO_GROUP,               NULL },
@@ -182,7 +182,7 @@ const struct Binding OpMain[] = { /* map: index */
   { "next-new",                  OP_MAIN_NEXT_NEW,                  NULL },
   { "next-new-then-unread",      OP_MAIN_NEXT_NEW_THEN_UNREAD,      "\t" },
   { "next-subthread",            OP_MAIN_NEXT_SUBTHREAD,            "\033n" },  // <Alt-n>
-  { "next-thread",               OP_MAIN_NEXT_THREAD,               "\016" },   // Ctrl-N
+  { "next-thread",               OP_MAIN_NEXT_THREAD,               "\016" },   // <Ctrl-N>
   { "next-undeleted",            OP_MAIN_NEXT_UNDELETED,            "j" },
   { "next-unread",               OP_MAIN_NEXT_UNREAD,               NULL },
   { "next-unread-mailbox",       OP_MAIN_NEXT_UNREAD_MAILBOX,       NULL },
@@ -194,7 +194,7 @@ const struct Binding OpMain[] = { /* map: index */
   { "previous-new",              OP_MAIN_PREV_NEW,                  NULL },
   { "previous-new-then-unread",  OP_MAIN_PREV_NEW_THEN_UNREAD,      "\033\t" }, // <Alt-\>
   { "previous-subthread",        OP_MAIN_PREV_SUBTHREAD,            "\033p" },  // <Alt-p>
-  { "previous-thread",           OP_MAIN_PREV_THREAD,               "\020" },   // Ctrl-P
+  { "previous-thread",           OP_MAIN_PREV_THREAD,               "\020" },   // <Ctrl-P>
   { "previous-undeleted",        OP_MAIN_PREV_UNDELETED,            "k" },
   { "previous-unread",           OP_MAIN_PREV_UNREAD,               NULL },
   { "print-message",             OP_PRINT,                          "p" },
@@ -204,7 +204,7 @@ const struct Binding OpMain[] = { /* map: index */
   { "query",                     OP_QUERY,                          "Q" },
   { "quit",                      OP_QUIT,                           "q" },
   { "read-subthread",            OP_MAIN_READ_SUBTHREAD,            "\033r" },  // <Alt-r>
-  { "read-thread",               OP_MAIN_READ_THREAD,               "\022" },   // Ctrl-R
+  { "read-thread",               OP_MAIN_READ_THREAD,               "\022" },   // <Ctrl-R>
   { "recall-message",            OP_RECALL_MESSAGE,                 "R" },
 #ifdef USE_NNTP
   { "reconstruct-thread",        OP_RECONSTRUCT_THREAD,             NULL },
@@ -240,8 +240,8 @@ const struct Binding OpMain[] = { /* map: index */
   { "undelete-message",          OP_UNDELETE,                       "u" },
   { "undelete-pattern",          OP_MAIN_UNDELETE_PATTERN,          "U" },
   { "undelete-subthread",        OP_UNDELETE_SUBTHREAD,             "\033u" },  // <Alt-u>
-  { "undelete-thread",           OP_UNDELETE_THREAD,                "\025" },   // Ctrl-U
-  { "untag-pattern",             OP_MAIN_UNTAG_PATTERN,             "\024" },   // Ctrl-T
+  { "undelete-thread",           OP_UNDELETE_THREAD,                "\025" },   // <Ctrl-U>
+  { "untag-pattern",             OP_MAIN_UNTAG_PATTERN,             "\024" },   // <Ctrl-T>
 #ifdef USE_NOTMUCH
   { "vfolder-from-query",        OP_MAIN_VFOLDER_FROM_QUERY,        NULL },
   { "vfolder-from-query-readonly", OP_MAIN_VFOLDER_FROM_QUERY_READONLY, NULL },
@@ -266,7 +266,7 @@ const struct Binding OpPager[] = { /* map: pager */
   { "change-folder-readonly",    OP_MAIN_CHANGE_FOLDER_READONLY,  "\033c" },    // <Alt-c>
 #ifdef USE_NNTP
   { "change-newsgroup",          OP_MAIN_CHANGE_GROUP,            "i" },
-  { "change-newsgroup-readonly", OP_MAIN_CHANGE_GROUP_READONLY,   "\033i" },
+  { "change-newsgroup-readonly", OP_MAIN_CHANGE_GROUP_READONLY,   "\033i" },    // <Alt-i>
 #endif
 #ifdef USE_NOTMUCH
   { "change-vfolder",            OP_MAIN_CHANGE_VFOLDER,          NULL },
@@ -283,25 +283,25 @@ const struct Binding OpPager[] = { /* map: pager */
   { "decrypt-save",              OP_DECRYPT_SAVE,                 NULL },
   { "delete-message",            OP_DELETE,                       "d" },
   { "delete-subthread",          OP_DELETE_SUBTHREAD,             "\033d" },    // <Alt-d>
-  { "delete-thread",             OP_DELETE_THREAD,                "\004" },     // Ctrl-D
+  { "delete-thread",             OP_DELETE_THREAD,                "\004" },     // <Ctrl-D>
   { "display-address",           OP_DISPLAY_ADDRESS,              "@" },
   { "display-toggle-weed",       OP_DISPLAY_HEADERS,              "h" },
   { "edit",                      OP_EDIT_RAW_MESSAGE,             NULL },
   { "edit-label",                OP_EDIT_LABEL,                   "Y" },
   { "edit-or-view-raw-message",  OP_EDIT_OR_VIEW_RAW_MESSAGE,     "e" },
   { "edit-raw-message",          OP_EDIT_RAW_MESSAGE,             NULL },
-  { "edit-type",                 OP_EDIT_TYPE,                    "\005" },     // Ctrl-E
+  { "edit-type",                 OP_EDIT_TYPE,                    "\005" },     // <Ctrl-E>
   { "enter-command",             OP_ENTER_COMMAND,                ":" },
 #ifdef USE_NOTMUCH
   { "entire-thread",             OP_MAIN_ENTIRE_THREAD,           NULL },
 #endif
   { "exit",                      OP_EXIT,                         "q" },
-  { "extract-keys",              OP_EXTRACT_KEYS,                 "\013" },     // Ctrl-K
+  { "extract-keys",              OP_EXTRACT_KEYS,                 "\013" },     // <Ctrl-K>
   { "flag-message",              OP_FLAG_MESSAGE,                 "F" },
 #ifdef USE_NNTP
   { "followup-message",          OP_FOLLOWUP,                     NULL },
 #endif
-  { "forget-passphrase",         OP_FORGET_PASSPHRASE,            "\006" },     // Ctrl-F
+  { "forget-passphrase",         OP_FORGET_PASSPHRASE,            "\006" },     // <Ctrl-F>
   { "forward-message",           OP_FORWARD_MESSAGE,              "f" },
 #ifdef USE_NNTP
   { "forward-to-group",          OP_FORWARD_TO_GROUP,             NULL },
@@ -327,13 +327,13 @@ const struct Binding OpPager[] = { /* map: pager */
   { "modify-tags",               OP_MAIN_MODIFY_TAGS,             NULL },
   { "modify-tags-then-hide",     OP_MAIN_MODIFY_TAGS_THEN_HIDE,   NULL },
   { "next-entry",                OP_NEXT_ENTRY,                   "J" },
-  { "next-line",                 OP_NEXT_LINE,                    "\n" },
+  { "next-line",                 OP_NEXT_LINE,                    "\n" },       // <Enter>
   { "next-line",                 OP_NEXT_LINE,                    "\r" },
   { "next-new",                  OP_MAIN_NEXT_NEW,                NULL },
   { "next-new-then-unread",      OP_MAIN_NEXT_NEW_THEN_UNREAD,    "\t" },
   { "next-page",                 OP_NEXT_PAGE,                    " " },
   { "next-subthread",            OP_MAIN_NEXT_SUBTHREAD,          "\033n" },    // <Alt-n>
-  { "next-thread",               OP_MAIN_NEXT_THREAD,             "\016" },     // Ctrl-N
+  { "next-thread",               OP_MAIN_NEXT_THREAD,             "\016" },     // <Ctrl-N>
   { "next-undeleted",            OP_MAIN_NEXT_UNDELETED,          "j" },
   { "next-unread",               OP_MAIN_NEXT_UNREAD,             NULL },
   { "next-unread-mailbox",       OP_MAIN_NEXT_UNREAD_MAILBOX,     NULL },
@@ -348,7 +348,7 @@ const struct Binding OpPager[] = { /* map: pager */
   { "previous-new-then-unread",  OP_MAIN_PREV_NEW_THEN_UNREAD,    NULL },
   { "previous-page",             OP_PREV_PAGE,                    "-" },
   { "previous-subthread",        OP_MAIN_PREV_SUBTHREAD,          "\033p" },    // <Alt-p>
-  { "previous-thread",           OP_MAIN_PREV_THREAD,             "\020" },     // Ctrl-P
+  { "previous-thread",           OP_MAIN_PREV_THREAD,             "\020" },     // <Ctrl-P>
   { "previous-undeleted",        OP_MAIN_PREV_UNDELETED,          "k" },
   { "previous-unread",           OP_MAIN_PREV_UNREAD,             NULL },
   { "print-message",             OP_PRINT,                        "p" },
@@ -357,12 +357,12 @@ const struct Binding OpPager[] = { /* map: pager */
   { "quasi-delete",              OP_MAIN_QUASI_DELETE,            NULL },
   { "quit",                      OP_QUIT,                         "Q" },
   { "read-subthread",            OP_MAIN_READ_SUBTHREAD,          "\033r" },    // <Alt-r>
-  { "read-thread",               OP_MAIN_READ_THREAD,             "\022" },     // Ctrl-R
+  { "read-thread",               OP_MAIN_READ_THREAD,             "\022" },     // <Ctrl-R>
   { "recall-message",            OP_RECALL_MESSAGE,               "R" },
 #ifdef USE_NNTP
   { "reconstruct-thread",        OP_RECONSTRUCT_THREAD,           NULL },
 #endif
-  { "redraw-screen",             OP_REDRAW,                       "\014" },     // Ctrl-L
+  { "redraw-screen",             OP_REDRAW,                       "\014" },     // <Ctrl-L>
   { "reply",                     OP_REPLY,                        "r" },
   { "resend-message",            OP_RESEND,                       "\033e" },    // <Alt-e>
   { "root-message",              OP_MAIN_ROOT_MESSAGE,            NULL },
@@ -371,7 +371,7 @@ const struct Binding OpPager[] = { /* map: pager */
   { "search-next",               OP_SEARCH_NEXT,                  "n" },
   { "search-opposite",           OP_SEARCH_OPPOSITE,              NULL },
   { "search-reverse",            OP_SEARCH_REVERSE,               "\033/" },    // <Alt-/>
-  { "search-toggle",             OP_SEARCH_TOGGLE,                "\\" },
+  { "search-toggle",             OP_SEARCH_TOGGLE,                "\\" },       // <Backslash>
   { "set-flag",                  OP_MAIN_SET_FLAG,                "w" },
   { "shell-escape",              OP_SHELL_ESCAPE,                 "!" },
   { "show-version",              OP_VERSION,                      "V" },
@@ -396,7 +396,7 @@ const struct Binding OpPager[] = { /* map: pager */
   { "top",                       OP_PAGER_TOP,                    "^" },
   { "undelete-message",          OP_UNDELETE,                     "u" },
   { "undelete-subthread",        OP_UNDELETE_SUBTHREAD,           "\033u" },    // <Alt-u>
-  { "undelete-thread",           OP_UNDELETE_THREAD,              "\025" },     // Ctrl-U
+  { "undelete-thread",           OP_UNDELETE_THREAD,              "\025" },     // <Ctrl-U>
 #ifdef USE_NOTMUCH
   { "vfolder-from-query",        OP_MAIN_VFOLDER_FROM_QUERY,      NULL },
   { "vfolder-from-query-readonly", OP_MAIN_VFOLDER_FROM_QUERY_READONLY, NULL },
@@ -419,12 +419,12 @@ const struct Binding OpAttach[] = { /* map: attachment */
   { "compose-to-sender",     OP_COMPOSE_TO_SENDER,           NULL },
   { "delete-entry",          OP_DELETE,                      "d" },
   { "display-toggle-weed",   OP_DISPLAY_HEADERS,             "h" },
-  { "edit-type",             OP_EDIT_TYPE,                   "\005" },          // Ctrl-E
-  { "extract-keys",          OP_EXTRACT_KEYS,                "\013" },          // Ctrl-K
+  { "edit-type",             OP_EDIT_TYPE,                   "\005" },          // <Ctrl-E>
+  { "extract-keys",          OP_EXTRACT_KEYS,                "\013" },          // <Ctrl-K>
 #ifdef USE_NNTP
   { "followup-message",      OP_FOLLOWUP,                    NULL },
 #endif
-  { "forget-passphrase",     OP_FORGET_PASSPHRASE,           "\006" },          // Ctrl-F
+  { "forget-passphrase",     OP_FORGET_PASSPHRASE,           "\006" },          // <Ctrl-F>
   { "forward-message",       OP_FORWARD_MESSAGE,             "f" },
 #ifdef USE_NNTP
   { "forward-to-group",      OP_FORWARD_TO_GROUP,            NULL },
@@ -438,7 +438,7 @@ const struct Binding OpAttach[] = { /* map: attachment */
   { "resend-message",        OP_RESEND,                      "\033e" },         // <Alt-e>
   { "save-entry",            OP_SAVE,                        "s" },
   { "undelete-entry",        OP_UNDELETE,                    "u" },
-  { "view-attach",           OP_VIEW_ATTACH,                 "\n" },
+  { "view-attach",           OP_VIEW_ATTACH,                 "\n" },            // <Enter>
   { "view-attach",           OP_VIEW_ATTACH,                 "\r" },
   { "view-mailcap",          OP_ATTACH_VIEW_MAILCAP,         "m" },
   { "view-text",             OP_ATTACH_VIEW_TEXT,            "T" },
@@ -464,7 +464,7 @@ const struct Binding OpCompose[] = { /* map: compose */
   { "edit-bcc",              OP_COMPOSE_EDIT_BCC,            "b" },
   { "edit-cc",               OP_COMPOSE_EDIT_CC,             "c" },
   { "edit-description",      OP_COMPOSE_EDIT_DESCRIPTION,    "d" },
-  { "edit-encoding",         OP_COMPOSE_EDIT_ENCODING,       "\005" },          // Ctrl-E
+  { "edit-encoding",         OP_COMPOSE_EDIT_ENCODING,       "\005" },          // <Ctrl-E>
   { "edit-fcc",              OP_COMPOSE_EDIT_FCC,            "f" },
   { "edit-file",             OP_COMPOSE_EDIT_FILE,           "\030e" },         // <Alt-e>
 #ifdef USE_NNTP
@@ -472,7 +472,7 @@ const struct Binding OpCompose[] = { /* map: compose */
 #endif
   { "edit-from",             OP_COMPOSE_EDIT_FROM,           "\033f" },         // <Alt-f>
   { "edit-headers",          OP_COMPOSE_EDIT_HEADERS,        "E" },
-  { "edit-language",         OP_COMPOSE_EDIT_LANGUAGE,       "\014" },          // Ctrl-L
+  { "edit-language",         OP_COMPOSE_EDIT_LANGUAGE,       "\014" },          // <Ctrl-L>
   { "edit-message",          OP_COMPOSE_EDIT_MESSAGE,        "e" },
   { "edit-mime",             OP_COMPOSE_EDIT_MIME,           "m" },
 #ifdef USE_NNTP
@@ -481,12 +481,12 @@ const struct Binding OpCompose[] = { /* map: compose */
   { "edit-reply-to",         OP_COMPOSE_EDIT_REPLY_TO,       "r" },
   { "edit-subject",          OP_COMPOSE_EDIT_SUBJECT,        "s" },
   { "edit-to",               OP_COMPOSE_EDIT_TO,             "t" },
-  { "edit-type",             OP_EDIT_TYPE,                   "\024" },          // Ctrl-T
+  { "edit-type",             OP_EDIT_TYPE,                   "\024" },          // <Ctrl-T>
 #ifdef USE_NNTP
   { "edit-x-comment-to",     OP_COMPOSE_EDIT_X_COMMENT_TO,   NULL },
 #endif
   { "filter-entry",          OP_FILTER,                      "F" },
-  { "forget-passphrase",     OP_FORGET_PASSPHRASE,           "\006" },          // Ctrl-F
+  { "forget-passphrase",     OP_FORGET_PASSPHRASE,           "\006" },          // <Ctrl-F>
   { "get-attachment",        OP_COMPOSE_GET_ATTACHMENT,      "G" },
   { "group-alternatives",    OP_COMPOSE_GROUP_ALTS,          "&" },
   { "group-multilingual",    OP_COMPOSE_GROUP_LINGUAL,       "^" },
@@ -501,15 +501,15 @@ const struct Binding OpCompose[] = { /* map: compose */
   { "pipe-entry",            OP_PIPE,                        "|" },
   { "postpone-message",      OP_COMPOSE_POSTPONE_MESSAGE,    "P" },
   { "print-entry",           OP_PRINT,                       "l" },
-  { "rename-attachment",     OP_COMPOSE_RENAME_ATTACHMENT,   "\017" },          // Ctrl-O
+  { "rename-attachment",     OP_COMPOSE_RENAME_ATTACHMENT,   "\017" },          // <Ctrl-O>
   { "rename-file",           OP_COMPOSE_RENAME_FILE,         "R" },
   { "send-message",          OP_COMPOSE_SEND_MESSAGE,        "y" },
   { "smime-menu",            OP_COMPOSE_SMIME_MENU,          "S" },
-  { "toggle-disposition",    OP_COMPOSE_TOGGLE_DISPOSITION,  "\004" },          // Ctrl-D
+  { "toggle-disposition",    OP_COMPOSE_TOGGLE_DISPOSITION,  "\004" },          // <Ctrl-D>
   { "toggle-recode",         OP_COMPOSE_TOGGLE_RECODE,       NULL },
   { "toggle-unlink",         OP_COMPOSE_TOGGLE_UNLINK,       "u" },
   { "update-encoding",       OP_COMPOSE_UPDATE_ENCODING,     "U" },
-  { "view-attach",           OP_VIEW_ATTACH,                 "\n" },
+  { "view-attach",           OP_VIEW_ATTACH,                 "\n" },            // <Enter>
   { "view-attach",           OP_VIEW_ATTACH,                 "\r" },
   { "write-fcc",             OP_COMPOSE_WRITE_MESSAGE,       "w" },
   { NULL,                    0,                              NULL },
@@ -601,27 +601,27 @@ const struct Binding OpQuery[] = { /* map: query */
  * OpEditor - Key bindings for the editor menu
  */
 const struct Binding OpEditor[] = { /* map: editor */
-  { "backspace",             OP_EDITOR_BACKSPACE,            "\010" },          // Ctrl-H
-  { "backward-char",         OP_EDITOR_BACKWARD_CHAR,        "\002" },          // Ctrl-B
+  { "backspace",             OP_EDITOR_BACKSPACE,            "\010" },          // <Ctrl-H>
+  { "backward-char",         OP_EDITOR_BACKWARD_CHAR,        "\002" },          // <Ctrl-B>
   { "backward-word",         OP_EDITOR_BACKWARD_WORD,        "\033b" },         // <Alt-b>
-  { "bol",                   OP_EDITOR_BOL,                  "\001" },          // Ctrl-A
+  { "bol",                   OP_EDITOR_BOL,                  "\001" },          // <Ctrl-A>
   { "capitalize-word",       OP_EDITOR_CAPITALIZE_WORD,      "\033c" },         // <Alt-c>
-  { "complete",              OP_EDITOR_COMPLETE,             "\t" },
-  { "complete-query",        OP_EDITOR_COMPLETE_QUERY,       "\024" },          // Ctrl-T
-  { "delete-char",           OP_EDITOR_DELETE_CHAR,          "\004" },          // Ctrl-D
+  { "complete",              OP_EDITOR_COMPLETE,             "\t" },            // <Tab>
+  { "complete-query",        OP_EDITOR_COMPLETE_QUERY,       "\024" },          // <Ctrl-T>
+  { "delete-char",           OP_EDITOR_DELETE_CHAR,          "\004" },          // <Ctrl-D>
   { "downcase-word",         OP_EDITOR_DOWNCASE_WORD,        "\033l" },         // <Alt-l>
-  { "eol",                   OP_EDITOR_EOL,                  "\005" },          // Ctrl-E
-  { "forward-char",          OP_EDITOR_FORWARD_CHAR,         "\006" },          // Ctrl-F
+  { "eol",                   OP_EDITOR_EOL,                  "\005" },          // <Ctrl-E>
+  { "forward-char",          OP_EDITOR_FORWARD_CHAR,         "\006" },          // <Ctrl-F>
   { "forward-word",          OP_EDITOR_FORWARD_WORD,         "\033f" },         // <Alt-f>
   { "history-down",          OP_EDITOR_HISTORY_DOWN,         NULL },
-  { "history-search",        OP_EDITOR_HISTORY_SEARCH,       "\022" },          // Ctrl-R
+  { "history-search",        OP_EDITOR_HISTORY_SEARCH,       "\022" },          // <Ctrl-R>
   { "history-up",            OP_EDITOR_HISTORY_UP,           NULL },
-  { "kill-eol",              OP_EDITOR_KILL_EOL,             "\013" },          // Ctrl-K
+  { "kill-eol",              OP_EDITOR_KILL_EOL,             "\013" },          // <Ctrl-K>
   { "kill-eow",              OP_EDITOR_KILL_EOW,             "\033d" },         // <Alt-d>
-  { "kill-line",             OP_EDITOR_KILL_LINE,            "\025" },          // Ctrl-U
-  { "kill-word",             OP_EDITOR_KILL_WORD,            "\027" },          // Ctrl-W
+  { "kill-line",             OP_EDITOR_KILL_LINE,            "\025" },          // <Ctrl-U>
+  { "kill-word",             OP_EDITOR_KILL_WORD,            "\027" },          // <Ctrl-W>
   { "mailbox-cycle",         OP_EDITOR_MAILBOX_CYCLE,        " " },
-  { "quote-char",            OP_EDITOR_QUOTE_CHAR,           "\026" },          // Ctrl-V
+  { "quote-char",            OP_EDITOR_QUOTE_CHAR,           "\026" },          // <Ctrl-V>
   { "transpose-chars",       OP_EDITOR_TRANSPOSE_CHARS,      NULL },
   { "upcase-word",           OP_EDITOR_UPCASE_WORD,          "\033u" },         // <Alt-u>
   /* This is deprecated.  Leave it last so it doesn't show up in the help. */
@@ -654,8 +654,8 @@ const struct Binding OpSmime[] = { /* map: smime */
  * OpMix - Key bindings for the mixmaster menu
  */
 const struct Binding OpMix[] = { /* map: mixmaster */
-  { "accept",                OP_MIX_USE,                     "\n" },
-  { "accept",                OP_MIX_USE,                     "\r" },
+  { "accept",                OP_MIX_USE,                     "\n" },            // <Enter>
+  { "accept",                OP_MIX_USE,                     "\r" },            // <Return>
   { "append",                OP_MIX_APPEND,                  "a" },
   { "chain-next",            OP_MIX_CHAIN_NEXT,              "<right>" },
   { "chain-prev",            OP_MIX_CHAIN_PREV,              "<left>" },

diff --git a/mutt/path.c b/mutt/path.c
index 9e31a0d4c516167a69ffeca3a795b64b54260f47..9a168f3b8b66688074b2e3b89f6666f96f43e30d 100644 (file)
--- a/mutt/path.c
+++ b/mutt/path.c
@@ -406,6 +406,8 @@ char *mutt_path_concatn(char *dst, size_t dstlen, const char *dir,
  * Unlike the IEEE Std 1003.1-2001 specification of dirname(3), this
  * implementation does not modify its parameter, so callers need not manually
  * copy their paths into a modifiable buffer prior to calling this function.
+ *
+ * @note The caller must free the returned string
  */
 char *mutt_path_dirname(const char *path)
 {

diff --git a/mutt/regex3.h b/mutt/regex3.h
index 34afcb8584275045ba6a4aa66b7ae9132adae037..b4e0f26656741cadb706048a4194046ce1151f0e 100644 (file)
--- a/mutt/regex3.h
+++ b/mutt/regex3.h
@@ -31,9 +31,9 @@
 struct Buffer;
 
 /* ... DT_REGEX */
-#define DT_REGEX_MATCH_CASE 0x040 /**< Case-sensitive matching */
-#define DT_REGEX_ALLOW_NOT  0x080 /**< Regex can begin with '!' */
-#define DT_REGEX_NOSUB      0x100 /**< Do not report what was matched (REG_NOSUB) */
+#define DT_REGEX_MATCH_CASE (1 << 6)  ///< Case-sensitive matching
+#define DT_REGEX_ALLOW_NOT  (1 << 7)  ///< Regex can begin with '!'
+#define DT_REGEX_NOSUB      (1 << 8)  ///< Do not report what was matched (REG_NOSUB)
 
 /* This is a non-standard option supported by Solaris 2.5.x
  * which allows patterns of the form \<...\> */

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 0661f5e3e0bf409ab7500a30cd4d90c3e3273c20..485d268a02827b4a30767f5f6d8353c6719bfd91 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -462,10 +462,6 @@ static int cmp_version_strings(const char *a, const char *b, int level)
 }
 #endif                                 /* gpgme >= 1.9.0 */
 
-/*
- * Key management.
- */
-
 /**
  * crypt_keyid - Find the ID for the key
  * @param k Key to use

diff --git a/send.c b/send.c
index 53124db2c87449939705473e168bb7fd581d9610..799b55703e64f69942ae9af31323e1d48ab8d8f7 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1754,7 +1754,8 @@ static int postpone_message(struct Email *e_post, struct Email *e_cur, char *fcc
 
   mutt_encode_descriptions(e_post->content, true);
 
-  if ((WithCrypto != 0) && C_PostponeEncrypt && (e_post->security & (SEC_ENCRYPT | SEC_AUTOCRYPT)))
+  if ((WithCrypto != 0) && C_PostponeEncrypt &&
+      (e_post->security & (SEC_ENCRYPT | SEC_AUTOCRYPT)))
   {
     if (((WithCrypto & APPLICATION_PGP) != 0) && (e_post->security & APPLICATION_PGP))
       encrypt_as = C_PgpDefaultKey;

diff --git a/status.c b/status.c
index fe8753b13481f231277afc6795e628af7ae696b1..56b632babbc0807a3050ded09eb1c4379004ee6a 100644 (file)
--- a/status.c
+++ b/status.c
@@ -73,7 +73,7 @@ static char *get_sort_str(char *buf, size_t buflen, enum SortType method)
  * | \%F     | Number of flagged messages
  * | \%h     | Hostname
  * | \%l     | Length of mailbox (in bytes)
- * | \%L     | Size (in bytes) of the messages shown
+ * | \%L     | Size (in bytes) of the messages shown (or limited)
  * | \%M     | Number of messages shown (virtual message count when limiting)
  * | \%m     | Total number of messages
  * | \%n     | Number of new messages