X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=functions.def;h=f95bc49b9d7e859ecf9a20cf9b8cceee94e4cfbe;hp=e1fd6ddd173b68a4ef89eaae13525ce80e901638;hb=16be8d10413bbcf822577afd4019d65aba7459e0;hpb=9b2475d3970fb70c443ac5035a41208cd9db1569 diff --git a/functions.def b/functions.def index e1fd6dd..f95bc49 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) @@ -84,8 +81,6 @@ LIST(OpGeneric) ITEM("current-top", OP_CURRENT_TOP, NULL) 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) @@ -94,10 +89,6 @@ LIST(OpMain) ITEM("break-thread", OP_MAIN_BREAK_THREAD, "#") ITEM("change-folder", OP_MAIN_CHANGE_FOLDER, "c") ITEM("change-folder-readonly", OP_MAIN_CHANGE_FOLDER_READONLY,"\033c") -#ifdef USE_NNTP - ITEM("change-newsgroup", OP_MAIN_CHANGE_GROUP, "i") - ITEM("change-newsgroup-readonly", OP_MAIN_CHANGE_GROUP_READONLY, "\033i") -#endif ITEM("collapse-thread", OP_MAIN_COLLAPSE_THREAD, "\033v") ITEM("collapse-all", OP_MAIN_COLLAPSE_ALL, "\033V") ITEM("copy-message", OP_COPY_MESSAGE, "C") @@ -110,14 +101,6 @@ LIST(OpMain) ITEM("edit", OP_EDIT_MESSAGE, "e") ITEM("edit-type", OP_EDIT_TYPE, "\005") ITEM("forward-message", OP_FORWARD_MESSAGE, "f") -#ifdef USE_NNTP - ITEM("forward-to-group", OP_FORWARD_TO_GROUP, "\033F") - ITEM("followup-message", OP_FOLLOWUP, "F") - ITEM("get-children", OP_GET_CHILDREN, NULL) - ITEM("get-message", OP_GET_MESSAGE, "\007") - ITEM("get-parent", OP_GET_PARENT, "\033G") - ITEM("reconstruct-thread", OP_RECONSTRUCT_THREAD, NULL) -#endif ITEM("flag-message", OP_FLAG_MESSAGE, "\033f") ITEM("group-reply", OP_GROUP_REPLY, "g") ITEM("fetch-mail", OP_MAIN_FETCH_MAIL, "G") @@ -141,9 +124,6 @@ LIST(OpMain) ITEM("sort-mailbox", OP_SORT, "o") ITEM("sort-reverse", OP_SORT_REVERSE, "O") ITEM("print-message", OP_PRINT, "p") -#ifdef USE_NNTP - ITEM("post-message", OP_POST, "P") -#endif ITEM("previous-thread", OP_MAIN_PREV_THREAD, "\020") ITEM("previous-subthread", OP_MAIN_PREV_SUBTHREAD, "\033p") ITEM("recall-message", OP_RECALL_MESSAGE, "R") @@ -164,10 +144,7 @@ LIST(OpMain) ITEM("set-flag", OP_MAIN_SET_FLAG, "w") ITEM("clear-flag", OP_MAIN_CLEAR_FLAG, "W") ITEM("toggle-read", OP_TOGGLE_READ, "X") -#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, "@") @@ -182,7 +159,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) @@ -204,10 +180,6 @@ LIST(OpPager) ITEM("bounce-message", OP_BOUNCE_MESSAGE, "b") ITEM("change-folder", OP_MAIN_CHANGE_FOLDER, "c") ITEM("change-folder-readonly", OP_MAIN_CHANGE_FOLDER_READONLY, "\033c") -#ifdef USE_NNTP - ITEM("change-newsgroup", OP_MAIN_CHANGE_GROUP, "i") - ITEM("change-newsgroup-readonly", OP_MAIN_CHANGE_GROUP_READONLY, "\033i") -#endif ITEM("copy-message", OP_COPY_MESSAGE, "C") ITEM("decode-copy", OP_DECODE_COPY, "\033C") ITEM("delete-message", OP_DELETE, "d") @@ -215,10 +187,6 @@ LIST(OpPager) ITEM("delete-subthread", OP_DELETE_SUBTHREAD, "\033d") ITEM("edit", OP_EDIT_MESSAGE, "e") ITEM("edit-type", OP_EDIT_TYPE, "\005") -#ifdef USE_NNTP - ITEM("followup-message", OP_FOLLOWUP, "F") - ITEM("forward-to-group", OP_FORWARD_TO_GROUP, "\033F") -#endif ITEM("forward-message", OP_FORWARD_MESSAGE, "f") ITEM("flag-message", OP_FLAG_MESSAGE, "\033f") ITEM("group-reply", OP_GROUP_REPLY, "g") @@ -237,9 +205,6 @@ LIST(OpPager) ITEM("next-thread", OP_MAIN_NEXT_THREAD, "\016") ITEM("next-subthread", OP_MAIN_NEXT_SUBTHREAD, "\033n") ITEM("print-message", OP_PRINT, "p") -#ifdef USE_NNTP - ITEM("post-message", OP_POST, "P") -#endif ITEM("previous-thread", OP_MAIN_PREV_THREAD, "\020") ITEM("previous-subthread", OP_MAIN_PREV_SUBTHREAD, "\033p") ITEM("purge-message", OP_PURGE_MESSAGE, NULL) @@ -276,7 +241,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) @@ -291,7 +256,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) @@ -308,10 +272,6 @@ LIST(OpAttach) ITEM("bounce-message", OP_BOUNCE_MESSAGE, "b") ITEM("display-toggle-weed", OP_DISPLAY_HEADERS, "h") ITEM("edit-type", OP_EDIT_TYPE, "\005") -#ifdef USE_NNTP - ITEM("followup-message", OP_FOLLOWUP, "F") - ITEM("forward-to-group", OP_FORWARD_TO_GROUP, "\033F") -#endif ITEM("print-entry", OP_PRINT, "p") ITEM("save-entry", OP_SAVE, "s") ITEM("pipe-entry", OP_PIPE, "|") @@ -322,20 +282,18 @@ 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") 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) ITEM("attach-file", OP_COMPOSE_ATTACH_FILE, "a") ITEM("attach-message", OP_COMPOSE_ATTACH_MESSAGE, "A") - ITEM("attach-news-message", OP_COMPOSE_ATTACH_NEWS_MESSAGE, "\033a") ITEM("edit-bcc", OP_COMPOSE_EDIT_BCC, "b") ITEM("edit-cc", OP_COMPOSE_EDIT_CC, "c") ITEM("copy-file", OP_SAVE, "C") @@ -354,11 +312,6 @@ LIST(OpCompose) ITEM("print-entry", OP_PRINT, "l") ITEM("edit-mime", OP_COMPOSE_EDIT_MIME, "m") ITEM("new-mime", OP_COMPOSE_NEW_MIME, "n") -#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") ITEM("rename-file", OP_COMPOSE_RENAME_FILE, "R") @@ -369,20 +322,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("forget-passphrase", OP_FORGET_PASSPHRASE, "\006") - ITEM("smime-menu", OP_COMPOSE_SMIME_MENU, "S") - -#ifdef MIXMASTER - ITEM("mix", OP_COMPOSE_MIX, "M") -#endif ENDLIST LIST(OpPost) @@ -405,13 +349,6 @@ LIST(OpBrowser) ITEM("select-new", OP_BROWSER_NEW_FILE, "N") ITEM("check-new", OP_CHECK_NEW, NULL) ITEM("toggle-mailboxes", OP_TOGGLE_MAILBOXES, "\t") -#ifdef USE_NNTP - ITEM("reload-active", OP_LOAD_ACTIVE, "g") - ITEM("subscribe-pattern", OP_SUBSCRIBE_PATTERN, "S") - ITEM("unsubscribe-pattern", OP_UNSUBSCRIBE_PATTERN, "U") - ITEM("catchup", OP_CATCHUP, "y") - ITEM("uncatchup", OP_UNCATCHUP, "Y") -#endif ITEM("view-file", OP_BROWSER_VIEW_FILE, " ") ITEM("buffy-list", OP_BUFFY_LIST, ".") ITEM("create-mailbox", OP_CREATE_MAILBOX, "C") @@ -469,17 +406,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, "") - ITEM("chain-next", OP_MIX_CHAIN_NEXT, "") -ENDLIST -#endif /* MIXMASTER */ - #undef ENDLIST #undef ITEM #undef LIST