projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
compose.c
diff --git
a/compose.c
b/compose.c
index
d4d3403
..
377d60e
100644
(file)
--- a/
compose.c
+++ b/
compose.c
@@
-26,6
+26,7
@@
#include "sort.h"
#include "charset.h"
#include "mx.h"
#include "sort.h"
#include "charset.h"
#include "mx.h"
+#include "buffy.h"
#include "compose.h"
#ifdef MIXMASTER
#include "compose.h"
#ifdef MIXMASTER
@@
-220,14
+221,14
@@
static void redraw_mix_line (LIST * chain)
if (t && t[0] == '0' && t[1] == '\0')
t = "<random>";
if (t && t[0] == '0' && t[1] == '\0')
t = "<random>";
- if (c +
safe
_strlen (t) + 2 >= COLS - SidebarWidth)
+ if (c +
mutt
_strlen (t) + 2 >= COLS - SidebarWidth)
break;
addstr (NONULL (t));
if (chain->next)
addstr (", ");
break;
addstr (NONULL (t));
if (chain->next)
addstr (", ");
- c +=
safe
_strlen (t) + 2;
+ c +=
mutt
_strlen (t) + 2;
}
}
#endif /* MIXMASTER */
}
}
#endif /* MIXMASTER */
@@
-562,7
+563,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
ComposeHelp);
if (option (OPTMBOXPANE))
ComposeHelp);
if (option (OPTMBOXPANE))
-
mutt_
buffy_check (1);
+ buffy_check (1);
while (loop) {
#ifdef USE_NNTP
unset_option (OPTNEWS); /* for any case */
while (loop) {
#ifdef USE_NNTP
unset_option (OPTNEWS); /* for any case */
@@
-617,8
+618,8
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
FREE (&msg->env->newsgroups);
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
FREE (&msg->env->newsgroups);
-
mutt_remove_trailing_
ws (buf);
- msg->env->newsgroups = safe_strdup (
mutt_skip_whitespace
(buf));
+
str_skip_trail
ws (buf);
+ msg->env->newsgroups = safe_strdup (
str_skip_initws
(buf));
move (HDR_TO, HDR_XOFFSET);
clrtoeol ();
if (msg->env->newsgroups)
move (HDR_TO, HDR_XOFFSET);
clrtoeol ();
if (msg->env->newsgroups)
@@
-635,8
+636,8
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
FREE (&msg->env->followup_to);
if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
FREE (&msg->env->followup_to);
-
mutt_remove_trailing_
ws (buf);
- msg->env->followup_to = safe_strdup (
mutt_skip_whitespace
(buf));
+
str_skip_trail
ws (buf);
+ msg->env->followup_to = safe_strdup (
str_skip_initws
(buf));
move (HDR_CC, HDR_XOFFSET);
clrtoeol ();
if (msg->env->followup_to)
move (HDR_CC, HDR_XOFFSET);
clrtoeol ();
if (msg->env->followup_to)
@@
-693,7
+694,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_MESSAGE:
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_MESSAGE:
- if (Editor && (
safe
_strcmp ("builtin", Editor) != 0)
+ if (Editor && (
mutt
_strcmp ("builtin", Editor) != 0)
&& !option (OPTEDITHDRS)) {
mutt_edit_file (Editor, msg->content->filename);
mutt_update_encoding (msg->content);
&& !option (OPTEDITHDRS)) {
mutt_edit_file (Editor, msg->content->filename);
mutt_update_encoding (msg->content);
@@
-703,7
+704,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
}
/* fall through */
case OP_COMPOSE_EDIT_HEADERS:
}
/* fall through */
case OP_COMPOSE_EDIT_HEADERS:
- if (
safe
_strcmp ("builtin", Editor) != 0 &&
+ if (
mutt
_strcmp ("builtin", Editor) != 0 &&
(op == OP_COMPOSE_EDIT_HEADERS ||
(op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
char *tag = NULL, *err = NULL;
(op == OP_COMPOSE_EDIT_HEADERS ||
(op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
char *tag = NULL, *err = NULL;
@@
-862,13
+863,13
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
#endif
mutt_expand_path (fname, sizeof (fname));
#ifdef USE_IMAP
#endif
mutt_expand_path (fname, sizeof (fname));
#ifdef USE_IMAP
- if (
!mx_is_imap (fname)
)
+ if (
mx_get_magic (fname) != M_IMAP
)
#endif
#ifdef USE_POP
#endif
#ifdef USE_POP
- if (
!mx_is_pop (fname)
)
+ if (
mx_get_magic (fname) != M_POP
)
#endif
#ifdef USE_NNTP
#endif
#ifdef USE_NNTP
- if (
!mx_is_nntp (fname)
&& !option (OPTNEWS))
+ if (
mx_get_magic (fname) != M_NNTP
&& !option (OPTNEWS))
#endif
/* check to make sure the file exists and is readable */
if (access (fname, R_OK) == -1) {
#endif
/* check to make sure the file exists and is readable */
if (access (fname, R_OK) == -1) {