projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes in the sidebar format, was completely braindead.
[apps/madmutt.git]
/
compose.c
diff --git
a/compose.c
b/compose.c
index
630c6c9
..
d1a6098
100644
(file)
--- a/
compose.c
+++ b/
compose.c
@@
-114,9
+114,9
@@
static struct mapping_t ComposeNewsHelp[] = {
static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
int w=(COLS-SW)>blen?blen:COLS-SW;
static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
int w=(COLS-SW)>blen?blen:COLS-SW;
- m
utt_FormatString
(b, w, NONULL (AttachFormat), mutt_attach_fmt,
+ m
_strformat
(b, w, NONULL (AttachFormat), mutt_attach_fmt,
(unsigned long) (((ATTACHPTR **) menu->data)[num]),
(unsigned long) (((ATTACHPTR **) menu->data)[num]),
- M_FORMAT_STAT_FILE |
M_FORMAT_ARROWCURSOR
);
+ M_FORMAT_STAT_FILE |
(option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0)
);
}
static void redraw_crypt_lines (HEADER * msg)
}
static void redraw_crypt_lines (HEADER * msg)
@@
-201,7
+201,7
@@
static int check_attachments (ATTACHPTR ** idx, short idxlen)
{
int i, r;
struct stat st;
{
int i, r;
struct stat st;
- char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + S
HORT_S
TRING];
+ char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + STRING];
for (i = 0; i < idxlen; i++) {
m_strcpy(pretty, sizeof(pretty), idx[i]->content->filename);
for (i = 0; i < idxlen; i++) {
m_strcpy(pretty, sizeof(pretty), idx[i]->content->filename);
@@
-414,7
+414,7
@@
static const char *compose_format_str (char *buf, ssize_t buflen, char op,
const char *elsestring,
unsigned long data, format_flag flags)
{
const char *elsestring,
unsigned long data, format_flag flags)
{
- char fmt[S
HORT_STRING], tmp[SHORT_
STRING];
+ char fmt[S
TRING], tmp[
STRING];
int optional = (flags & M_FORMAT_OPTIONAL);
MUTTMENU *menu = (MUTTMENU *) data;
int optional = (flags & M_FORMAT_OPTIONAL);
MUTTMENU *menu = (MUTTMENU *) data;
@@
-461,8
+461,7
@@
static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
const char *p)
{
int w=(COLS-SW)>buflen?buflen:(COLS-SW);
const char *p)
{
int w=(COLS-SW)>buflen?buflen:(COLS-SW);
- mutt_FormatString (buf, w, p, compose_format_str,
- (unsigned long) menu, 0);
+ m_strformat(buf, w, p, compose_format_str, (unsigned long)menu, 0);
}
/* return values:
}
/* return values:
@@
-476,7
+475,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
ssize_t fcclen,
HEADER * cur __attribute__ ((unused)))
{ /* current message */
ssize_t fcclen,
HEADER * cur __attribute__ ((unused)))
{ /* current message */
- char helpstr[S
HORT_S
TRING];
+ char helpstr[STRING];
char buf[LONG_STRING];
char fname[_POSIX_PATH_MAX];
MUTTMENU *menu;
char buf[LONG_STRING];
char fname[_POSIX_PATH_MAX];
MUTTMENU *menu;