projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New way to connect a job_t.
[apps/madmutt.git]
/
commands.c
diff --git
a/commands.c
b/commands.c
index
7dcb21b
..
f15ca1c
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-18,7
+18,6
@@
#include <lib-lua/lib-lua.h>
#include <lib-ui/lib-ui.h>
#include <lib-lua/lib-lua.h>
#include <lib-ui/lib-ui.h>
-#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
@@
-92,10
+91,6
@@
int mutt_display_message (HEADER * cur)
}
}
}
}
- if (cmflags & M_CM_VERIFY || cur->security & ENCRYPT) {
- crypt_invoke_message(cur->security);
- }
-
res = _mutt_copy_message (fpout, msg->fp, cur, cur->content, cmflags,
(option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
CH_DECODE | CH_FROM);
res = _mutt_copy_message (fpout, msg->fp, cur, cur->content, cmflags,
(option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
CH_DECODE | CH_FROM);
@@
-220,13
+215,10
@@
void ci_bounce_message (HEADER * h, int *redraw)
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
address_list_wipe(&adr);
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
address_list_wipe(&adr);
- CLEARLINE(stdscr, LINES - 1);
mutt_message (h ? _("Message not bounced.") : _("Messages not bounced."));
return;
}
mutt_message (h ? _("Message not bounced.") : _("Messages not bounced."));
return;
}
- CLEARLINE(stdscr, LINES - 1);
-
rc = mutt_bounce_message (NULL, h, adr);
address_list_wipe(&adr);
/* If no error, or background, display message. */
rc = mutt_bounce_message (NULL, h, adr);
address_list_wipe(&adr);
/* If no error, or background, display message. */
@@
-441,7
+433,7
@@
int mutt_select_sort (int reverse)
if (reverse)
Sort |= SORT_REVERSE;
if (reverse)
Sort |= SORT_REVERSE;
- return
(Sort != method ? 0 : -1)
; /* no need to resort if it's the same */
+ return
Sort != method ? 0 : -1
; /* no need to resort if it's the same */
}
/* invoke a command in a subshell */
}
/* invoke a command in a subshell */
@@
-454,7
+446,6
@@
void mutt_shell_escape (void)
if (!buf[0])
m_strcpy(buf, sizeof(buf), mod_core.shell);
if (buf[0]) {
if (!buf[0])
m_strcpy(buf, sizeof(buf), mod_core.shell);
if (buf[0]) {
- CLEARLINE(stdscr, LINES - 1);
mutt_endwin (NULL);
fflush (stdout);
if (mutt_system (buf) != 0 || option (OPTWAITKEY))
mutt_endwin (NULL);
fflush (stdout);
if (mutt_system (buf) != 0 || option (OPTWAITKEY))
@@
-566,7
+557,7
@@
int _mutt_save_message (HEADER * h, CONTEXT * ctx, int delete, int decode,
mutt_set_flag (Context, h, M_TAG, 0);
mutt_set_flag (Context, h, M_APPENDED, 1);
}
mutt_set_flag (Context, h, M_TAG, 0);
mutt_set_flag (Context, h, M_APPENDED, 1);
}
- return
(0)
;
+ return
0
;
}
/* returns 0 if the copy/save was successful, or -1 on error/abort */
}
/* returns 0 if the copy/save was successful, or -1 on error/abort */
@@
-619,7
+610,7
@@
int mutt_save_message (HEADER * h, int delete,
mutt_pretty_mailbox (buf);
if (mutt_enter_fname (prompt, buf, sizeof (buf), redraw, 0) == -1)
mutt_pretty_mailbox (buf);
if (mutt_enter_fname (prompt, buf, sizeof (buf), redraw, 0) == -1)
- return
(-1)
;
+ return
-1
;
if (*redraw != REDRAW_FULL) {
if (!h)
if (*redraw != REDRAW_FULL) {
if (!h)
@@
-629,7
+620,7
@@
int mutt_save_message (HEADER * h, int delete,
}
if (!buf[0])
}
if (!buf[0])
- return
(-1)
;
+ return
-1
;
/* This is an undocumented feature of ELM pointed out to me by Felix von
* Leitner <leitner@prz.fu-berlin.de>
/* This is an undocumented feature of ELM pointed out to me by Felix von
* Leitner <leitner@prz.fu-berlin.de>
@@
-666,7
+657,7
@@
int mutt_save_message (HEADER * h, int delete,
if (h) {
if (_mutt_save_message (h, &ctx, delete, decode, decrypt) != 0) {
mx_close_mailbox (&ctx, NULL);
if (h) {
if (_mutt_save_message (h, &ctx, delete, decode, decrypt) != 0) {
mx_close_mailbox (&ctx, NULL);
- return
(-1)
;
+ return
-1
;
}
} else {
for (i = 0; i < Context->vcount; i++) {
}
} else {
for (i = 0; i < Context->vcount; i++) {
@@
-676,7
+667,7
@@
int mutt_save_message (HEADER * h, int delete,
if (_mutt_save_message (Context->hdrs[Context->v2r[i]], &ctx, delete,
decode, decrypt) != 0) {
mx_close_mailbox (&ctx, NULL);
if (_mutt_save_message (Context->hdrs[Context->v2r[i]], &ctx, delete,
decode, decrypt) != 0) {
mx_close_mailbox (&ctx, NULL);
- return
(-1)
;
+ return
-1
;
}
}
}
}
}
}
@@
-698,17
+689,12
@@
int mutt_save_message (HEADER * h, int delete,
}
mutt_clear_error ();
}
mutt_clear_error ();
- return
(0)
;
+ return
0
;
}
return -1;
}
}
return -1;
}
-void mutt_version (void)
-{
- mutt_message (mutt_make_version());
-}
-
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
{
char buf[LONG_STRING];
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
{
char buf[LONG_STRING];