Removed support for #ifdef LBL. It was broken anyways,

sometime between MH 6.8.5 and the Apr 1999 entry into CVS.
Also removed the addtoseq format function that could only be
accessed with it.

diff --git a/h/fmt_compile.h b/h/fmt_compile.h
index 559f993..84f7fa4 100644 (file)
--- a/h/fmt_compile.h
+++ b/h/fmt_compile.h
@@ -84,28 +84,25 @@
 #define FT_CONCATADDR  70      /* formataddr w/out duplicate removal  */
 #define FT_MYMBOX      71      /* do "mymbox" test on comp            */
 
 #define FT_CONCATADDR  70      /* formataddr w/out duplicate removal  */
 #define FT_MYMBOX      71      /* do "mymbox" test on comp            */
 

-/* misc. */            /* ADDTOSEQ only works if you include "options LBL" */
-#define FT_ADDTOSEQ    72      /* add current msg to a sequence       */
-

 /* conditionals & control flow (must be last) */
 /* conditionals & control flow (must be last) */

-#define FT_SAVESTR     73      /* save current str reg               */
-#define FT_DONE                74      /* stop formatting                    */
-#define FT_PAUSE       75      /* pause                              */
-#define FT_NOP         76      /* nop                                */
-#define FT_GOTO                77      /* (relative) goto                    */
-#define FT_IF_S_NULL   78      /* test if "str" null                 */
-#define FT_IF_S                79      /* test if "str" non-null             */
-#define FT_IF_V_EQ     80      /* test if "value" = literal          */
-#define FT_IF_V_NE     81      /* test if "value" != literal         */
-#define FT_IF_V_GT     82      /* test if "value" > literal          */
-#define FT_IF_MATCH    83      /* test if "str" contains literal     */
-#define FT_IF_AMATCH   84      /* test if "str" starts with literal  */
-#define FT_S_NULL      85      /* V = 1 if "str" null                */
-#define FT_S_NONNULL   86      /* V = 1 if "str" non-null            */
-#define FT_V_EQ                87      /* V = 1 if "value" = literal         */
-#define FT_V_NE                88      /* V = 1 if "value" != literal        */
-#define FT_V_GT                89      /* V = 1 if "value" > literal         */
-#define FT_V_MATCH     90      /* V = 1 if "str" contains literal    */
-#define FT_V_AMATCH    91      /* V = 1 if "str" starts with literal */
+#define FT_SAVESTR     72      /* save current str reg               */
+#define FT_DONE                73      /* stop formatting                    */
+#define FT_PAUSE       74      /* pause                              */
+#define FT_NOP         75      /* nop                                */
+#define FT_GOTO                76      /* (relative) goto                    */
+#define FT_IF_S_NULL   77      /* test if "str" null                 */
+#define FT_IF_S                78      /* test if "str" non-null             */
+#define FT_IF_V_EQ     79      /* test if "value" = literal          */
+#define FT_IF_V_NE     80      /* test if "value" != literal         */
+#define FT_IF_V_GT     81      /* test if "value" > literal          */
+#define FT_IF_MATCH    82      /* test if "str" contains literal     */
+#define FT_IF_AMATCH   83      /* test if "str" starts with literal  */
+#define FT_S_NULL      84      /* V = 1 if "str" null                */
+#define FT_S_NONNULL   85      /* V = 1 if "str" non-null            */
+#define FT_V_EQ                86      /* V = 1 if "value" = literal         */
+#define FT_V_NE                87      /* V = 1 if "value" != literal        */
+#define FT_V_GT                88      /* V = 1 if "value" > literal         */
+#define FT_V_MATCH     89      /* V = 1 if "str" contains literal    */
+#define FT_V_AMATCH    90      /* V = 1 if "str" starts with literal */

 
 #define IF_FUNCS FT_S_NULL     /* start of "if" functions */
 
 #define IF_FUNCS FT_S_NULL     /* start of "if" functions */

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 0147334..437c811 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -212,7 +212,6 @@ static struct ftable functable[] = {
      { "friendly",   TF_COMP,  FT_LS_FRIENDLY, FT_PARSEADDR,   TFL_PUTS },
 
      { "mymbox",     TF_COMP,  FT_LV_COMPFLAG, FT_MYMBOX,      TFL_PUTN },
      { "friendly",   TF_COMP,  FT_LS_FRIENDLY, FT_PARSEADDR,   TFL_PUTS },
 
      { "mymbox",     TF_COMP,  FT_LV_COMPFLAG, FT_MYMBOX,      TFL_PUTN },

-     { "addtoseq",   TF_STR,   FT_ADDTOSEQ,    0,              0 },

 
      { "unquote",   TF_EXPR,   FT_LS_UNQUOTE,  0,              TFL_PUTS},
 
 
      { "unquote",   TF_EXPR,   FT_LS_UNQUOTE,  0,              TFL_PUTS},
 

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 0d9e1e9..de44c44 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -25,10 +25,6 @@
 #  include <wchar.h>
 #endif
 
 #  include <wchar.h>
 #endif
 

-#ifdef LBL
-struct msgs *fmt_current_folder; /* current folder (set by main program) */
-#endif
-

 extern int fmt_norm;           /* defined in sbr/fmt_def.c = AD_NAME */
 struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,
                              NULL, NULL };
 extern int fmt_norm;           /* defined in sbr/fmt_def.c = AD_NAME */
 struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,
                              NULL, NULL };


