X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=functions.def;h=c4b730dbaa54286cc9e2c07ce94f2f7ae43b64ef;hp=59ad2f902a27b96a78356d7593482e42290184fd;hb=a1fb0030ff5d7a322c64e57f040b32991f9f78fa;hpb=64a23f5574b096605383ef1886c7d0d6c42aeeee

diff --git a/functions.def b/functions.def
index 59ad2f9..c4b730d 100644
--- a/functions.def
+++ b/functions.def
@@ -32,9 +32,6 @@
  *
  * Notes:
  *
- * - If you want to bind \n or \r, use M_ENTER_S so that it will work
- * correctly under both ncurses and S-Lang
- *
  * - If you need to bind a control char, use the octal value because the \cX
  * construct does not work at this level.
  *
@@ -76,7 +73,7 @@ LIST(OpGeneric)
     ITEM("tag-prefix-cond",  OP_TAG_PREFIX_COND,      NULL)
     ITEM("end-cond",         OP_END_COND,             NULL)
     ITEM("shell-escape",     OP_SHELL_ESCAPE,         "!")
-    ITEM("select-entry",     OP_GENERIC_SELECT_ENTRY, M_ENTER_S)
+    ITEM("select-entry",     OP_GENERIC_SELECT_ENTRY, "\n")
     ITEM("search",           OP_SEARCH,               "/")
     ITEM("search-reverse",   OP_SEARCH_REVERSE,       "\033/")
     ITEM("search-opposite",  OP_SEARCH_OPPOSITE,      NULL)
@@ -85,7 +82,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)
@@ -167,7 +163,7 @@ LIST(OpMain)
 #ifdef USE_NNTP
     ITEM("catchup",                   OP_CATCHUP,                    "y")
 #endif
-    ITEM("display-message",           OP_DISPLAY_MESSAGE,            M_ENTER_S)
+    ITEM("display-message",           OP_DISPLAY_MESSAGE,            "\n")
     ITEM("buffy-list",                OP_BUFFY_LIST,                 ".")
     ITEM("sync-mailbox",              OP_MAIN_SYNC_FOLDER,           "$")
     ITEM("display-address",           OP_DISPLAY_ADDRESS,            "@")
@@ -275,7 +271,7 @@ LIST(OpPager)
     ITEM("search",                    OP_SEARCH,                      "/")
     ITEM("search-reverse",            OP_SEARCH_REVERSE,              "\033/")
     ITEM("search-opposite",           OP_SEARCH_OPPOSITE,             NULL)
-    ITEM("next-line",                 OP_NEXT_LINE,                   M_ENTER_S)
+    ITEM("next-line",                 OP_NEXT_LINE,                   "\n")
     ITEM("jump",                      OP_JUMP,                        NULL)
     ITEM("next-unread",               OP_MAIN_NEXT_UNREAD,            NULL)
     ITEM("previous-new",              OP_MAIN_PREV_NEW,               NULL)
@@ -320,7 +316,7 @@ LIST(OpAttach)
     ITEM("list-reply",               OP_LIST_REPLY,               "L")
     ITEM("forward-message",          OP_FORWARD_MESSAGE,          "f")
     ITEM("view-text",                OP_ATTACH_VIEW_TEXT,         "T")
-    ITEM("view-attach",              OP_VIEW_ATTACH,              M_ENTER_S)
+    ITEM("view-attach",              OP_VIEW_ATTACH,              "\n")
     ITEM("delete-entry",             OP_DELETE,                   "d")
     ITEM("undelete-entry",           OP_UNDELETE,                 "u")
     ITEM("collapse-parts",           OP_ATTACH_COLLAPSE,          "v")
@@ -354,7 +350,6 @@ LIST(OpCompose)
 #ifdef USE_NNTP
     ITEM("edit-newsgroups",          OP_COMPOSE_EDIT_NEWSGROUPS,     "N")
     ITEM("edit-followup-to",         OP_COMPOSE_EDIT_FOLLOWUP_TO,    "o")
-    ITEM("edit-x-comment-to",        OP_COMPOSE_EDIT_X_COMMENT_TO,   "x")
 #endif
     ITEM("postpone-message",         OP_COMPOSE_POSTPONE_MESSAGE,    "P")
     ITEM("edit-reply-to",            OP_COMPOSE_EDIT_REPLY_TO,       "r")
@@ -366,18 +361,11 @@ LIST(OpCompose)
     ITEM("toggle-unlink",            OP_COMPOSE_TOGGLE_UNLINK,       "u")
     ITEM("toggle-recode",            OP_COMPOSE_TOGGLE_RECODE,       NULL)
     ITEM("update-encoding",          OP_COMPOSE_UPDATE_ENCODING,     "U")
-    ITEM("view-attach",              OP_VIEW_ATTACH,                 M_ENTER_S)
+    ITEM("view-attach",              OP_VIEW_ATTACH,                 "\n")
     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("smime-menu",               OP_COMPOSE_SMIME_MENU,          "S")
-
-#ifdef MIXMASTER
-    ITEM("mix",                      OP_COMPOSE_MIX,                 "M")
-#endif
 ENDLIST
 
 LIST(OpPost)
@@ -464,17 +452,6 @@ LIST(OpSmime)
 #endif
 ENDLIST
 
-#ifdef MIXMASTER
-LIST(OpMix)
-    ITEM("accept",                   OP_MIX_USE,                     M_ENTER_S)
-    ITEM("append",                   OP_MIX_APPEND,                  "a")
-    ITEM("insert",                   OP_MIX_INSERT,                  "i")
-    ITEM("delete",                   OP_MIX_DELETE,                  "d")
-    ITEM("chain-prev",               OP_MIX_CHAIN_PREV,              "<left>")
-    ITEM("chain-next",               OP_MIX_CHAIN_NEXT,              "<right>")
-ENDLIST
-#endif /* MIXMASTER */
-
 #undef ENDLIST
 #undef ITEM
 #undef LIST