Link Here
|
1 |
--- globals.h.orig 2006-08-11 12:07:12.000000000 +0300 |
1 |
--- globals.h 2007-01-30 21:49:02.000000000 +0200 |
2 |
+++ globals.h 2006-12-14 12:26:14.000000000 +0200 |
2 |
+++ globals.h 2007-03-01 14:14:45.000000000 +0200 |
3 |
@@ -50,6 +50,7 @@ |
3 |
@@ -50,6 +50,7 @@ |
4 |
WHERE char *FolderFormat; |
4 |
WHERE char *FolderFormat; |
5 |
WHERE char *ForwFmt; |
5 |
WHERE char *ForwFmt; |
Link Here
|
8 |
WHERE char *HdrFmt; |
8 |
WHERE char *HdrFmt; |
9 |
WHERE char *Homedir; |
9 |
WHERE char *Homedir; |
10 |
WHERE char *Hostname; |
10 |
WHERE char *Hostname; |
11 |
--- hdrline.c.orig 2006-04-28 22:43:51.000000000 +0300 |
11 |
--- hdrline.c 2006-04-29 22:10:52.000000000 +0300 |
12 |
+++ hdrline.c 2006-12-14 16:47:16.000000000 +0200 |
12 |
+++ hdrline.c 2007-03-01 14:14:45.000000000 +0200 |
13 |
@@ -730,3 +730,61 @@ |
13 |
@@ -730,3 +730,61 @@ |
14 |
|
14 |
|
15 |
mutt_FormatString (dest, destlen, s, hdr_format_str, (unsigned long) &hfi, flags); |
15 |
mutt_FormatString (dest, destlen, s, hdr_format_str, (unsigned long) &hfi, flags); |
Link Here
|
72 |
+ |
72 |
+ |
73 |
+ return(src); |
73 |
+ return(src); |
74 |
+} |
74 |
+} |
75 |
--- init.h.orig 2006-08-11 12:04:04.000000000 +0300 |
75 |
--- init.h 2006-11-20 19:49:08.000000000 +0200 |
76 |
+++ init.h 2006-12-14 16:49:16.000000000 +0200 |
76 |
+++ init.h 2007-03-01 14:14:45.000000000 +0200 |
77 |
@@ -710,6 +710,22 @@ |
77 |
@@ -695,6 +695,22 @@ |
78 |
** a regular expression that will match the whole name so mutt will expand |
78 |
** .pp |
79 |
** "Franklin" to "Franklin, Steve". |
79 |
** Defaults to the contents of the environment variable EMAIL. |
80 |
*/ |
80 |
*/ |
81 |
+ { "greeting", DT_STR, R_NONE, UL &Greeting, UL "" }, |
81 |
+ { "greeting", DT_STR, R_NONE, UL &Greeting, UL "" }, |
82 |
+ /* |
82 |
+ /* |
Link Here
|
94 |
+ ** .dt %v .dd first name of recipient |
94 |
+ ** .dt %v .dd first name of recipient |
95 |
+ ** .de |
95 |
+ ** .de |
96 |
+ */ |
96 |
+ */ |
97 |
{ "hdr_format", DT_SYN, R_NONE, UL "index_format", 0 }, |
97 |
{ "gecos_mask", DT_RX, R_NONE, UL &GecosMask, UL "^[^,]*" }, |
98 |
/* |
98 |
/* |
99 |
*/ |
99 |
** .pp |
100 |
--- PATCHES.orig 2006-08-11 13:55:43.000000000 +0300 |
100 |
--- PATCHES 2006-10-30 04:30:55.000000000 +0200 |
101 |
+++ PATCHES 2006-12-14 15:59:14.000000000 +0200 |
101 |
+++ PATCHES 2007-03-01 14:14:45.000000000 +0200 |
102 |
@@ -0,0 +1 @@ |
102 |
@@ -0,0 +1 @@ |
103 |
+vc.greeting |
103 |
+vc.greeting |
104 |
--- protos.h.orig 2006-07-12 02:32:28.000000000 +0300 |
104 |
--- protos.h 2007-01-30 21:49:03.000000000 +0200 |
105 |
+++ protos.h 2006-12-14 15:43:09.000000000 +0200 |
105 |
+++ protos.h 2007-03-01 14:14:45.000000000 +0200 |
106 |
@@ -509,4 +509,5 @@ |
106 |
@@ -504,4 +504,5 @@ |
107 |
void ci_bounce_message (HEADER *, int *); |
107 |
void ci_bounce_message (HEADER *, int *); |
108 |
int ci_send_message (int, HEADER *, char *, CONTEXT *, HEADER *); |
108 |
int ci_send_message (int, HEADER *, char *, CONTEXT *, HEADER *); |
109 |
|
109 |
|
110 |
- |
110 |
- |
111 |
+const char *greeting_string (char *, size_t, char, const char *, const char *, |
111 |
+const char *greeting_string (char *, size_t, char, const char *, const char *, |
112 |
+ const char *, const char *, unsigned long, format_flag); |
112 |
+ const char *, const char *, unsigned long, format_flag); |
113 |
--- send.c.orig 2006-03-03 12:12:34.000000000 +0200 |
113 |
--- send.c 2006-10-03 05:48:58.000000000 +0300 |
114 |
+++ send.c 2006-12-14 15:57:36.000000000 +0200 |
114 |
+++ send.c 2007-03-01 14:14:45.000000000 +0200 |
115 |
@@ -395,6 +395,18 @@ |
115 |
@@ -395,6 +395,18 @@ |
116 |
} |
116 |
} |
117 |
} |
117 |
} |
Link Here
|
131 |
void mutt_make_post_indent (CONTEXT *ctx, HEADER *cur, FILE *out) |
131 |
void mutt_make_post_indent (CONTEXT *ctx, HEADER *cur, FILE *out) |
132 |
{ |
132 |
{ |
133 |
char buffer[STRING]; |
133 |
char buffer[STRING]; |
134 |
@@ -1268,6 +1280,7 @@ |
134 |
@@ -1269,6 +1281,7 @@ |
135 |
if (option (OPTHDRS)) |
135 |
if (option (OPTHDRS)) |
136 |
process_user_header (msg->env); |
136 |
process_user_header (msg->env); |