584138-mx_update_context-segfault.patch: fix a segfault due to holes in IMAP headers...

[software/mutt-debian.git] / functions.h

diff --git a/functions.h b/functions.h
index f0add788d58b7193ffca9af29b240103fe063a6b..e8beacb4c80b74f812c763d4ebf27e481431b0f8 100644 (file)
--- a/functions.h
+++ b/functions.h
@@ -108,6 +108,7 @@ struct binding_t OpMain[] = { /* map: index */
 #endif
 #ifdef USE_IMAP
   { "imap-fetch-mail",         OP_MAIN_IMAP_FETCH,             NULL },
 #endif
 #ifdef USE_IMAP
   { "imap-fetch-mail",         OP_MAIN_IMAP_FETCH,             NULL },

+  { "imap-logout-all",         OP_MAIN_IMAP_LOGOUT_ALL,        NULL },

 #endif
   { "display-toggle-weed",             OP_DISPLAY_HEADERS,             "h" },
   { "next-undeleted",          OP_MAIN_NEXT_UNDELETED,         "j" },
 #endif
   { "display-toggle-weed",             OP_DISPLAY_HEADERS,             "h" },
   { "next-undeleted",          OP_MAIN_NEXT_UNDELETED,         "j" },


@@ -183,6 +184,8 @@ struct binding_t OpPager[] = { /* map: pager */
   { "delete-message",  OP_DELETE,                      "d" },
   { "delete-thread",   OP_DELETE_THREAD,               "\004" },
   { "delete-subthread",        OP_DELETE_SUBTHREAD,            "\033d" },
   { "delete-message",  OP_DELETE,                      "d" },
   { "delete-thread",   OP_DELETE_THREAD,               "\004" },
   { "delete-subthread",        OP_DELETE_SUBTHREAD,            "\033d" },

+  { "set-flag",        OP_MAIN_SET_FLAG,               "w" },
+  { "clear-flag",       OP_MAIN_CLEAR_FLAG,            "W" },

   { "edit",            OP_EDIT_MESSAGE,                "e" },
   { "edit-type",       OP_EDIT_TYPE,                   "\005" },
   { "forward-message", OP_FORWARD_MESSAGE,             "f" },
   { "edit",            OP_EDIT_MESSAGE,                "e" },
   { "edit-type",       OP_EDIT_TYPE,                   "\005" },
   { "forward-message", OP_FORWARD_MESSAGE,             "f" },


@@ -190,6 +193,7 @@ struct binding_t OpPager[] = { /* map: pager */
   { "group-reply",     OP_GROUP_REPLY,                 "g" },
 #ifdef USE_IMAP
   { "imap-fetch-mail",  OP_MAIN_IMAP_FETCH,            NULL },
   { "group-reply",     OP_GROUP_REPLY,                 "g" },
 #ifdef USE_IMAP
   { "imap-fetch-mail",  OP_MAIN_IMAP_FETCH,            NULL },

+  { "imap-logout-all",  OP_MAIN_IMAP_LOGOUT_ALL,       NULL },

 #endif
   { "display-toggle-weed",     OP_DISPLAY_HEADERS,             "h" },
   { "next-undeleted",  OP_MAIN_NEXT_UNDELETED,         "j" },
 #endif
   { "display-toggle-weed",     OP_DISPLAY_HEADERS,             "h" },
   { "next-undeleted",  OP_MAIN_NEXT_UNDELETED,         "j" },


@@ -204,6 +208,8 @@ struct binding_t OpPager[] = { /* map: pager */
   { "search-next",     OP_SEARCH_NEXT,                 "n" },
   { "next-thread",     OP_MAIN_NEXT_THREAD,            "\016" },
   { "next-subthread",  OP_MAIN_NEXT_SUBTHREAD,         "\033n" },
   { "search-next",     OP_SEARCH_NEXT,                 "n" },
   { "next-thread",     OP_MAIN_NEXT_THREAD,            "\016" },
   { "next-subthread",  OP_MAIN_NEXT_SUBTHREAD,         "\033n" },

+  { "sort-mailbox",    OP_SORT,                        "o" },
+  { "sort-reverse",    OP_SORT_REVERSE,                "O" },

   { "print-message",   OP_PRINT,                       "p" },
   { "previous-thread", OP_MAIN_PREV_THREAD,            "\020" },
   { "previous-subthread",OP_MAIN_PREV_SUBTHREAD,       "\033p" },
   { "print-message",   OP_PRINT,                       "p" },
   { "previous-thread", OP_MAIN_PREV_THREAD,            "\020" },
   { "previous-subthread",OP_MAIN_PREV_SUBTHREAD,       "\033p" },


@@ -269,7 +275,7 @@ struct binding_t OpPager[] = { /* map: pager */
   { NULL,              0,                              NULL }
 };
 
   { NULL,              0,                              NULL }
 };
 

-struct binding_t OpAttach[] = { /* map: attach */
+struct binding_t OpAttach[] = { /* map: attachment */

   { "bounce-message",  OP_BOUNCE_MESSAGE,              "b" },
   { "display-toggle-weed",     OP_DISPLAY_HEADERS,     "h" },
   { "edit-type",       OP_EDIT_TYPE,                   "\005" },
   { "bounce-message",  OP_BOUNCE_MESSAGE,              "b" },
   { "display-toggle-weed",     OP_DISPLAY_HEADERS,     "h" },
   { "edit-type",       OP_EDIT_TYPE,                   "\005" },


@@ -439,7 +445,7 @@ struct binding_t OpSmime[] = { /* map: smime */
 
 
 #ifdef MIXMASTER
 
 
 #ifdef MIXMASTER

-struct binding_t OpMix[] = { /* map: mix */
+struct binding_t OpMix[] = { /* map: mixmaster */

   { "accept",          OP_MIX_USE,     M_ENTER_S },
   { "append",          OP_MIX_APPEND,  "a"       },
   { "insert",          OP_MIX_INSERT,  "i"       },
   { "accept",          OP_MIX_USE,     M_ENTER_S },
   { "append",          OP_MIX_APPEND,  "a"       },
   { "insert",          OP_MIX_INSERT,  "i"       },