SOURCES: mutt-vvv.nntp.patch - don't change default bindings
qboosh
qboosh at pld-linux.org
Fri Jun 15 19:03:35 CEST 2007
Author: qboosh Date: Fri Jun 15 17:03:35 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- don't change default bindings
---- Files affected:
SOURCES:
mutt-vvv.nntp.patch (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SOURCES/mutt-vvv.nntp.patch
diff -u SOURCES/mutt-vvv.nntp.patch:1.6 SOURCES/mutt-vvv.nntp.patch:1.7
--- SOURCES/mutt-vvv.nntp.patch:1.6 Fri Jun 15 18:56:13 2007
+++ SOURCES/mutt-vvv.nntp.patch Fri Jun 15 19:03:30 2007
@@ -2583,26 +2583,24 @@
{ "change-folder", OP_MAIN_CHANGE_FOLDER, "c" },
{ "change-folder-readonly", OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" },
+#ifdef USE_NNTP
-+ { "change-newsgroup", OP_MAIN_CHANGE_GROUP, "i" },
++ { "change-newsgroup", OP_MAIN_CHANGE_GROUP, "I" },
+ { "change-newsgroup-readonly",OP_MAIN_CHANGE_GROUP_READONLY, "\033i" },
+#endif
{ "next-unread-mailbox", OP_MAIN_NEXT_UNREAD_MAILBOX, NULL },
{ "collapse-thread", OP_MAIN_COLLAPSE_THREAD, "\033v" },
{ "collapse-all", OP_MAIN_COLLAPSE_ALL, "\033V" },
-@@ -101,7 +105,15 @@ struct binding_t OpMain[] = { /* map: in
- { "edit", OP_EDIT_MESSAGE, "e" },
+@@ -102,6 +106,14 @@ struct binding_t OpMain[] = { /* map: in
{ "edit-type", OP_EDIT_TYPE, "\005" },
{ "forward-message", OP_FORWARD_MESSAGE, "f" },
-- { "flag-message", OP_FLAG_MESSAGE, "F" },
+ { "flag-message", OP_FLAG_MESSAGE, "F" },
+#ifdef USE_NNTP
+ { "forward-to-group", OP_FORWARD_TO_GROUP, "\033F" },
-+ { "followup-message", OP_FOLLOWUP, "F" },
++ { "followup-message", OP_FOLLOWUP, "\033f" },
+ { "get-children", OP_GET_CHILDREN, NULL },
+ { "get-message", OP_GET_MESSAGE, "\007" },
+ { "get-parent", OP_GET_PARENT, "\033G" },
+ { "reconstruct-thread", OP_RECONSTRUCT_THREAD, NULL },
+#endif
-+ { "flag-message", OP_FLAG_MESSAGE, "\033f" },
{ "group-reply", OP_GROUP_REPLY, "g" },
#ifdef USE_POP
{ "fetch-mail", OP_MAIN_FETCH_MAIL, "G" },
@@ -2611,7 +2609,7 @@
{ "sort-reverse", OP_SORT_REVERSE, "O" },
{ "print-message", OP_PRINT, "p" },
+#ifdef USE_NNTP
-+ { "post-message", OP_POST, "P" },
++ { "post-message", OP_POST, "\033m" },
+#endif
{ "previous-thread", OP_MAIN_PREV_THREAD, "\020" },
{ "previous-subthread", OP_MAIN_PREV_SUBTHREAD, "\033p" },
@@ -2627,65 +2625,44 @@
{ "display-message", OP_DISPLAY_MESSAGE, M_ENTER_S },
{ "buffy-list", OP_BUFFY_LIST, "." },
{ "sync-mailbox", OP_MAIN_SYNC_FOLDER, "$" },
-@@ -157,7 +176,7 @@ struct binding_t OpMain[] = { /* map: in
- { "previous-new-then-unread", OP_MAIN_PREV_NEW_THEN_UNREAD, "\033\t" },
- { "next-unread", OP_MAIN_NEXT_UNREAD, NULL },
- { "previous-unread", OP_MAIN_PREV_UNREAD, NULL },
-- { "parent-message", OP_MAIN_PARENT_MESSAGE, "P" },
-+ { "parent-message", OP_MAIN_PARENT_MESSAGE, NULL },
-
-
- { "extract-keys", OP_EXTRACT_KEYS, "\013" },
@@ -177,6 +196,10 @@ struct binding_t OpPager[] = { /* map: p
{ "bounce-message", OP_BOUNCE_MESSAGE, "b" },
{ "change-folder", OP_MAIN_CHANGE_FOLDER, "c" },
{ "change-folder-readonly", OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" },
+#ifdef USE_NNTP
-+ { "change-newsgroup", OP_MAIN_CHANGE_GROUP, "i" },
++ { "change-newsgroup", OP_MAIN_CHANGE_GROUP, "I" },
+ { "change-newsgroup-readonly",OP_MAIN_CHANGE_GROUP_READONLY, "\033i" },
+#endif
{ "next-unread-mailbox", OP_MAIN_NEXT_UNREAD_MAILBOX, NULL },
{ "copy-message", OP_COPY_MESSAGE, "C" },
{ "decode-copy", OP_DECODE_COPY, "\033C" },
-@@ -185,8 +208,12 @@ struct binding_t OpPager[] = { /* map: p
+@@ -185,6 +208,10 @@ struct binding_t OpPager[] = { /* map: p
{ "delete-subthread", OP_DELETE_SUBTHREAD, "\033d" },
{ "edit", OP_EDIT_MESSAGE, "e" },
{ "edit-type", OP_EDIT_TYPE, "\005" },
+#ifdef USE_NNTP
-+ { "followup-message", OP_FOLLOWUP, "F" },
++ { "followup-message", OP_FOLLOWUP, "\033f" },
+ { "forward-to-group", OP_FORWARD_TO_GROUP, "\033F" },
+#endif
{ "forward-message", OP_FORWARD_MESSAGE, "f" },
-- { "flag-message", OP_FLAG_MESSAGE, "F" },
-+ { "flag-message", OP_FLAG_MESSAGE, "\033f" },
+ { "flag-message", OP_FLAG_MESSAGE, "F" },
{ "group-reply", OP_GROUP_REPLY, "g" },
- #ifdef USE_IMAP
- { "imap-fetch-mail", OP_MAIN_IMAP_FETCH, NULL },
@@ -205,6 +232,9 @@ struct binding_t OpPager[] = { /* map: p
{ "next-thread", OP_MAIN_NEXT_THREAD, "\016" },
{ "next-subthread", OP_MAIN_NEXT_SUBTHREAD, "\033n" },
{ "print-message", OP_PRINT, "p" },
+#ifdef USE_NNTP
-+ { "post-message", OP_POST, "P" },
++ { "post-message", OP_POST, "\033m" },
+#endif
{ "previous-thread", OP_MAIN_PREV_THREAD, "\020" },
{ "previous-subthread",OP_MAIN_PREV_SUBTHREAD, "\033p" },
{ "quit", OP_QUIT, "Q" },
-@@ -252,7 +282,7 @@ struct binding_t OpPager[] = { /* map: p
- { "half-down", OP_HALF_DOWN, NULL },
- { "previous-line", OP_PREV_LINE, NULL },
- { "bottom", OP_PAGER_BOTTOM, NULL },
-- { "parent-message", OP_MAIN_PARENT_MESSAGE, "P" },
-+ { "parent-message", OP_MAIN_PARENT_MESSAGE, NULL },
-
-
-
@@ -272,6 +302,10 @@ struct binding_t OpAttach[] = { /* map:
{ "bounce-message", OP_BOUNCE_MESSAGE, "b" },
{ "display-toggle-weed", OP_DISPLAY_HEADERS, "h" },
{ "edit-type", OP_EDIT_TYPE, "\005" },
+#ifdef USE_NNTP
-+ { "followup-message", OP_FOLLOWUP, "F" },
++ { "followup-message", OP_FOLLOWUP, "\033f" },
+ { "forward-to-group", OP_FORWARD_TO_GROUP, "\033F" },
+#endif
{ "print-entry", OP_PRINT, "p" },
@@ -3250,17 +3227,6 @@
/*--*/
{ NULL }
};
-diff -udprP mutt-1.5.16.orig/keymap.c mutt-1.5.16/keymap.c
---- mutt-1.5.16.orig/keymap.c 2007-04-02 00:58:56.000000000 +0300
-+++ mutt-1.5.16/keymap.c 2007-06-15 17:12:26.000000000 +0300
-@@ -629,7 +629,6 @@ void km_init (void)
- km_bindkey ("<enter>", MENU_MAIN, OP_DISPLAY_MESSAGE);
-
- km_bindkey ("x", MENU_PAGER, OP_EXIT);
-- km_bindkey ("i", MENU_PAGER, OP_EXIT);
- km_bindkey ("<backspace>", MENU_PAGER, OP_PREV_LINE);
- km_bindkey ("<pagedown>", MENU_PAGER, OP_NEXT_PAGE);
- km_bindkey ("<pageup>", MENU_PAGER, OP_PREV_PAGE);
diff -udprP mutt-1.5.16.orig/mailbox.h mutt-1.5.16/mailbox.h
--- mutt-1.5.16.orig/mailbox.h 2007-04-02 00:58:56.000000000 +0300
+++ mutt-1.5.16/mailbox.h 2007-06-15 17:12:26.000000000 +0300
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mutt-vvv.nntp.patch?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list