Indent system variable dump better.

This suppresses warnings about missing REM or MSG tokens.

contrib/remind-conf-mode/remind-conf-mode.el

@@ -143,7 +143,7 @@
          "$NumTrig" "$October" "$On" "$OnceFile" "$ParseUntriggered" "$Pm"
          "$PrefixLineNo" "$PSCal" "$RunOff" "$Saturday" "$September"
          "$SimpleCal" "$SortByDate" "$SortByPrio" "$SortByTime" "$SubsIndent"
-         "$Sunday" "$SuppressLRM" "$SysInclude" "$T" "$Td"
+         "$Sunday" "$SuppressImplicitWarnings" "$SuppressLRM" "$SysInclude" "$T" "$Td"
          "$TerminalBackground" "$Thursday" "$TimeSep" "$Tm" "$Today"
          "$Tomorrow" "$Tt" "$Tuesday" "$Tw" "$Ty" "$U" "$Ud" "$Um"
          "$UntimedFirst" "$Use256Colors" "$UseBGVTColors" "$UseTrueColors"

man/remind.1.in

@@ -2825,8 +2825,15 @@ order, or 2 if sorting by time in descending order.
 The number of spaces by which all lines (except the first) of an
 \fBMSF\fR-type reminder should be indented.  The default is 0.
 .TP
+.B $SuppressImplicitWarnings
+Normally, \fBRemind\fR issues a warning if a line begins with an unknown
+token and is treated as a \fBREM\fR command, or if a \fBREM\fR command
+is missing a type and is treated as a \fBMSG\fR-type reminder.  Setting
+\fB$SuppressImplicitWarnings\fR to 1 suppresses these warnings.  The default
+is 0 and we do not recommend disabling the warnings.
+.TP
 .B $SuppressLRM
-Normally, when Remind is run with the \fB\-c\fR option in a UTF-8 locale,
+Normally, when \fBRemind\fR is run with the \fB\-c\fR option in a UTF-8 locale,
 it emits a left-to-right mark sequence after printing day names or
 reminders.  Some terminals render this incorrectly, so you can use:
 .RS

src/calendar.c

@@ -1724,8 +1724,10 @@ static void GenerateCalEntries(int col)
 	    /* need to destroy it here. */
 
 	    default:
-                Wprint("Unrecognized command; interpreting as REM");
-                WarnedAboutImplicit = 1;
+                if (!SuppressImplicitRemWarnings) {
+                    Wprint("Unrecognized command; interpreting as REM");
+                    WarnedAboutImplicit = 1;
+                }
                 CreateParser(CurLine, &p);
 		r=DoCalRem(&p, col);
 		break;

src/dorem.c

@@ -704,7 +704,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
 	    DBufFree(&buf);
 	    trig->typ = MSG_TYPE;
 	    if (s->isnested) return E_CANT_NEST_RTYPE;
