Added -[no]changecur switches to mhfixmsg(1).

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index 5889557..cf247de 100644 (file)
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -25,6 +25,7 @@ NEW FEATURES
 - When building from source, configure will derive ${prefix} from an existing
   nmh installation if it finds one in your $PATH.
 - Added getmymbox and getmyaddr mh-format(5) function escapes.
 - When building from source, configure will derive ${prefix} from an existing
   nmh installation if it finds one in your $PATH.
 - Added getmymbox and getmyaddr mh-format(5) function escapes.

+- The -changecur and -nochangecur switches have been added to mhfixmsg(1).

 
 -----------------
 OBSOLETE FEATURES
 
 -----------------
 OBSOLETE FEATURES

diff --git a/man/mhfixmsg.man b/man/mhfixmsg.man
index 81d069b..de5cc61 100644 (file)
--- a/man/mhfixmsg.man
+++ b/man/mhfixmsg.man
@@ -1,4 +1,4 @@
-.TH MHFIXMSG %manext1% "August 20, 2014" "%nmhversion%"
+.TH MHFIXMSG %manext1% "November 19, 2014" "%nmhversion%"

 .\"
 .\" %nmhwarning%
 .\"
 .\"
 .\" %nmhwarning%
 .\"


@@ -28,6 +28,7 @@ mhfixmsg \- rewrite MIME messages with various transformations
 .RB [ \-rmmproc
 .IR program ]
 .RB [ \-normmproc ]
 .RB [ \-rmmproc
 .IR program ]
 .RB [ \-normmproc ]

+.RB [ \-changecur " | " \-nochangecur ]

 .RB [ \-verbose " | " \-noverbose ]
 .RB [ \-version ]
 .RB [ \-help ]
 .RB [ \-verbose " | " \-noverbose ]
 .RB [ \-version ]
 .RB [ \-help ]


@@ -346,12 +347,15 @@ is checked.
 .RB ` \-noreplacetextplain '
 .RB ` \-fixboundary '
 .RB ` \-fixcte '
 .RB ` \-noreplacetextplain '
 .RB ` \-fixboundary '
 .RB ` \-fixcte '

+.RB ` \-changecur '

 .RB ` \-noverbose '
 .fi
 .SH CONTEXT
 If a folder is given, it will become the current folder.  The last
 .RB ` \-noverbose '
 .fi
 .SH CONTEXT
 If a folder is given, it will become the current folder.  The last

-message selected from a folder will become the current message.  If
+message selected from a folder will become the current message, unless

 the
 the

+.B \-nochangecur
+switch is enabled.  If the

 .B \-file
 switch or an absolute pathname is used, the context will not be
 modified.
 .B \-file
 switch or an absolute pathname is used, the context will not be
 modified.

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 66b2eac..ffe97ac 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -30,6 +30,8 @@
     X("outfile file", 0, OUTFILESW) \
     X("rmmproc program", 0, RPROCSW) \
     X("normmproc", 0, NRPRCSW) \
     X("outfile file", 0, OUTFILESW) \
     X("rmmproc program", 0, RPROCSW) \
     X("normmproc", 0, NRPRCSW) \

+    X("changecur", 0, CHGSW) \
+    X("nochangecur", 0, NCHGSW) \

     X("verbose", 0, VERBSW) \
     X("noverbose", 0, NVERBSW) \
     X("version", 0, VERSIONSW) \
     X("verbose", 0, VERBSW) \
     X("noverbose", 0, NVERBSW) \
     X("version", 0, VERSIONSW) \


@@ -114,6 +116,7 @@ main (int argc, char **argv) {
     CT *ctp;
     FILE *fp;
     int using_stdin = 0;
     CT *ctp;
     FILE *fp;
     int using_stdin = 0;

+    int chgflag = 1;

     int status = OK;
     fix_transformations fx;
     fx.reformat = fx.fixcte = fx.fixboundary = 1;
     int status = OK;
     fix_transformations fx;
     fx.reformat = fx.fixcte = fx.fixboundary = 1;


@@ -212,6 +215,12 @@ main (int argc, char **argv) {
             case NRPRCSW:
                 rmmproc = NULL;
                 continue;
             case NRPRCSW:
                 rmmproc = NULL;
                 continue;

+           case CHGSW:
+               chgflag = 1;
+               continue;
+           case NCHGSW:
+               chgflag = 0;
+               continue;

             case VERBSW:
                 verbosw = 1;
                 continue;
             case VERBSW:
                 verbosw = 1;
                 continue;


@@ -335,7 +344,9 @@ main (int argc, char **argv) {
             }
         }
 
             }
         }
 

-        seq_setcur (mp, mp->hghsel);      /* update current message */
+        if (chgflag) {
+            seq_setcur (mp, mp->hghsel);  /* update current message */
+        }

         seq_save (mp);                    /* synchronize sequences  */
         context_replace (pfolder, folder);/* update current folder  */
         context_save ();                  /* save the context file  */
         seq_save (mp);                    /* synchronize sequences  */
         context_replace (pfolder, folder);/* update current folder  */
         context_save ();                  /* save the context file  */