Add a mutt_error() when copy/save messages fails.

Avoid using "part" translations for the tag/untagged copy/save
combinations, even though that makes the code longer.

1 files changed, 34 insertions, 3 deletions

diff --git a/commands.c b/commands.c
index 70419dad..e8a34fa6 100644
--- a/commands.c
+++ b/commands.c
@@ -976,7 +976,7 @@ int mutt_save_message (HEADER *h, int delete, int decode, int decrypt)
         break;
       /* fatal error, abort */
       case -1:
-        goto cleanup;
+        goto errcleanup;
     }
   }
 #endif
@@ -994,7 +994,7 @@ int mutt_save_message (HEADER *h, int delete, int decode, int decrypt)
       if (_mutt_save_message(h, &ctx, delete, decode, decrypt) != 0)
       {
         mx_close_mailbox (&ctx, NULL);
-        goto cleanup;
+        goto errcleanup;
       }
     }
     else
@@ -1020,7 +1020,7 @@ int mutt_save_message (HEADER *h, int delete, int decode, int decrypt)
                                  &ctx, delete, decode, decrypt) != 0)
           {
             mx_close_mailbox (&ctx, NULL);
-            goto cleanup;
+            goto errcleanup;
           }
 	}
       }
@@ -1037,6 +1037,37 @@ int mutt_save_message (HEADER *h, int delete, int decode, int decrypt)
     rc = 0;
   }
 
+errcleanup:
+  if (rc != 0)
+  {
+    if (delete)
+    {
+      if (h)
+        /* L10N:
+           Message when an index/pager save operation fails for some reason.
+        */
+        mutt_error _("Error saving message");
+      else
+        /* L10N:
+           Message when an index tagged save operation fails for some reason.
+        */
+        mutt_error _("Error saving tagged messages");
+    }
+    else
+    {
+      if (h)
+        /* L10N:
+           Message when an index/pager copy operation fails for some reason.
+        */
+        mutt_error _("Error copying message");
+      else
+        /* L10N:
+           Message when an index tagged copy operation fails for some reason.
+        */
+        mutt_error _("Error copying tagged messages");
+    }
+  }
+
 cleanup:
   mutt_buffer_pool_release (&buf);
   return rc;