SOURCES (DEVEL): mutt-vvv.nntp.patch - new version (http://www.mut...
qboosh
qboosh at pld-linux.org
Wed Aug 23 22:42:18 CEST 2006
Author: qboosh Date: Wed Aug 23 20:42:18 2006 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- new version (http://www.mutt.org.ua/download/mutt-1.5.13/patch-1.5.13.vvv.nntp.gz)
---- Files affected:
SOURCES:
mutt-vvv.nntp.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/mutt-vvv.nntp.patch
diff -u SOURCES/mutt-vvv.nntp.patch:1.1.2.1 SOURCES/mutt-vvv.nntp.patch:1.1.2.2
--- SOURCES/mutt-vvv.nntp.patch:1.1.2.1 Thu Mar 31 20:08:47 2005
+++ SOURCES/mutt-vvv.nntp.patch Wed Aug 23 22:42:13 2006
@@ -2,9 +2,6 @@
aclocal -I m4
autoheader
-cd m4
-make -f Makefile.am.in
-cd ..
automake --foreign
autoconf
@@ -12,10 +9,23 @@
Vsevolod Volkov <vvv at mutt.org.ua>
-diff -udprP mutt-1.5.9.orig/ChangeLog.nntp mutt-1.5.9/ChangeLog.nntp
---- mutt-1.5.9.orig/ChangeLog.nntp 1970-01-01 03:00:00.000000000 +0300
-+++ mutt-1.5.9/ChangeLog.nntp 2005-03-13 20:05:44.826894840 +0200
-@@ -0,0 +1,319 @@
+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 @@
++* Tue Aug 15 2006 Vsevolod Volkov <vvv at mutt.org.ua>
++- update to 1.5.13
++
++* Mon Jul 17 2006 Vsevolod Volkov <vvv at mutt.org.ua>
++- update to 1.5.12
++- fixed reading empty .newsrc
++
++* Sat Sep 17 2005 Vsevolod Volkov <vvv at mutt.org.ua>
++- update to 1.5.11
++
++* Sat Aug 13 2005 Vsevolod Volkov <vvv at mutt.org.ua>
++- update to 1.5.10
++
+* Sun Mar 13 2005 Vsevolod Volkov <vvv at mutt.org.ua>
+- update to 1.5.9
+
@@ -335,9 +345,10 @@
+
+* Fri Jan 28 2000 Vsevolod Volkov <vvv at mutt.kiev.ua>
+- update to 1.1.2
---- mutt-1.5.9/OPS.orig 2005-03-31 19:32:01.669609032 +0200
-+++ mutt-1.5.9/OPS 2005-03-31 19:53:57.119630232 +0200
-@@ -8,14 +8,16 @@
+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
+@@ -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"
@@ -356,7 +367,7 @@
OP_COMPOSE_EDIT_BCC "edit the BCC list"
OP_COMPOSE_EDIT_CC "edit the CC list"
OP_COMPOSE_EDIT_DESCRIPTION "edit attachment description"
-@@ -26,7 +28,10 @@
+@@ -26,7 +28,10 @@ OP_COMPOSE_EDIT_FROM "edit the from fiel
OP_COMPOSE_EDIT_HEADERS "edit the message with headers"
OP_COMPOSE_EDIT_MESSAGE "edit the message"
OP_COMPOSE_EDIT_MIME "edit attachment using mailcap entry"
@@ -367,7 +378,7 @@
OP_COMPOSE_EDIT_SUBJECT "edit the subject of this message"
OP_COMPOSE_EDIT_TO "edit the TO list"
OP_CREATE_MAILBOX "create a new mailbox (IMAP only)"
-@@ -86,8 +91,13 @@
+@@ -85,8 +90,13 @@ OP_EXIT "exit this menu"
OP_FILTER "filter attachment through a shell command"
OP_FIRST_ENTRY "move to the first entry"
OP_FLAG_MESSAGE "toggle a message's 'important' flag"
@@ -381,7 +392,7 @@
OP_GROUP_REPLY "reply to all recipients"
OP_HALF_DOWN "scroll down 1/2 page"
OP_HALF_UP "scroll up 1/2 page"
-@@ -95,13 +105,17 @@
+@@ -94,11 +104,14 @@ OP_HELP "this screen"
OP_JUMP "jump to an index number"
OP_LAST_ENTRY "move to the last entry"
OP_LIST_REPLY "reply to specified mailing list"
@@ -395,11 +406,8 @@
+OP_MAIN_CHANGE_GROUP_READONLY "open a different newsgroup in read only mode"
OP_MAIN_CLEAR_FLAG "clear a status flag from a message"
OP_MAIN_DELETE_PATTERN "delete messages matching a pattern"
-+OP_RECONSTRUCT_THREAD "reconstruct thread containing current message"
OP_MAIN_IMAP_FETCH "force retrieval of mail from IMAP server"
- OP_MAIN_FETCH_MAIL "retrieve mail from POP server"
- OP_MAIN_FIRST_MESSAGE "move to the first message"
-@@ -138,6 +152,7 @@
+@@ -136,6 +149,7 @@ OP_PAGER_HIDE_QUOTED "toggle display of
OP_PAGER_SKIP_QUOTED "skip beyond quoted text"
OP_PAGER_TOP "jump to the top of the message"
OP_PIPE "pipe message/attachment to a shell command"
@@ -407,8 +415,16 @@
OP_PREV_ENTRY "move to the previous entry"
OP_PREV_LINE "scroll up one line"
OP_PREV_PAGE "move to the previous page"
-@@ -164,18 +179,22 @@
- OP_SIG_SEARCH "search signatures matching a pattern"
+@@ -144,6 +158,7 @@ OP_QUERY "query external program for add
+ OP_QUERY_APPEND "append new query results to current results"
+ OP_QUIT "save changes to mailbox and quit"
+ OP_RECALL_MESSAGE "recall a postponed message"
++OP_RECONSTRUCT_THREAD "reconstruct thread containing current message"
+ OP_REDRAW "clear and redraw the screen"
+ OP_REFORMAT_WINCH "{internal}"
+ OP_RENAME_MAILBOX "rename the current mailbox (IMAP only)"
+@@ -158,18 +173,22 @@ OP_SEARCH_TOGGLE "toggle search pattern
+ OP_SHELL_ESCAPE "invoke a command in a subshell"
OP_SORT "sort messages"
OP_SORT_REVERSE "sort messages in reverse order"
+OP_SUBSCRIBE_PATTERN "subscribe to newsgroups matching a pattern"
@@ -430,15 +446,15 @@
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.9.orig/PATCHES mutt-1.5.9/PATCHES
---- mutt-1.5.9.orig/PATCHES 2005-03-13 18:33:06.000000000 +0200
-+++ mutt-1.5.9/PATCHES 2005-03-13 19:50:55.000000000 +0200
+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
@@ -0,0 +1 @@
+vvv.nntp
-diff -udprP mutt-1.5.9.orig/account.c mutt-1.5.9/account.c
---- mutt-1.5.9.orig/account.c 2005-02-03 20:47:52.000000000 +0200
-+++ mutt-1.5.9/account.c 2005-03-13 19:50:55.000000000 +0200
-@@ -48,6 +48,11 @@ int mutt_account_match (const ACCOUNT* a
+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
+@@ -54,6 +54,11 @@ int mutt_account_match (const ACCOUNT* a
user = PopUser;
#endif
@@ -450,7 +466,7 @@
if (a1->flags & a2->flags & M_ACCT_USER)
return (!strcmp (a1->user, a2->user));
if (a1->flags & M_ACCT_USER)
-@@ -117,6 +122,16 @@ void mutt_account_tourl (ACCOUNT* accoun
+@@ -123,6 +128,16 @@ void mutt_account_tourl (ACCOUNT* accoun
}
#endif
@@ -467,7 +483,7 @@
url->host = account->host;
if (account->flags & M_ACCT_PORT)
url->port = account->port;
-@@ -142,6 +157,10 @@ int mutt_account_getuser (ACCOUNT* accou
+@@ -148,6 +163,10 @@ int mutt_account_getuser (ACCOUNT* accou
else if ((account->type == M_ACCT_TYPE_POP) && PopUser)
strfcpy (account->user, PopUser, sizeof (account->user));
#endif
@@ -478,7 +494,7 @@
/* prompt (defaults to unix username), copy into account->user */
else
{
-@@ -171,6 +190,10 @@ int mutt_account_getpass (ACCOUNT* accou
+@@ -204,6 +223,10 @@ int mutt_account_getpass (ACCOUNT* accou
else if ((account->type == M_ACCT_TYPE_POP) && PopPass)
strfcpy (account->pass, PopPass, sizeof (account->pass));
#endif
@@ -489,9 +505,9 @@
else
{
snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "),
-diff -udprP mutt-1.5.9.orig/account.h mutt-1.5.9/account.h
---- mutt-1.5.9.orig/account.h 2003-07-16 14:20:43.000000000 +0300
-+++ mutt-1.5.9/account.h 2005-03-13 19:50:55.000000000 +0200
+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
{
M_ACCT_TYPE_NONE = 0,
@@ -500,20 +516,22 @@
M_ACCT_TYPE_POP
};
-diff -udprP mutt-1.5.9.orig/attach.h mutt-1.5.9/attach.h
---- mutt-1.5.9.orig/attach.h 2003-10-04 22:01:44.000000000 +0300
-+++ mutt-1.5.9/attach.h 2005-03-13 19:50:55.000000000 +0200
-@@ -30,5 +30,5 @@ void mutt_print_attachment_list (FILE *f
+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
+@@ -50,7 +50,7 @@ void mutt_print_attachment_list (FILE *f
void mutt_attach_bounce (FILE *, HEADER *, ATTACHPTR **, short, BODY *);
void mutt_attach_resend (FILE *, HEADER *, ATTACHPTR **, short, BODY *);
-void mutt_attach_forward (FILE *, HEADER *, ATTACHPTR **, short, BODY *);
+void mutt_attach_forward (FILE *, HEADER *, ATTACHPTR **, short, BODY *, int);
void mutt_attach_reply (FILE *, HEADER *, ATTACHPTR **, short, BODY *, int);
-diff -udprP mutt-1.5.9.orig/browser.c mutt-1.5.9/browser.c
---- mutt-1.5.9.orig/browser.c 2005-02-19 15:49:37.000000000 +0200
-+++ mutt-1.5.9/browser.c 2005-03-13 19:50:55.000000000 +0200
-@@ -31,6 +31,9 @@
+
+ #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
+@@ -32,6 +32,9 @@
#ifdef USE_IMAP
#include "imap.h"
#endif
@@ -523,7 +541,7 @@
#include <stdlib.h>
#include <dirent.h>
-@@ -48,6 +51,19 @@ static struct mapping_t FolderHelp[] = {
+@@ -49,6 +52,19 @@ static struct mapping_t FolderHelp[] = {
{ NULL }
};
@@ -543,7 +561,7 @@
typedef struct folder_t
{
struct folder_file *ff;
-@@ -113,9 +129,17 @@ static void browser_sort (struct browser
+@@ -114,9 +130,17 @@ static void browser_sort (struct browser
case SORT_ORDER:
return;
case SORT_DATE:
@@ -561,7 +579,7 @@
f = browser_compare_size;
break;
case SORT_SUBJECT:
-@@ -305,8 +329,106 @@ folder_format_str (char *dest, size_t de
+@@ -306,8 +330,106 @@ folder_format_str (char *dest, size_t de
return (src);
}
@@ -669,7 +687,7 @@
{
if (state->entrylen == state->entrymax)
{
-@@ -335,6 +457,10 @@ static void add_folder (MUTTMENU *m, str
+@@ -336,6 +458,10 @@ static void add_folder (MUTTMENU *m, str
#ifdef USE_IMAP
(state->entry)[state->entrylen].imap = 0;
#endif
@@ -680,7 +698,7 @@
(state->entrylen)++;
}
-@@ -350,9 +476,35 @@ static void init_state (struct browser_s
+@@ -351,9 +477,35 @@ static void init_state (struct browser_s
menu->data = state->entry;
}
@@ -716,7 +734,7 @@
struct stat s;
DIR *dp;
struct dirent *de;
-@@ -413,17 +565,40 @@ static int examine_directory (MUTTMENU *
+@@ -414,17 +566,40 @@ static int examine_directory (MUTTMENU *
tmp = Incoming;
while (tmp && mutt_strcmp (buffer, tmp->path))
tmp = tmp->next;
@@ -759,7 +777,7 @@
BUFFY *tmp = Incoming;
if (!Incoming)
-@@ -437,14 +612,21 @@ static int examine_mailboxes (MUTTMENU *
+@@ -438,14 +613,21 @@ static int examine_mailboxes (MUTTMENU *
#ifdef USE_IMAP
if (mx_is_imap (tmp->path))
{
@@ -783,7 +801,7 @@
continue;
}
#endif
-@@ -458,15 +640,20 @@ static int examine_mailboxes (MUTTMENU *
+@@ -459,15 +641,20 @@ static int examine_mailboxes (MUTTMENU *
strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
mutt_pretty_mailbox (buffer);
@@ -805,7 +823,7 @@
return (regexec (re, ((struct folder_file *) menu->data)[n].name, 0, NULL, 0));
}
-@@ -477,7 +664,13 @@ static void folder_entry (char *s, size_
+@@ -478,7 +665,13 @@ static void folder_entry (char *s, size_
folder.ff = &((struct folder_file *) menu->data)[num];
folder.num = num;
@@ -820,7 +838,7 @@
(unsigned long) &folder, M_FORMAT_ARROWCURSOR);
}
-@@ -497,6 +690,17 @@ static void init_menu (struct browser_st
+@@ -498,6 +691,17 @@ static void init_menu (struct browser_st
menu->tagged = 0;
@@ -838,7 +856,7 @@
if (buffy)
snprintf (title, titlelen, _("Mailboxes [%d]"), mutt_buffy_check (0));
else
-@@ -552,6 +756,31 @@ void _mutt_select_file (char *f, size_t
+@@ -553,6 +757,31 @@ void _mutt_select_file (char *f, size_t
if (!folder)
strfcpy (LastDirBackup, LastDir, sizeof (LastDirBackup));
@@ -870,7 +888,7 @@
if (*f)
{
mutt_expand_path (f, flen);
-@@ -640,6 +869,9 @@ void _mutt_select_file (char *f, size_t
+@@ -642,6 +871,9 @@ void _mutt_select_file (char *f, size_t
menu->tag = file_tag;
menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_FOLDER,
@@ -880,7 +898,7 @@
FolderHelp);
init_menu (&state, menu, title, sizeof (title), buffy);
-@@ -777,7 +1009,11 @@ void _mutt_select_file (char *f, size_t
+@@ -780,7 +1012,11 @@ void _mutt_select_file (char *f, size_t
}
}
@@ -892,7 +910,7 @@
{
strfcpy (f, state.entry[menu->current].name, flen);
mutt_expand_path (f, flen);
-@@ -835,14 +1071,6 @@ void _mutt_select_file (char *f, size_t
+@@ -838,14 +1074,6 @@ void _mutt_select_file (char *f, size_t
break;
#ifdef USE_IMAP
@@ -907,7 +925,7 @@
case OP_BROWSER_TOGGLE_LSUB:
if (option (OPTIMAPLSUB))
{
-@@ -934,6 +1162,11 @@ void _mutt_select_file (char *f, size_t
+@@ -944,6 +1172,11 @@ void _mutt_select_file (char *f, size_t
case OP_CHANGE_DIRECTORY:
@@ -919,7 +937,7 @@
strfcpy (buf, LastDir, sizeof (buf));
#ifdef USE_IMAP
if (!state.imap_browse)
-@@ -1187,6 +1420,190 @@ void _mutt_select_file (char *f, size_t
+@@ -1200,6 +1433,190 @@ void _mutt_select_file (char *f, size_t
else
mutt_error _("Error trying to view file");
}
@@ -1110,9 +1128,9 @@
}
}
-diff -udprP mutt-1.5.9.orig/browser.h mutt-1.5.9/browser.h
---- mutt-1.5.9.orig/browser.h 2002-12-11 13:19:39.000000000 +0200
-+++ mutt-1.5.9/browser.h 2005-03-13 19:50:55.000000000 +0200
+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
@@ -20,6 +20,10 @@
#ifndef _BROWSER_H
#define _BROWSER_H 1
@@ -1144,10 +1162,10 @@
#ifdef USE_IMAP
short imap_browse;
char *folder;
-diff -udprP mutt-1.5.9.orig/buffy.c mutt-1.5.9/buffy.c
---- mutt-1.5.9.orig/buffy.c 2005-02-03 20:47:52.000000000 +0200
-+++ mutt-1.5.9/buffy.c 2005-03-13 19:50:55.000000000 +0200
-@@ -291,6 +291,9 @@ int mutt_buffy_check (int force)
+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)
#ifdef USE_POP
if (!Context || Context->magic != M_POP)
#endif
@@ -1157,7 +1175,7 @@
/* check device ID and serial number instead of comparing paths */
if (!Context || !Context->path || stat (Context->path, &contex_sb) != 0)
{
-@@ -312,6 +315,11 @@ int mutt_buffy_check (int force)
+@@ -316,6 +319,11 @@ int mutt_buffy_check (int force)
tmp->magic = M_POP;
else
#endif
@@ -1169,7 +1187,7 @@
if (stat (tmp->path, &sb) != 0 || sb.st_size == 0 ||
(!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0))
{
-@@ -328,25 +336,21 @@ int mutt_buffy_check (int force)
+@@ -335,25 +343,21 @@ int mutt_buffy_check (int force)
/* check to see if the folder is the currently selected folder
* before polling */
if (!Context || !Context->path ||
@@ -1205,21 +1223,9 @@
{
switch (tmp->magic)
{
-@@ -413,6 +417,11 @@ int mutt_buffy_check (int force)
- case M_POP:
- break;
- #endif
-+
-+#ifdef USE_NNTP
-+ case M_NNTP:
-+ break;
-+#endif
- }
- }
- #ifdef BUFFY_SIZE
-diff -udprP mutt-1.5.9.orig/complete.c mutt-1.5.9/complete.c
---- mutt-1.5.9.orig/complete.c 2005-02-03 20:47:52.000000000 +0200
-+++ mutt-1.5.9/complete.c 2005-03-13 19:50:55.000000000 +0200
+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
@@ -25,6 +25,9 @@
#include "mailbox.h"
#include "imap.h"
@@ -1302,9 +1308,9 @@
/* we can use '/' as a delimiter, imap_complete rewrites it */
if (*s == '=' || *s == '+' || *s == '!')
{
-diff -udprP mutt-1.5.9.orig/compose.c mutt-1.5.9/compose.c
---- mutt-1.5.9.orig/compose.c 2005-02-03 20:47:52.000000000 +0200
-+++ mutt-1.5.9/compose.c 2005-03-13 19:50:55.000000000 +0200
+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
@@ -32,10 +32,15 @@
#include "mailbox.h"
#include "sort.h"
@@ -1321,16 +1327,13 @@
#include <errno.h>
#include <string.h>
-@@ -60,18 +65,24 @@ enum
+@@ -60,18 +65,21 @@ enum
HDR_REPLYTO,
HDR_FCC,
-#ifdef MIXMASTER
- HDR_MIX,
-#endif
-+#ifdef MIXMASTER
-+ HDR_MIX,
-+#endif
HDR_CRYPT,
HDR_CRYPTINFO,
@@ -1559,7 +1562,7 @@
case OP_COMPOSE_EDIT_SUBJECT:
if (msg->env->subject)
strfcpy (buf, msg->env->subject, sizeof (buf));
-@@ -706,6 +840,9 @@ int mutt_compose_menu (HEADER *msg, /*
+@@ -707,6 +841,9 @@ int mutt_compose_menu (HEADER *msg, /*
break;
case OP_COMPOSE_ATTACH_MESSAGE:
@@ -1569,7 +1572,7 @@
{
char *prompt;
HEADER *h;
-@@ -713,7 +850,22 @@ int mutt_compose_menu (HEADER *msg, /*
+@@ -714,7 +851,22 @@ int mutt_compose_menu (HEADER *msg, /*
fname[0] = 0;
prompt = _("Open mailbox to attach message from");
@@ -1592,7 +1595,7 @@
{
strfcpy (fname, NONULL (Context->path), sizeof (fname));
mutt_pretty_mailbox (fname);
-@@ -722,6 +874,11 @@ int mutt_compose_menu (HEADER *msg, /*
+@@ -723,6 +875,11 @@ int mutt_compose_menu (HEADER *msg, /*
if (mutt_enter_fname (prompt, fname, sizeof (fname), &menu->redraw, 1) == -1 || !fname[0])
break;
@@ -1604,7 +1607,7 @@
mutt_expand_path (fname, sizeof (fname));
#ifdef USE_IMAP
if (!mx_is_imap (fname))
-@@ -729,6 +886,9 @@ int mutt_compose_menu (HEADER *msg, /*
+@@ -730,6 +887,9 @@ int mutt_compose_menu (HEADER *msg, /*
#ifdef USE_POP
if (!mx_is_pop (fname))
#endif
@@ -1614,9 +1617,9 @@
/* check to make sure the file exists and is readable */
if (access (fname, R_OK) == -1)
{
-diff -udprP mutt-1.5.9.orig/config.h.in mutt-1.5.9/config.h.in
---- mutt-1.5.9.orig/config.h.in 2005-03-13 18:37:09.000000000 +0200
-+++ mutt-1.5.9/config.h.in 2005-03-13 19:50:55.000000000 +0200
+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 @@
significant more memory when defined. */
#undef EXACT_ADDRESS
@@ -1627,12 +1630,12 @@
/* program to use for shell commands */
#undef EXECSHELL
-diff -udprP mutt-1.5.9.orig/configure.in mutt-1.5.9/configure.in
---- mutt-1.5.9.orig/configure.in 2005-03-13 18:36:01.000000000 +0200
-+++ mutt-1.5.9/configure.in 2005-03-13 19:50:55.000000000 +0200
-@@ -510,6 +510,14 @@ AC_ARG_ENABLE(imap, AC_HELP_STRING([--en
- ])
- AM_CONDITIONAL(BUILD_IMAP, test x$need_imap = xyes)
+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_
+ MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS bcache.o"
+ fi
+AC_ARG_ENABLE(nntp, [ --enable-nntp Enable NNTP support],
+[ if test x$enableval = xyes ; then
@@ -1645,18 +1648,18 @@
dnl -- end socket dependencies --
if test "$need_socket" = "yes"
-diff -udprP mutt-1.5.9.orig/curs_main.c mutt-1.5.9/curs_main.c
---- mutt-1.5.9.orig/curs_main.c 2005-02-28 20:36:35.000000000 +0200
-+++ mutt-1.5.9/curs_main.c 2005-03-13 19:50:55.000000000 +0200
+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
@@ -22,6 +22,7 @@
#include "mutt.h"
#include "mutt_curses.h"
+#include "mx.h"
#include "mutt_menu.h"
+ #include "attach.h"
#include "mailbox.h"
- #include "mapping.h"
-@@ -39,6 +40,10 @@
+@@ -40,6 +41,10 @@
#include "mutt_crypt.h"
@@ -1667,7 +1670,7 @@
#include <ctype.h>
#include <stdlib.h>
-@@ -409,12 +414,27 @@ struct mapping_t IndexHelp[] = {
+@@ -415,12 +420,27 @@ struct mapping_t IndexHelp[] = {
{ NULL }
};
@@ -1695,7 +1698,7 @@
int op = OP_NULL;
int done = 0; /* controls when to exit the "event" loop */
int i = 0, j;
-@@ -436,7 +456,11 @@ int mutt_index_menu (void)
+@@ -442,7 +462,11 @@ int mutt_index_menu (void)
menu->make_entry = index_make_entry;
menu->color = index_color;
menu->current = ci_first_message ();
@@ -1708,7 +1711,7 @@
if (!attach_msg)
mutt_buffy_check(1); /* force the buffy check after we enter the folder */
-@@ -684,6 +708,9 @@ int mutt_index_menu (void)
+@@ -694,6 +718,9 @@ int mutt_index_menu (void)
mutt_curs_set (1); /* fallback from the pager */
}
@@ -1718,7 +1721,7 @@
switch (op)
{
-@@ -734,6 +761,120 @@ int mutt_index_menu (void)
+@@ -744,6 +771,120 @@ int mutt_index_menu (void)
menu_current_bottom (menu);
break;
@@ -1839,13 +1842,13 @@
case OP_JUMP:
CHECK_MSGCOUNT;
-@@ -834,11 +975,33 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
+@@ -841,11 +982,33 @@ int mutt_index_menu (void)
break;
case OP_MAIN_LIMIT:
+ case OP_TOGGLE_READ:
- CHECK_MSGCOUNT;
+ CHECK_IN_MAILBOX;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mutt-vvv.nntp.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
More information about the pld-cvs-commit
mailing list