Removed LBL compile condition (format: addtoseq).

diff --git a/h/fmt_compile.h b/h/fmt_compile.h
index d60ac4a..a84efae 100644 (file)
--- a/h/fmt_compile.h
+++ b/h/fmt_compile.h
@@ -80,10 +80,6 @@
 #define FT_FORMATADDR    67    /* let external routine format addr    */
 #define FT_MYMBOX        68    /* do "mymbox" test on comp            */
 
-/* misc. */
-/* ADDTOSEQ only works if you include "options LBL" */
-#define FT_ADDTOSEQ      69    /* add current msg to a sequence       */
-
 /* conditionals & control flow (must be last) */
 #define FT_SAVESTR       70    /* save current str reg               */
 #define FT_DONE          71    /* stop formatting                    */

diff --git a/man/mh-format.man5 b/man/mh-format.man5
index 7f5d73d..9629de5 100644 (file)
--- a/man/mh-format.man5
+++ b/man/mh-format.man5
@@ -287,7 +287,6 @@ putstr      expr            print \fIstr\fR
 putstrf        expr            print \fIstr\fR in a fixed width
 putnum expr            print \fInum\fR
 putnumf        expr            print \fInum\fR in a fixed width
-.\" addtoseq literal    add msg to sequence (LBL option)
 nodate string  integer Argument not a date string (0 or 1)
 formataddr     expr            append \fIarg\fR to \fIstr\fR as a
                        (comma separated) address list

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index cf5c497..ef6e879 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -148,7 +148,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 },
-       { "addtoseq",   TF_STR,     FT_ADDTOSEQ, 0, 0 },
 
        { "unquote",    TF_EXPR,    FT_LS_UNQUOTE, 0, TFL_PUTS},
 

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 2c16dfe..2609679 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -31,10 +31,6 @@
 
 extern char *formataddr();  /* hook for custom address formatting */
 
-#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;
 
@@ -878,18 +874,6 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
                        }
                        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++;
        }

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 160daaf..d948a06 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -412,9 +412,6 @@ f_typestr(int t)
        case FT_PARSEADDR: return("PARSEADDR");
        case FT_FORMATADDR: return("FORMATADDR");
        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");

diff --git a/uip/scan.c b/uip/scan.c
index f3e5a4f..6881c34 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
 */
 void clear_screen(void);  /* from termsbr.c */
@@ -252,11 +245,6 @@ main(int argc, char **argv)
 
        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)) {
@@ -306,10 +294,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();