Remove refresh parameter from mutt_enter_fname().

Also remove it from mutt_save_message(), which used it to pass through
to mutt_enter_fname().  The callers of this already had redraw logic,
to which REDRAW_STATUS merely needed to be added.

diff --git a/commands.c b/commands.c
index 6df341fa1947b3da70fd1ff84cacdd821659624e..b6db01306967a1ec9b6f21fb7e5481290762e185 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -728,8 +728,7 @@ int _mutt_save_message (HEADER *h, CONTEXT *ctx, int delete, int decode, int dec
 }
 
 /* returns 0 if the copy/save was successful, or -1 on error/abort */
-int mutt_save_message (HEADER *h, int delete,
-                      int decode, int decrypt, int *redraw)
+int mutt_save_message (HEADER *h, int delete, int decode, int decrypt)
 {
   int i, need_buffy_cleanup;
   int need_passphrase = 0, app=0;
@@ -737,9 +736,6 @@ int mutt_save_message (HEADER *h, int delete,
   CONTEXT ctx;
   struct stat st;
 
-  *redraw = 0;
-
-
   snprintf (prompt, sizeof (prompt),
            decode  ? (delete ? _("Decode-save%s to mailbox") :
                       _("Decode-copy%s to mailbox")) :
@@ -787,17 +783,9 @@ int mutt_save_message (HEADER *h, int delete,
   }
 
   mutt_pretty_mailbox (buf, sizeof (buf));
-  if (mutt_enter_fname (prompt, buf, sizeof (buf), redraw, 0) == -1)
+  if (mutt_enter_fname (prompt, buf, sizeof (buf), 0) == -1)
     return -1;
 
-  if (*redraw != REDRAW_FULL)
-  {
-    if (!h)
-      *redraw = REDRAW_INDEX | REDRAW_STATUS;
-    else
-      *redraw = REDRAW_STATUS;
-  }
-
   if (!buf[0])
     return -1;
 

diff --git a/compose.c b/compose.c
index 2374d12c2211ddbca7be54ae879dc40c76de49cd..4b472959240eeb285f2bf9ce770cd13cdfd713af 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -801,8 +801,7 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
          numfiles = 0;
          files = NULL;
 
-         if (_mutt_enter_fname (prompt, fname, sizeof (fname),
-                       &menu->redraw, 0, 1, &files, &numfiles, MUTT_SEL_MULTI) == -1 ||
+         if (_mutt_enter_fname (prompt, fname, sizeof (fname), 0, 1, &files, &numfiles, MUTT_SEL_MULTI) == -1 ||
              *fname == '\0')
            break;
 
@@ -871,7 +870,7 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
            mutt_pretty_mailbox (fname, sizeof (fname));
          }
 
-         if (mutt_enter_fname (prompt, fname, sizeof (fname), &menu->redraw, 1) == -1 || !fname[0])
+         if (mutt_enter_fname (prompt, fname, sizeof (fname), 1) == -1 || !fname[0])
            break;
 
 #ifdef USE_NNTP
@@ -1380,7 +1379,7 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
        if (idxlen)
          msg->content = idx[0]->content;
        if (mutt_enter_fname (_("Write message to mailbox"), fname, sizeof (fname),
-                             &menu->redraw, 1) != -1 && fname[0])
+                             1) != -1 && fname[0])
        {
          mutt_message (_("Writing message to %s ..."), fname);
          mutt_expand_path (fname, sizeof (fname));

diff --git a/curs_lib.c b/curs_lib.c
index 1f29d92028b25049c247597414a7df1d387b1628..9b540066a10ae1a29a986af1c1f1bc9f82982eeb 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -805,8 +805,7 @@ int mutt_do_pager (const char *banner,
 }
 
 int _mutt_enter_fname (const char *prompt, char *buf, size_t blen,
-               int *redraw, int buffy, int multiple,
-               char ***files, int *numfiles, int flags)
+               int buffy, int multiple, char ***files, int *numfiles, int flags)
 {
   event_t ch;
 
@@ -833,7 +832,6 @@ int _mutt_enter_fname (const char *prompt, char *buf, size_t blen,
       flags = MUTT_SEL_FOLDER | (multiple ? MUTT_SEL_MULTI : 0);
 
     _mutt_select_file (buf, blen, flags, files, numfiles);
-    *redraw = REDRAW_FULL;
   }
   else
   {

diff --git a/curs_main.c b/curs_main.c
index 84d61655343f626cf58fad3d4abd495caa0e54ba..c56490f1a830ffa1b0bf3fd5041989c89c199ffe 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -1991,7 +1991,7 @@ int mutt_index_menu (void)
                  strfcpy(buf, Context->path, sizeof (buf));
                  mutt_buffy_vfolder (buf, sizeof (buf));
          }
-         mutt_enter_vfolder (cp, buf, sizeof (buf), &menu->redraw, 1);
+         mutt_enter_vfolder (cp, buf, sizeof (buf), 1);
          if (!buf[0])
          {
             mutt_window_clearline (MuttMessageWindow, 0);
@@ -2021,7 +2021,7 @@ int mutt_index_menu (void)
           * mail */
          mutt_buffy (buf, sizeof (buf));
 
-          if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
+          if (mutt_enter_fname (cp, buf, sizeof (buf), 1) == -1)
           {
             if (menu->menu == MENU_PAGER)
             {
@@ -2319,11 +2319,11 @@ int mutt_index_menu (void)
                               (op == OP_SAVE) || (op == OP_DECODE_SAVE),
                               (op == OP_DECODE_SAVE) || (op == OP_DECODE_COPY),
                               (op == OP_DECRYPT_SAVE) || (op == OP_DECRYPT_COPY) ||
-                              0,
-                              &menu->redraw) == 0 &&
+                              0) == 0 &&
             (op == OP_SAVE || op == OP_DECODE_SAVE || op == OP_DECRYPT_SAVE)
            )
        {
+          menu->redraw |= REDRAW_STATUS;
          if (tag)
            menu->redraw |= REDRAW_INDEX;
          else if (option (OPTRESOLVE))

diff --git a/pager.c b/pager.c
index 2f47215641308e7d2df45384e457479d38080dbd..3453b26ef5c4f95f744cf19df1b67981e7b535c8 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -2928,8 +2928,7 @@ search_next:
                               (ch == OP_SAVE) || (ch == OP_DECODE_SAVE),
                               (ch == OP_DECODE_SAVE) || (ch == OP_DECODE_COPY),
                               (ch == OP_DECRYPT_SAVE) || (ch == OP_DECRYPT_COPY) ||
-                              0,
-                              &pager_menu->redraw) == 0 && (ch == OP_SAVE || ch == OP_DECODE_SAVE
+                              0) == 0 && (ch == OP_SAVE || ch == OP_DECODE_SAVE
                                                 || ch == OP_DECRYPT_SAVE
                                                 ))
        {

diff --git a/protos.h b/protos.h
index 7d5e53886ffa95024b8684d2254c5601df11ff94..2c980ca5f01428aa1d18cfedb19a197543744948 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -315,9 +315,9 @@ int mutt_parent_message(CONTEXT *ctx, HEADER *hdr, int find_root);
 int mutt_prepare_template(FILE *fp, CONTEXT *ctx, HEADER *newhdr, HEADER *hdr, short resend);
 int mutt_resend_message(FILE *fp, CONTEXT *ctx, HEADER *cur);
 int mutt_compose_to_sender(HEADER *hdr);
-#define mutt_enter_fname(A,B,C,D,E) _mutt_enter_fname(A,B,C,D,E,0,NULL,NULL,0)
-#define mutt_enter_vfolder(A,B,C,D,E) _mutt_enter_fname(A,B,C,D,E,0,NULL,NULL,MUTT_SEL_VFOLDER)
-int _mutt_enter_fname(const char *prompt, char *buf, size_t blen, int *redraw, int buffy,
+#define mutt_enter_fname(A,B,C,D) _mutt_enter_fname(A,B,C,D,0,NULL,NULL,0)
+#define mutt_enter_vfolder(A,B,C,D) _mutt_enter_fname(A,B,C,D,0,NULL,NULL,MUTT_SEL_VFOLDER)
+int _mutt_enter_fname(const char *prompt, char *buf, size_t blen, int buffy,
                       int multiple, char ***files, int *numfiles, int flags);
 int mutt_enter_string(char *buf, size_t buflen, int col, int flags);
 int _mutt_enter_string(char *buf, size_t buflen, int col, int flags, int multiple,
@@ -371,7 +371,7 @@ int mutt_query_complete(char *buf, size_t buflen);
 int mutt_query_variables(LIST *queries);
 int mutt_save_attachment(FILE *fp, BODY *m, char *path, int flags, HEADER *hdr);
 int _mutt_save_message(HEADER *h, CONTEXT *ctx, int delete, int decode, int decrypt);
-int mutt_save_message(HEADER *h, int delete, int decode, int decrypt, int *redraw);
+int mutt_save_message(HEADER *h, int delete, int decode, int decrypt);
 int mutt_search_command(int cur, int op);
 #ifdef USE_SMTP
 int mutt_smtp_send(const ADDRESS *from, const ADDRESS *to, const ADDRESS *cc,