@@ -997,17 +993,6 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat)
                comp->c_mn = &fmt_mnull;
            }
            break;
                comp->c_mn = &fmt_mnull;
            }
            break;

-
-       case FT_ADDTOSEQ:
-#ifdef LBL
-           /* If we're working on a folder (as opposed to a file), add the
-            * current msg to sequence given in literal field.  Don't
-            * disturb string or value registers.
-            */
-           if (fmt_current_folder)
-                   seq_addmsg(fmt_current_folder, fmt->f_text, dat[0], -1);
-#endif
-           break;

        }
        fmt++;
     }
        }
        fmt++;
     }

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 2ec0a80..783aa96 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -415,9 +415,6 @@ f_typestr(int t)
        case FT_FORMATADDR: return("FORMATADDR");
        case FT_CONCATADDR: return("CONCATADDR");
        case FT_MYMBOX: return("MYMBOX");
        case FT_FORMATADDR: return("FORMATADDR");
        case FT_CONCATADDR: return("CONCATADDR");
        case FT_MYMBOX: return("MYMBOX");

-#ifdef FT_ADDTOSEQ
-       case FT_ADDTOSEQ: return("ADDTOSEQ");
-#endif

        case FT_SAVESTR: return("SAVESTR");
 #ifdef FT_PAUSE
        case FT_PAUSE: return ("PAUSE");
        case FT_SAVESTR: return("SAVESTR");
 #ifdef FT_PAUSE
        case FT_PAUSE: return ("PAUSE");

diff --git a/uip/scan.c b/uip/scan.c
index 08c893b..b4980d7 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -44,13 +44,6 @@ static struct swit switches[] = {
 };
 
 
 };
 
 

-/*
- * global for sbr/formatsbr.c - yech!
- */
-#ifdef LBL
-extern struct msgs *fmt_current_folder;        
-#endif
-

 /*
  * prototypes
  */
 /*
  * prototypes
  */


@@ -249,11 +242,6 @@ main (int argc, char **argv)
 
     ontty = isatty (fileno (stdout));
 
 
     ontty = isatty (fileno (stdout));
 

-#ifdef LBL
-    else
-       fmt_current_folder = mp;
-#endif
-

     for (msgnum = revflag ? mp->hghsel : mp->lowsel;
         (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel);
         msgnum += (revflag ? -1 : 1)) {
     for (msgnum = revflag ? mp->hghsel : mp->lowsel;
         (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel);
         msgnum += (revflag ? -1 : 1)) {


@@ -301,10 +289,6 @@ main (int argc, char **argv)
        }
     }
 
        }
     }
 

-#ifdef LBL
-    seq_save (mp);     /* because formatsbr might have made changes */
-#endif
-

     folder_free (mp);  /* free folder/message structure */
     if (clearflag)
        clear_screen ();
     folder_free (mp);  /* free folder/message structure */
     if (clearflag)
        clear_screen ();