Trash folder replaces rmmproc. Rework of rmm(1) and refile(1).

[mmh] / uip / whatnow.c

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 75d9a9b..6e58052 100644 (file)
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -625,9 +625,6 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
                else
                        snprintf(linkpath, sizeof(linkpath), "%s/%s",
                                        cwd, altmsglink);
-       }
-
-       if (altmsg) {
                unlink(linkpath);
 #ifdef HAVE_LSTAT
                if (link(altpath, linkpath) == NOTOK) {
@@ -674,9 +671,9 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 
        default:
                if ((status = pidwait(pid, NOTOK))) {
-                       if (((status & 0xff00) != 0xff00)
-                               && (!reedit || (status & 0x00ff))) {
-                               if (!use && (status & 0xff00) && (rename(file, cp = m_backup (file)) != NOTOK)) {
+                       if (((status & 0xff00) != 0xff00) &&
+                                       (!reedit || (status & 0x00ff))) {
+                               if (!use && (status & 0xff00) && (rename(file, cp = m_backup(file)) != NOTOK)) {
                                        advise(NULL, "problems with edit--draft left in %s", cp);
                                } else {
                                        advise(NULL, "problems with edit--%s preserved", file);