X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=functions.def;h=7a32260e8ee386738aa893f1c352c1d7ca0359a0;hp=a462eff350a4e9cd9011e12dfbd41f94d9922774;hb=b6278702a49e9ebf8ca73bb974b7782e5535188a;hpb=53186676acf2c3b5509a614433eb00a2087cd4ec

diff --git a/functions.def b/functions.def
index a462eff..7a32260 100644
--- a/functions.def
+++ b/functions.def
@@ -85,7 +85,6 @@ LIST(OpGeneric)
     ITEM("current-middle",   OP_CURRENT_MIDDLE,       NULL)
     ITEM("current-bottom",   OP_CURRENT_BOTTOM,       NULL)
     ITEM("what-key",         OP_WHAT_KEY,             NULL)
-    ITEM("rebuild-cache",    OP_REBUILD_CACHE,        NULL)
 ENDLIST
 
 LIST(OpMain)
@@ -120,12 +119,8 @@ LIST(OpMain)
 #endif
     ITEM("flag-message",              OP_FLAG_MESSAGE,               "\033f")
     ITEM("group-reply",               OP_GROUP_REPLY,                "g")
-#ifdef USE_POP
     ITEM("fetch-mail",                OP_MAIN_FETCH_MAIL,            "G")
-#endif
-#ifdef USE_IMAP
     ITEM("imap-fetch-mail",           OP_MAIN_IMAP_FETCH,            NULL)
-#endif
     ITEM("display-toggle-weed",       OP_DISPLAY_HEADERS,            "h")
     ITEM("next-undeleted",            OP_MAIN_NEXT_UNDELETED,        "j")
     ITEM("previous-undeleted",        OP_MAIN_PREV_UNDELETED,        "k")
@@ -186,7 +181,6 @@ LIST(OpMain)
 
 
     ITEM("extract-keys",              OP_EXTRACT_KEYS,               "\013")
-    ITEM("forget-passphrase",         OP_FORGET_PASSPHRASE,          "\006")
     ITEM("check-traditional-pgp",     OP_CHECK_TRADITIONAL,          "\033P")
     ITEM("mail-key",                  OP_MAIL_KEY,                   "\033k")
     ITEM("decrypt-copy",              OP_DECRYPT_COPY,               NULL)
@@ -226,9 +220,7 @@ LIST(OpPager)
     ITEM("forward-message",           OP_FORWARD_MESSAGE,             "f")
     ITEM("flag-message",              OP_FLAG_MESSAGE,                "\033f")
     ITEM("group-reply",               OP_GROUP_REPLY,                 "g")
-#ifdef USE_IMAP
     ITEM("imap-fetch-mail",           OP_MAIN_IMAP_FETCH,             NULL)
-#endif
     ITEM("display-toggle-weed",       OP_DISPLAY_HEADERS,             "h")
     ITEM("next-undeleted",            OP_MAIN_NEXT_UNDELETED,         "j")
     ITEM("next-entry",                OP_NEXT_ENTRY,                  "J")
@@ -297,7 +289,6 @@ LIST(OpPager)
     ITEM("check-traditional-pgp",     OP_CHECK_TRADITIONAL,           "\033P")
     ITEM("mail-key",                  OP_MAIL_KEY,                    "\033k")
     ITEM("extract-keys",              OP_EXTRACT_KEYS,                "\013")
-    ITEM("forget-passphrase",         OP_FORGET_PASSPHRASE,           "\006")
     ITEM("decrypt-copy",              OP_DECRYPT_COPY,                NULL)
     ITEM("decrypt-save",              OP_DECRYPT_SAVE,                NULL)
 
@@ -335,7 +326,6 @@ LIST(OpAttach)
 
     ITEM("check-traditional-pgp",    OP_CHECK_TRADITIONAL,        "\033P")
     ITEM("extract-keys",             OP_EXTRACT_KEYS,             "\013")
-    ITEM("forget-passphrase",        OP_FORGET_PASSPHRASE,        "\006")
 ENDLIST
 
 LIST(OpCompose)
@@ -357,7 +347,6 @@ LIST(OpCompose)
     ITEM("filter-entry",             OP_FILTER,                      "F")
     ITEM("get-attachment",           OP_COMPOSE_GET_ATTACHMENT,      "G")
     ITEM("display-toggle-weed",      OP_DISPLAY_HEADERS,             "h")
-    ITEM("ispell",                   OP_COMPOSE_ISPELL,              "i")
     ITEM("print-entry",              OP_PRINT,                       "l")
     ITEM("edit-mime",                OP_COMPOSE_EDIT_MIME,           "m")
     ITEM("new-mime",                 OP_COMPOSE_NEW_MIME,            "n")
@@ -379,14 +368,8 @@ LIST(OpCompose)
     ITEM("view-attach",              OP_VIEW_ATTACH,                 M_ENTER_S)
     ITEM("send-message",             OP_COMPOSE_SEND_MESSAGE,        "y")
     ITEM("pipe-entry",               OP_PIPE,                        "|")
-
-    ITEM("attach-key",               OP_COMPOSE_ATTACH_KEY,          "\033k")
     ITEM("pgp-menu",                 OP_COMPOSE_PGP_MENU,            "p")
-
-    ITEM("forget-passphrase",        OP_FORGET_PASSPHRASE,           "\006")
-
     ITEM("smime-menu",               OP_COMPOSE_SMIME_MENU,          "S")
-
 #ifdef MIXMASTER
     ITEM("mix",                      OP_COMPOSE_MIX,                 "M")
 #endif
@@ -421,18 +404,12 @@ LIST(OpBrowser)
 #endif
     ITEM("view-file",                OP_BROWSER_VIEW_FILE,           " ")
     ITEM("buffy-list",               OP_BUFFY_LIST,                  ".")
-#ifdef USE_IMAP
     ITEM("create-mailbox",           OP_CREATE_MAILBOX,              "C")
     ITEM("delete-mailbox",           OP_DELETE_MAILBOX,              "d")
     ITEM("rename-mailbox",           OP_RENAME_MAILBOX,              "r")
-#endif
-#if defined USE_IMAP || defined USE_NNTP
     ITEM("subscribe",                OP_BROWSER_SUBSCRIBE,           "s")
     ITEM("unsubscribe",              OP_BROWSER_UNSUBSCRIBE,         "u")
-#endif
-#ifdef USE_IMAP
     ITEM("toggle-subscribed",        OP_BROWSER_TOGGLE_LSUB,         "T")
-#endif
 ENDLIST
 
 /* External Query Menu */