SOURCES: mutt-vvv.nntp.patch - updated from http://mutt.org.ua/dow...
qboosh
qboosh at pld-linux.org
Sun Jun 3 14:06:24 CEST 2007
Author: qboosh Date: Sun Jun 3 12:06:24 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated from http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.nntp.2.gz
---- Files affected:
SOURCES:
mutt-vvv.nntp.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/mutt-vvv.nntp.patch
diff -u SOURCES/mutt-vvv.nntp.patch:1.2 SOURCES/mutt-vvv.nntp.patch:1.3
--- SOURCES/mutt-vvv.nntp.patch:1.2 Mon Mar 26 15:14:04 2007
+++ SOURCES/mutt-vvv.nntp.patch Sun Jun 3 14:06:19 2007
@@ -9,10 +9,22 @@
Vsevolod Volkov <vvv at mutt.org.ua>
-diff -udprP mutt-1.5.13.orig/ChangeLog.nntp mutt-1.5.13/ChangeLog.nntp
---- mutt-1.5.13.orig/ChangeLog.nntp 1970-01-01 03:00:00.000000000 +0300
-+++ mutt-1.5.13/ChangeLog.nntp 2006-08-15 13:12:32.000000000 +0300
-@@ -0,0 +1,332 @@
+diff -udprP mutt-1.5.15.orig/ChangeLog.nntp mutt-1.5.15/ChangeLog.nntp
+--- mutt-1.5.15.orig/ChangeLog.nntp 1970-01-01 03:00:00.000000000 +0300
++++ mutt-1.5.15/ChangeLog.nntp 2007-04-11 17:33:57.000000000 +0300
+@@ -0,0 +1,344 @@
++* Wed Apr 11 2007 Vsevolod Volkov <vvv at mutt.org.ua>
++- fixed posting error if $smtp_url is set
++- added support of print-style sequence %R (x-comment-to)
++
++* Sun Apr 8 2007 Vsevolod Volkov <vvv at mutt.org.ua>
++- update to 1.5.15
++- nntp://... url changed to news://...
++- added indicator of fetching descriptions progress
++
++* Tue Feb 28 2007 Vsevolod Volkov <vvv at mutt.org.ua>
++- update to 1.5.14
++
+* Tue Aug 15 2006 Vsevolod Volkov <vvv at mutt.org.ua>
+- update to 1.5.13
+
@@ -345,23 +357,23 @@
+
+* Fri Jan 28 2000 Vsevolod Volkov <vvv at mutt.kiev.ua>
+- update to 1.1.2
-diff -udprP mutt-1.5.13.orig/OPS mutt-1.5.13/OPS
---- mutt-1.5.13.orig/OPS 2005-07-24 19:56:42.000000000 +0300
-+++ mutt-1.5.13/OPS 2006-08-15 13:04:56.000000000 +0300
+diff -udprP mutt-1.5.15.orig/OPS mutt-1.5.15/OPS
+--- mutt-1.5.15.orig/OPS 2007-04-02 00:58:55.000000000 +0300
++++ mutt-1.5.15/OPS 2007-04-11 17:25:15.000000000 +0300
@@ -8,14 +8,16 @@ OP_BOUNCE_MESSAGE "remail a message to a
OP_BROWSER_NEW_FILE "select a new file in this directory"
OP_BROWSER_VIEW_FILE "view file"
OP_BROWSER_TELL "display the currently selected file's name"
-OP_BROWSER_SUBSCRIBE "subscribe to current mailbox (IMAP only)"
--OP_BROWSER_UNSUBSCRIBE "unsubscribe to current mailbox (IMAP only)"
-+OP_BROWSER_SUBSCRIBE "subscribe to current (IMAP/NNTP only)"
-+OP_BROWSER_UNSUBSCRIBE "unsubscribe to current (IMAP/NNTP only)"
+-OP_BROWSER_UNSUBSCRIBE "unsubscribe from current mailbox (IMAP only)"
++OP_BROWSER_SUBSCRIBE "subscribe to current mbox (IMAP/NNTP only)"
++OP_BROWSER_UNSUBSCRIBE "unsubscribe from current mbox (IMAP/NNTP only)"
OP_BROWSER_TOGGLE_LSUB "toggle view all/subscribed mailboxes (IMAP only)"
OP_BUFFY_LIST "list mailboxes with new mail"
+OP_CATCHUP "mark all articles in newsgroup as read"
OP_CHANGE_DIRECTORY "change directories"
OP_CHECK_NEW "check mailboxes for new mail"
- OP_COMPOSE_ATTACH_FILE "attach a file(s) to this message"
+ OP_COMPOSE_ATTACH_FILE "attach file(s) to this message"
OP_COMPOSE_ATTACH_MESSAGE "attach message(s) to this message"
+OP_COMPOSE_ATTACH_NEWS_MESSAGE "attach newsmessage(s) to this message"
OP_COMPOSE_EDIT_BCC "edit the BCC list"
@@ -446,14 +458,14 @@
OP_VERSION "show the Mutt version number and date"
OP_VIEW_ATTACH "view attachment using mailcap entry if necessary"
OP_VIEW_ATTACHMENTS "show MIME attachments"
-diff -udprP mutt-1.5.13.orig/PATCHES mutt-1.5.13/PATCHES
---- mutt-1.5.13.orig/PATCHES 2006-08-11 13:55:43.000000000 +0300
-+++ mutt-1.5.13/PATCHES 2006-08-15 13:04:56.000000000 +0300
+diff -udprP mutt-1.5.15.orig/PATCHES mutt-1.5.15/PATCHES
+--- mutt-1.5.15.orig/PATCHES 2007-03-15 17:49:37.000000000 +0200
++++ mutt-1.5.15/PATCHES 2007-04-11 17:25:15.000000000 +0300
@@ -0,0 +1 @@
+vvv.nntp
-diff -udprP mutt-1.5.13.orig/account.c mutt-1.5.13/account.c
---- mutt-1.5.13.orig/account.c 2005-09-18 11:22:21.000000000 +0300
-+++ mutt-1.5.13/account.c 2006-08-15 13:04:56.000000000 +0300
+diff -udprP mutt-1.5.15.orig/account.c mutt-1.5.15/account.c
+--- mutt-1.5.15.orig/account.c 2007-04-02 00:58:55.000000000 +0300
++++ mutt-1.5.15/account.c 2007-04-11 17:25:15.000000000 +0300
@@ -54,6 +54,11 @@ int mutt_account_match (const ACCOUNT* a
user = PopUser;
#endif
@@ -466,7 +478,7 @@
if (a1->flags & a2->flags & M_ACCT_USER)
return (!strcmp (a1->user, a2->user));
if (a1->flags & M_ACCT_USER)
-@@ -123,6 +128,16 @@ void mutt_account_tourl (ACCOUNT* accoun
+@@ -133,6 +138,16 @@ void mutt_account_tourl (ACCOUNT* accoun
}
#endif
@@ -483,7 +495,7 @@
url->host = account->host;
if (account->flags & M_ACCT_PORT)
url->port = account->port;
-@@ -148,6 +163,10 @@ int mutt_account_getuser (ACCOUNT* accou
+@@ -158,6 +173,10 @@ int mutt_account_getuser (ACCOUNT* accou
else if ((account->type == M_ACCT_TYPE_POP) && PopUser)
strfcpy (account->user, PopUser, sizeof (account->user));
#endif
@@ -494,7 +506,7 @@
/* prompt (defaults to unix username), copy into account->user */
else
{
-@@ -204,6 +223,10 @@ int mutt_account_getpass (ACCOUNT* accou
+@@ -214,6 +233,10 @@ int mutt_account_getpass (ACCOUNT* accou
else if ((account->type == M_ACCT_TYPE_POP) && PopPass)
strfcpy (account->pass, PopPass, sizeof (account->pass));
#endif
@@ -505,20 +517,22 @@
else
{
snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "),
-diff -udprP mutt-1.5.13.orig/account.h mutt-1.5.13/account.h
---- mutt-1.5.13.orig/account.h 2005-09-18 11:22:21.000000000 +0300
-+++ mutt-1.5.13/account.h 2006-08-15 13:04:56.000000000 +0300
-@@ -28,6 +28,7 @@ enum
- {
+diff -udprP mutt-1.5.15.orig/account.h mutt-1.5.15/account.h
+--- mutt-1.5.15.orig/account.h 2007-04-02 00:58:55.000000000 +0300
++++ mutt-1.5.15/account.h 2007-04-11 17:25:15.000000000 +0300
+@@ -29,7 +29,8 @@ enum
M_ACCT_TYPE_NONE = 0,
M_ACCT_TYPE_IMAP,
-+ M_ACCT_TYPE_NNTP,
- M_ACCT_TYPE_POP
+ M_ACCT_TYPE_POP,
+- M_ACCT_TYPE_SMTP
++ M_ACCT_TYPE_SMTP,
++ M_ACCT_TYPE_NNTP
};
-diff -udprP mutt-1.5.13.orig/attach.h mutt-1.5.13/attach.h
---- mutt-1.5.13.orig/attach.h 2005-09-18 11:22:21.000000000 +0300
-+++ mutt-1.5.13/attach.h 2006-08-15 13:04:56.000000000 +0300
+ /* account flags */
+diff -udprP mutt-1.5.15.orig/attach.h mutt-1.5.15/attach.h
+--- mutt-1.5.15.orig/attach.h 2007-04-02 00:58:55.000000000 +0300
++++ mutt-1.5.15/attach.h 2007-04-11 17:25:15.000000000 +0300
@@ -50,7 +50,7 @@ void mutt_print_attachment_list (FILE *f
void mutt_attach_bounce (FILE *, HEADER *, ATTACHPTR **, short, BODY *);
@@ -528,9 +542,9 @@
void mutt_attach_reply (FILE *, HEADER *, ATTACHPTR **, short, BODY *, int);
#endif /* _ATTACH_H_ */
-diff -udprP mutt-1.5.13.orig/browser.c mutt-1.5.13/browser.c
---- mutt-1.5.13.orig/browser.c 2006-08-06 01:17:37.000000000 +0300
-+++ mutt-1.5.13/browser.c 2006-08-15 13:04:56.000000000 +0300
+diff -udprP mutt-1.5.15.orig/browser.c mutt-1.5.15/browser.c
+--- mutt-1.5.15.orig/browser.c 2007-04-03 07:57:21.000000000 +0300
++++ mutt-1.5.15/browser.c 2007-04-11 17:25:15.000000000 +0300
@@ -32,6 +32,9 @@
#ifdef USE_IMAP
#include "imap.h"
@@ -775,14 +789,14 @@
+#endif
+ {
BUFFY *tmp = Incoming;
-
- if (!Incoming)
-@@ -438,14 +613,21 @@ static int examine_mailboxes (MUTTMENU *
#ifdef USE_IMAP
+ struct mailbox_state mbox;
+@@ -442,14 +617,21 @@ static int examine_mailboxes (MUTTMENU *
if (mx_is_imap (tmp->path))
{
-- add_folder (menu, state, tmp->path, NULL, tmp->new);
-+ add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
+ imap_mailbox_state (tmp->path, &mbox);
+- add_folder (menu, state, tmp->path, NULL, mbox.new);
++ add_folder (menu, state, tmp->path, NULL, NULL, mbox.new);
continue;
}
#endif
@@ -801,7 +815,7 @@
continue;
}
#endif
-@@ -459,15 +641,20 @@ static int examine_mailboxes (MUTTMENU *
+@@ -463,15 +645,20 @@ static int examine_mailboxes (MUTTMENU *
strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
mutt_pretty_mailbox (buffer);
@@ -823,7 +837,7 @@
return (regexec (re, ((struct folder_file *) menu->data)[n].name, 0, NULL, 0));
}
-@@ -478,7 +665,13 @@ static void folder_entry (char *s, size_
+@@ -482,7 +669,13 @@ static void folder_entry (char *s, size_
folder.ff = &((struct folder_file *) menu->data)[num];
folder.num = num;
@@ -838,7 +852,7 @@
(unsigned long) &folder, M_FORMAT_ARROWCURSOR);
}
-@@ -498,6 +691,17 @@ static void init_menu (struct browser_st
+@@ -502,6 +695,17 @@ static void init_menu (struct browser_st
menu->tagged = 0;
@@ -856,7 +870,7 @@
if (buffy)
snprintf (title, titlelen, _("Mailboxes [%d]"), mutt_buffy_check (0));
else
-@@ -553,6 +757,31 @@ void _mutt_select_file (char *f, size_t
+@@ -557,6 +761,31 @@ void _mutt_select_file (char *f, size_t
if (!folder)
strfcpy (LastDirBackup, LastDir, sizeof (LastDirBackup));
@@ -888,7 +902,7 @@
if (*f)
{
mutt_expand_path (f, flen);
-@@ -642,6 +871,9 @@ void _mutt_select_file (char *f, size_t
+@@ -646,6 +875,9 @@ void _mutt_select_file (char *f, size_t
menu->tag = file_tag;
menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_FOLDER,
@@ -898,7 +912,7 @@
FolderHelp);
init_menu (&state, menu, title, sizeof (title), buffy);
-@@ -780,7 +1012,11 @@ void _mutt_select_file (char *f, size_t
+@@ -784,7 +1016,11 @@ void _mutt_select_file (char *f, size_t
}
}
@@ -910,7 +924,7 @@
{
strfcpy (f, state.entry[menu->current].name, flen);
mutt_expand_path (f, flen);
-@@ -838,14 +1074,6 @@ void _mutt_select_file (char *f, size_t
+@@ -842,14 +1078,6 @@ void _mutt_select_file (char *f, size_t
break;
#ifdef USE_IMAP
@@ -925,7 +939,7 @@
case OP_BROWSER_TOGGLE_LSUB:
if (option (OPTIMAPLSUB))
{
-@@ -944,6 +1172,11 @@ void _mutt_select_file (char *f, size_t
+@@ -948,6 +1176,11 @@ void _mutt_select_file (char *f, size_t
case OP_CHANGE_DIRECTORY:
@@ -937,7 +951,7 @@
strfcpy (buf, LastDir, sizeof (buf));
#ifdef USE_IMAP
if (!state.imap_browse)
-@@ -1200,6 +1433,190 @@ void _mutt_select_file (char *f, size_t
+@@ -1204,6 +1437,190 @@ void _mutt_select_file (char *f, size_t
else
mutt_error _("Error trying to view file");
}
@@ -1128,9 +1142,9 @@
}
}
-diff -udprP mutt-1.5.13.orig/browser.h mutt-1.5.13/browser.h
---- mutt-1.5.13.orig/browser.h 2005-09-18 11:22:21.000000000 +0300
-+++ mutt-1.5.13/browser.h 2006-08-15 13:04:56.000000000 +0300
+diff -udprP mutt-1.5.15.orig/browser.h mutt-1.5.15/browser.h
+--- mutt-1.5.15.orig/browser.h 2007-04-03 07:57:21.000000000 +0300
++++ mutt-1.5.15/browser.h 2007-04-11 17:25:15.000000000 +0300
@@ -20,6 +20,10 @@
#ifndef _BROWSER_H
#define _BROWSER_H 1
@@ -1162,10 +1176,10 @@
#ifdef USE_IMAP
short imap_browse;
char *folder;
-diff -udprP mutt-1.5.13.orig/buffy.c mutt-1.5.13/buffy.c
---- mutt-1.5.13.orig/buffy.c 2006-05-18 21:44:28.000000000 +0300
-+++ mutt-1.5.13/buffy.c 2006-08-15 13:04:56.000000000 +0300
-@@ -293,6 +293,9 @@ int mutt_buffy_check (int force)
+diff -udprP mutt-1.5.15.orig/buffy.c mutt-1.5.15/buffy.c
+--- mutt-1.5.15.orig/buffy.c 2007-04-02 00:58:55.000000000 +0300
++++ mutt-1.5.15/buffy.c 2007-04-11 17:25:15.000000000 +0300
+@@ -285,6 +285,9 @@ int mutt_buffy_check (int force)
#ifdef USE_POP
if (!Context || Context->magic != M_POP)
#endif
@@ -1175,7 +1189,7 @@
/* check device ID and serial number instead of comparing paths */
if (!Context || !Context->path || stat (Context->path, &contex_sb) != 0)
{
-@@ -316,6 +319,11 @@ int mutt_buffy_check (int force)
+@@ -308,6 +311,11 @@ int mutt_buffy_check (int force)
tmp->magic = M_POP;
else
#endif
@@ -1187,7 +1201,7 @@
if (stat (tmp->path, &sb) != 0 || sb.st_size == 0 ||
(!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0))
{
-@@ -335,25 +343,21 @@ int mutt_buffy_check (int force)
+@@ -325,25 +333,21 @@ int mutt_buffy_check (int force)
/* check to see if the folder is the currently selected folder
* before polling */
if (!Context || !Context->path ||
@@ -1223,9 +1237,9 @@
{
switch (tmp->magic)
{
-diff -udprP mutt-1.5.13.orig/complete.c mutt-1.5.13/complete.c
---- mutt-1.5.13.orig/complete.c 2005-09-18 11:22:21.000000000 +0300
-+++ mutt-1.5.13/complete.c 2006-08-15 13:04:56.000000000 +0300
+diff -udprP mutt-1.5.15.orig/complete.c mutt-1.5.15/complete.c
+--- mutt-1.5.15.orig/complete.c 2007-04-02 00:58:55.000000000 +0300
++++ mutt-1.5.15/complete.c 2007-04-11 17:25:15.000000000 +0300
@@ -25,6 +25,9 @@
#include "mailbox.h"
#include "imap.h"
@@ -1308,9 +1322,9 @@
/* we can use '/' as a delimiter, imap_complete rewrites it */
if (*s == '=' || *s == '+' || *s == '!')
{
-diff -udprP mutt-1.5.13.orig/compose.c mutt-1.5.13/compose.c
---- mutt-1.5.13.orig/compose.c 2005-09-18 11:22:21.000000000 +0300
-+++ mutt-1.5.13/compose.c 2006-08-15 13:04:56.000000000 +0300
+diff -udprP mutt-1.5.15.orig/compose.c mutt-1.5.15/compose.c
+--- mutt-1.5.15.orig/compose.c 2007-04-02 00:58:55.000000000 +0300
++++ mutt-1.5.15/compose.c 2007-04-11 17:25:15.000000000 +0300
@@ -32,10 +32,15 @@
#include "mailbox.h"
#include "sort.h"
@@ -1617,10 +1631,10 @@
/* check to make sure the file exists and is readable */
if (access (fname, R_OK) == -1)
{
-diff -udprP mutt-1.5.13.orig/config.h.in mutt-1.5.13/config.h.in
---- mutt-1.5.13.orig/config.h.in 2006-08-14 17:09:46.000000000 +0300
-+++ mutt-1.5.13/config.h.in 2006-08-15 13:04:56.000000000 +0300
-@@ -37,6 +37,9 @@
+diff -udprP mutt-1.5.15.orig/config.h.in mutt-1.5.15/config.h.in
+--- mutt-1.5.15.orig/config.h.in 2007-04-06 10:18:47.000000000 +0300
++++ mutt-1.5.15/config.h.in 2007-04-11 17:25:15.000000000 +0300
+@@ -34,6 +34,9 @@
significant more memory when defined. */
#undef EXACT_ADDRESS
@@ -1630,10 +1644,10 @@
/* program to use for shell commands */
#undef EXECSHELL
-diff -udprP mutt-1.5.13.orig/configure.in mutt-1.5.13/configure.in
---- mutt-1.5.13.orig/configure.in 2006-08-14 17:09:18.000000000 +0300
-+++ mutt-1.5.13/configure.in 2006-08-15 13:04:56.000000000 +0300
-@@ -574,6 +574,14 @@ if test x"$need_imap" = xyes -o x"$need_
+diff -udprP mutt-1.5.15.orig/configure.ac mutt-1.5.15/configure.ac
+--- mutt-1.5.15.orig/configure.ac 2007-04-06 10:11:53.000000000 +0300
++++ mutt-1.5.15/configure.ac 2007-04-11 17:25:15.000000000 +0300
+@@ -584,6 +584,14 @@ if test x"$need_imap" = xyes -o x"$need_
MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS bcache.o"
fi
@@ -1648,9 +1662,9 @@
dnl -- end socket dependencies --
if test "$need_socket" = "yes"
-diff -udprP mutt-1.5.13.orig/curs_main.c mutt-1.5.13/curs_main.c
---- mutt-1.5.13.orig/curs_main.c 2006-06-08 14:50:29.000000000 +0300
-+++ mutt-1.5.13/curs_main.c 2006-08-15 13:04:56.000000000 +0300
+diff -udprP mutt-1.5.15.orig/curs_main.c mutt-1.5.15/curs_main.c
+--- mutt-1.5.15.orig/curs_main.c 2007-04-03 20:41:14.000000000 +0300
++++ mutt-1.5.15/curs_main.c 2007-04-11 17:25:15.000000000 +0300
@@ -22,6 +22,7 @@
#include "mutt.h"
@@ -1693,7 +1707,7 @@
*/
int mutt_index_menu (void)
{
- char buf[LONG_STRING], helpstr[SHORT_STRING];
+ char buf[LONG_STRING], helpstr[LONG_STRING];
+ int flags;
int op = OP_NULL;
int done = 0; /* controls when to exit the "event" loop */
@@ -1965,9 +1979,9 @@
mutt_clear_error ();
mutt_buffy_check(1); /* force the buffy check after we have changed
the folder */
-@@ -1509,6 +1706,15 @@ int mutt_index_menu (void)
- }
- #endif
+@@ -1500,6 +1697,15 @@ int mutt_index_menu (void)
+ CHECK_READONLY;
+ CHECK_ACL(M_ACL_WRITE, _("flag message"));
+#ifdef USE_NNTP
+ if (Context->magic == M_NNTP)
@@ -1981,7 +1995,7 @@
if (tag)
{
for (j = 0; j < Context->vcount; j++)
-@@ -1856,6 +2062,17 @@ int mutt_index_menu (void)
+@@ -1847,6 +2053,17 @@ int mutt_index_menu (void)
}
break;
@@ -1999,8 +2013,8 @@
case OP_DISPLAY_ADDRESS:
CHECK_MSGCOUNT;
-@@ -1890,6 +2107,15 @@ int mutt_index_menu (void)
- break;
+@@ -1974,6 +2191,15 @@ int mutt_index_menu (void)
+ menu->redraw = (tag ? REDRAW_INDEX : REDRAW_CURRENT) | REDRAW_STATUS;
}
#endif
+
@@ -2013,9 +2027,9 @@
+ }
+#endif
- if (option (OPTPGPAUTODEC) && (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
- mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
-@@ -2063,6 +2289,37 @@ int mutt_index_menu (void)
+ MAYBE_REDRAW (menu->redraw);
+ break;
+@@ -2045,6 +2271,37 @@ int mutt_index_menu (void)
menu->redraw = REDRAW_FULL;
break;
@@ -2053,9 +2067,9 @@
case OP_REPLY:
-@@ -2136,6 +2393,12 @@ int mutt_index_menu (void)
+@@ -2118,6 +2375,12 @@ int mutt_index_menu (void)
CHECK_READONLY;
- CHECK_IMAP_ACL(IMAP_ACL_DELETE);
+ CHECK_ACL(M_ACL_DELETE, _("undelete message(s)"));
+#ifdef USE_NNTP
+ /* Close all open NNTP connections */
@@ -2066,10 +2080,10 @@
rc = mutt_thread_set_flag (CURHDR, M_DELETE, 0,
op == OP_UNDELETE_THREAD ? 0 : 1);
-diff -udprP mutt-1.5.13.orig/doc/manual.xml.head mutt-1.5.13/doc/manual.xml.head
---- mutt-1.5.13.orig/doc/manual.xml.head 2006-08-11 12:23:28.000000000 +0300
-+++ mutt-1.5.13/doc/manual.xml.head 2006-08-15 13:04:56.000000000 +0300
-@@ -1204,6 +1204,22 @@ have a look at the mixmaster documentati
+diff -udprP mutt-1.5.15.orig/doc/manual.xml.head mutt-1.5.15/doc/manual.xml.head
+--- mutt-1.5.15.orig/doc/manual.xml.head 2007-04-04 08:37:13.000000000 +0300
++++ mutt-1.5.15/doc/manual.xml.head 2007-04-11 17:25:15.000000000 +0300
+@@ -1295,6 +1295,22 @@ fo-table</literal> for details.
</sect2>
@@ -2092,9 +2106,9 @@
</sect1>
<sect1 id="forwarding-mail">
-diff -udprP mutt-1.5.13.orig/doc/mutt.man mutt-1.5.13/doc/mutt.man
---- mutt-1.5.13.orig/doc/mutt.man 2005-09-18 11:22:22.000000000 +0300
-+++ mutt-1.5.13/doc/mutt.man 2006-08-15 13:04:56.000000000 +0300
+diff -udprP mutt-1.5.15.orig/doc/mutt.man mutt-1.5.15/doc/mutt.man
+--- mutt-1.5.15.orig/doc/mutt.man 2007-04-04 08:37:13.000000000 +0300
++++ mutt-1.5.15/doc/mutt.man 2007-04-11 17:25:15.000000000 +0300
@@ -23,8 +23,8 @@ mutt \- The Mutt Mail User Agent
.SH SYNOPSIS
.PP
@@ -2106,7 +2120,7 @@
.PP
.B mutt
[-nx]
-@@ -75,6 +75,10 @@ files.
+@@ -83,6 +83,10 @@ files.
Specify which mailbox to load.
.IP "-F \fImuttrc\fP"
Specify an initialization file to read instead of ~/.muttrc
@@ -2117,10 +2131,10 @@
.IP "-h"
Display help.
.IP "-H \fIdraft\fP"
-diff -udprP mutt-1.5.13.orig/functions.h mutt-1.5.13/functions.h
---- mutt-1.5.13.orig/functions.h 2005-09-18 11:22:21.000000000 +0300
-+++ mutt-1.5.13/functions.h 2006-08-15 13:04:56.000000000 +0300
-@@ -72,6 +72,10 @@ struct binding_t OpMain[] = {
+diff -udprP mutt-1.5.15.orig/functions.h mutt-1.5.15/functions.h
+--- mutt-1.5.15.orig/functions.h 2007-04-02 00:58:55.000000000 +0300
++++ mutt-1.5.15/functions.h 2007-04-11 17:25:15.000000000 +0300
+@@ -88,6 +88,10 @@ struct binding_t OpMain[] = { /* map: in
{ "break-thread", OP_MAIN_BREAK_THREAD, "#" },
{ "change-folder", OP_MAIN_CHANGE_FOLDER, "c" },
{ "change-folder-readonly", OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" },
@@ -2131,7 +2145,7 @@
{ "collapse-thread", OP_MAIN_COLLAPSE_THREAD, "\033v" },
{ "collapse-all", OP_MAIN_COLLAPSE_ALL, "\033V" },
{ "copy-message", OP_COPY_MESSAGE, "C" },
-@@ -84,7 +88,15 @@ struct binding_t OpMain[] = {
+@@ -100,7 +104,15 @@ struct binding_t OpMain[] = { /* map: in
{ "edit", OP_EDIT_MESSAGE, "e" },
{ "edit-type", OP_EDIT_TYPE, "\005" },
{ "forward-message", OP_FORWARD_MESSAGE, "f" },
@@ -2148,7 +2162,7 @@
{ "group-reply", OP_GROUP_REPLY, "g" },
#ifdef USE_POP
{ "fetch-mail", OP_MAIN_FETCH_MAIL, "G" },
-@@ -110,6 +122,9 @@ struct binding_t OpMain[] = {
+@@ -126,6 +138,9 @@ struct binding_t OpMain[] = { /* map: in
{ "sort-mailbox", OP_SORT, "o" },
{ "sort-reverse", OP_SORT_REVERSE, "O" },
{ "print-message", OP_PRINT, "p" },
@@ -2158,7 +2172,7 @@
{ "previous-thread", OP_MAIN_PREV_THREAD, "\020" },
{ "previous-subthread", OP_MAIN_PREV_SUBTHREAD, "\033p" },
{ "recall-message", OP_RECALL_MESSAGE, "R" },
-@@ -129,6 +144,10 @@ struct binding_t OpMain[] = {
+@@ -145,6 +160,10 @@ struct binding_t OpMain[] = { /* map: in
{ "show-version", OP_VERSION, "V" },
{ "set-flag", OP_MAIN_SET_FLAG, "w" },
{ "clear-flag", OP_MAIN_CLEAR_FLAG, "W" },
@@ -2169,7 +2183,7 @@
{ "display-message", OP_DISPLAY_MESSAGE, M_ENTER_S },
{ "buffy-list", OP_BUFFY_LIST, "." },
{ "sync-mailbox", OP_MAIN_SYNC_FOLDER, "$" },
-@@ -140,7 +159,7 @@ struct binding_t OpMain[] = {
+@@ -156,7 +175,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 },
@@ -2178,7 +2192,7 @@
{ "extract-keys", OP_EXTRACT_KEYS, "\013" },
-@@ -160,6 +179,10 @@ struct binding_t OpPager[] = {
+@@ -176,6 +195,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" },
@@ -2189,7 +2203,7 @@
{ "copy-message", OP_COPY_MESSAGE, "C" },
{ "decode-copy", OP_DECODE_COPY, "\033C" },
{ "delete-message", OP_DELETE, "d" },
-@@ -167,8 +190,12 @@ struct binding_t OpPager[] = {
+@@ -183,8 +206,12 @@ struct binding_t OpPager[] = { /* map: p
{ "delete-subthread", OP_DELETE_SUBTHREAD, "\033d" },
{ "edit", OP_EDIT_MESSAGE, "e" },
{ "edit-type", OP_EDIT_TYPE, "\005" },
@@ -2203,7 +2217,7 @@
{ "group-reply", OP_GROUP_REPLY, "g" },
#ifdef USE_IMAP
{ "imap-fetch-mail", OP_MAIN_IMAP_FETCH, NULL },
-@@ -187,6 +214,9 @@ struct binding_t OpPager[] = {
+@@ -203,6 +230,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" },
@@ -2213,7 +2227,7 @@
{ "previous-thread", OP_MAIN_PREV_THREAD, "\020" },
{ "previous-subthread",OP_MAIN_PREV_SUBTHREAD, "\033p" },
{ "quit", OP_QUIT, "Q" },
-@@ -234,7 +264,7 @@ struct binding_t OpPager[] = {
+@@ -250,7 +280,7 @@ struct binding_t OpPager[] = { /* map: p
{ "half-down", OP_HALF_DOWN, NULL },
{ "previous-line", OP_PREV_LINE, NULL },
{ "bottom", OP_PAGER_BOTTOM, NULL },
@@ -2222,7 +2236,7 @@
-@@ -254,6 +284,10 @@ struct binding_t OpAttach[] = {
+@@ -270,6 +300,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" },
@@ -2233,15 +2247,15 @@
{ "print-entry", OP_PRINT, "p" },
{ "save-entry", OP_SAVE, "s" },
{ "pipe-entry", OP_PIPE, "|" },
-@@ -279,6 +313,7 @@ struct binding_t OpAttach[] = {
- struct binding_t OpCompose[] = {
+@@ -295,6 +329,7 @@ struct binding_t OpAttach[] = { /* map:
+ struct binding_t OpCompose[] = { /* map: compose */
{ "attach-file", OP_COMPOSE_ATTACH_FILE, "a" },
{ "attach-message", OP_COMPOSE_ATTACH_MESSAGE, "A" },
+ { "attach-news-message",OP_COMPOSE_ATTACH_NEWS_MESSAGE,"\033a" },
{ "edit-bcc", OP_COMPOSE_EDIT_BCC, "b" },
{ "edit-cc", OP_COMPOSE_EDIT_CC, "c" },
{ "copy-file", OP_SAVE, "C" },
-@@ -298,6 +333,11 @@ struct binding_t OpCompose[] = {
+@@ -314,6 +349,11 @@ struct binding_t OpCompose[] = { /* map:
{ "print-entry", OP_PRINT, "l" },
{ "edit-mime", OP_COMPOSE_EDIT_MIME, "m" },
{ "new-mime", OP_COMPOSE_NEW_MIME, "n" },
@@ -2253,7 +2267,7 @@
{ "postpone-message", OP_COMPOSE_POSTPONE_MESSAGE, "P" },
{ "edit-reply-to", OP_COMPOSE_EDIT_REPLY_TO, "r" },
{ "rename-file", OP_COMPOSE_RENAME_FILE, "R" },
-@@ -349,14 +389,25 @@ struct binding_t OpBrowser[] = {
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mutt-vvv.nntp.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list