-            if (!WarnedAboutImplicit) {
+            if (!WarnedAboutImplicit && !SuppressImplicitRemWarnings) {
                 Wprint("Missing REM type; assuming MSG");
                 WarnedAboutImplicit = 1;
             }

src/globals.h

@@ -171,6 +171,9 @@ EXTERN DynamicBuffer ExprBuf;
 /* User-func recursion level */
 EXTERN  INIT(   unsigned int FuncRecursionLevel, 0);
 
+/* Suppress warnings about implicit REM and MSG */
+EXTERN  INIT(   int SuppressImplicitRemWarnings, 0);
+
 extern int NumFullOmits, NumPartialOmits;
 
 /* List of months */

src/main.c

@@ -356,8 +356,10 @@ static void DoReminders(void)
 	    /* If we don't recognize the command, do a REM by default, but warn */
 
 	    default:
-                Wprint("Unrecognized command; interpreting as REM");
-                WarnedAboutImplicit = 1;
+                if (!SuppressImplicitRemWarnings) {
+                    Wprint("Unrecognized command; interpreting as REM");
+                    WarnedAboutImplicit = 1;
+                }
                 DestroyParser(&p);
                 CreateParser(CurLine, &p);
                 purge_handled = 1;

src/var.c

@@ -934,6 +934,7 @@ static SysVar SysVarArr[] = {
     {"SortByTime",     0,  INT_TYPE,     &SortByTime,          0,      0 },
     {"SubsIndent",     1,  INT_TYPE,     &SubsIndent,          0,      132 },
     {"Sunday",         1,  STR_TYPE,     &DynamicDayName[6],   0,      0 },
+    {"SuppressImplicitWarnings", 1, INT_TYPE, &SuppressImplicitRemWarnings, 0, 1},
     {"SuppressLRM",    1,  INT_TYPE,     &SuppressLRM,         0,      1 },
     {"SysInclude",     0,  STR_TYPE,     &SysDir,              0,      0 },
     {"T",              0,  SPECIAL_TYPE, trig_date_func,       0,      0 },
@@ -1119,7 +1120,7 @@ static void DumpSysVar(char const *name, const SysVar *v)
 	return;
     }
     if (name) strcat(buffer, name); else strcat(buffer, v->name);
-    fprintf(ErrFp, "%16s  ", buffer);
+    fprintf(ErrFp, "%25s  ", buffer);
     if (v) {
         if (v->type == CONST_INT_TYPE) {
             fprintf(ErrFp, "%d\n", v->constval);

tests/test.cmp

@@ -2716,114 +2716,115 @@ a125  -1
 dump $
 Variable  Value
 
-  $AddBlankLines  1           [0, 1]
-            $Ago  "ago"
-             $Am  "am"
-            $And  "and"
-          $April  "April"
-             $At  "at"
-         $August  "August"
-        $CalcUTC  0           [0, 1]
-        $CalMode  0
-         $Daemon  0
-        $DateSep  "-"
-    $DateTimeSep  "@"
-       $December  "December"
-   $DefaultColor  "-1 -1 -1"
-    $DefaultPrio  5000        [0, 9999]
-  $DefaultTDelta  0           [0, 1440]
-  $DeltaOverride  0
-       $DontFork  0
-      $DontQueue  1
-    $DontTrigAts  0
-        $EndSent  ".?!"
-      $EndSentIg  "\"')]}>"
-$ExpressionTimeLimit  0
-       $February  "February"
-    $FirstIndent  0           [0, 132]
-       $FoldYear  0           [0, 1]
-      $FormWidth  72          [20, 500]
-         $Friday  "Friday"
-        $Fromnow  "from now"
-           $Hour  "hour"
-           $Hplu  "s"
-       $HushMode  0
-     $IgnoreOnce  1
-       $InfDelta  0
-         $IntMax  2147483647
-         $IntMin  -2147483648
-             $Is  "is"
-        $January  "January"
-           $July  "July"
-           $June  "June"
-         $LatDeg  30
-       $Latitude  "30.500000"
-         $LatMin  30
-         $LatSec  0
-       $Location  "Ottawa"
-        $LongDeg  -25
-      $Longitude  "24.750000"
-        $LongMin  15
-        $LongSec  0
-          $March  "March"
-   $MaxFullOmits  1000
- $MaxLateMinutes  0           [0, 1440]
-$MaxPartialOmits  366
-     $MaxSatIter  150         [10, Inf)
-   $MaxStringLen  65535       [-1, Inf)
-            $May  "May"
-    $MinsFromUTC  -300        [-780, 780]
-         $Minute  "minute"
-         $Monday  "Monday"
-           $Mplu  "s"
-       $NextMode  0
-       $November  "November"
-            $Now  "now"
-   $NumFullOmits  1
-$NumPartialOmits  0
-      $NumQueued  0
-        $NumTrig  41
-        $October  "October"
-             $On  "on"
-       $OnceFile  ""
-$ParseUntriggered  1           [0, 1]
-             $Pm  "pm"
-   $PrefixLineNo  0
-          $PSCal  0
-         $RunOff  0
-       $Saturday  "Saturday"
-      $September  "September"
-      $SimpleCal  0
-     $SortByDate  0
-     $SortByPrio  0
-     $SortByTime  0
-     $SubsIndent  0           [0, 132]
-         $Sunday  "Sunday"
-    $SuppressLRM  0           [0, 1]
-              $T  0
-             $Td  -1
-$TerminalBackground  -1
-       $Thursday  "Thursday"
-        $TimeSep  ":"
-             $Tm  -1
-          $Today  "today"
-       $Tomorrow  "tomorrow"
-             $Tt  00:00
-        $Tuesday  "Tuesday"
-             $Tw  -1
-             $Ty  -1
-              $U  1991-02-16
-             $Ud  16
-             $Um  2
-   $UntimedFirst  0
-   $Use256Colors  0
-  $UseBGVTColors  0
-  $UseTrueColors  0
-    $UseVTColors  0
-             $Uw  6
-             $Uy  1991
-            $Was  "was"
-      $Wednesday  "Wednesday"
+           $AddBlankLines  1           [0, 1]
+                     $Ago  "ago"
+                      $Am  "am"
+                     $And  "and"
+                   $April  "April"
+                      $At  "at"
+                  $August  "August"
+                 $CalcUTC  0           [0, 1]
+                 $CalMode  0
+                  $Daemon  0
+                 $DateSep  "-"
+             $DateTimeSep  "@"
+                $December  "December"
+            $DefaultColor  "-1 -1 -1"
+             $DefaultPrio  5000        [0, 9999]
+           $DefaultTDelta  0           [0, 1440]
+           $DeltaOverride  0
+                $DontFork  0
+               $DontQueue  1
+             $DontTrigAts  0
+                 $EndSent  ".?!"
+               $EndSentIg  "\"')]}>"
+     $ExpressionTimeLimit  0
+                $February  "February"
+             $FirstIndent  0           [0, 132]
+                $FoldYear  0           [0, 1]
+               $FormWidth  72          [20, 500]
+                  $Friday  "Friday"
+                 $Fromnow  "from now"
+                    $Hour  "hour"
+                    $Hplu  "s"
+                $HushMode  0
+              $IgnoreOnce  1
+                $InfDelta  0
+                  $IntMax  2147483647
+                  $IntMin  -2147483648
+                      $Is  "is"
+                 $January  "January"
+                    $July  "July"
+                    $June  "June"
+                  $LatDeg  30
+                $Latitude  "30.500000"
+                  $LatMin  30
+                  $LatSec  0
+                $Location  "Ottawa"
+                 $LongDeg  -25
+               $Longitude  "24.750000"
+                 $LongMin  15
+                 $LongSec  0
+                   $March  "March"
+            $MaxFullOmits  1000
+          $MaxLateMinutes  0           [0, 1440]
+         $MaxPartialOmits  366
+              $MaxSatIter  150         [10, Inf)
+            $MaxStringLen  65535       [-1, Inf)
+                     $May  "May"
+             $MinsFromUTC  -300        [-780, 780]
+                  $Minute  "minute"
+                  $Monday  "Monday"
+                    $Mplu  "s"
+                $NextMode  0
+                $November  "November"
+                     $Now  "now"
+            $NumFullOmits  1
+         $NumPartialOmits  0
+               $NumQueued  0
+                 $NumTrig  41
+                 $October  "October"
+                      $On  "on"
+                $OnceFile  ""
+        $ParseUntriggered  1           [0, 1]
+                      $Pm  "pm"
+            $PrefixLineNo  0
+                   $PSCal  0
+                  $RunOff  0
+                $Saturday  "Saturday"
+               $September  "September"
+               $SimpleCal  0
+              $SortByDate  0
+              $SortByPrio  0
+              $SortByTime  0
+              $SubsIndent  0           [0, 132]
+                  $Sunday  "Sunday"
+$SuppressImplicitWarnings  0           [0, 1]
+             $SuppressLRM  0           [0, 1]
+                       $T  0
+                      $Td  -1
+      $TerminalBackground  -1
+                $Thursday  "Thursday"
+                 $TimeSep  ":"
+                      $Tm  -1
+                   $Today  "today"
+                $Tomorrow  "tomorrow"
+                      $Tt  00:00
+                 $Tuesday  "Tuesday"
+                      $Tw  -1
+                      $Ty  -1
+                       $U  1991-02-16
+                      $Ud  16
+                      $Um  2
+            $UntimedFirst  0
+            $Use256Colors  0
+           $UseBGVTColors  0
+           $UseTrueColors  0
+             $UseVTColors  0
+                      $Uw  6
+                      $Uy  1991
+                     $Was  "was"
+               $Wednesday  "Wednesday"
 msg [$April]%
 ../tests/test.rem(478): Trig = Saturday, 16 February, 1991
 $April => "April"
@@ -13555,6 +13556,7 @@ $SortByPrio
 $SortByTime
 $SubsIndent
 $Sunday
+$SuppressImplicitWarnings
 $SuppressLRM
 $SysInclude
 $T