Always pad non numbered words in col/line/tab_mode

3 files changed, 17 insertions, 8 deletions

diff --git a/smenu.1 b/smenu.1
index 971b370..4484700 100644
--- a/smenu.1
+++ b/smenu.1
@@ -1302,6 +1302,9 @@ The keyword '\f(CBincluded\fP' means that only \fIincluded\fP word will
 be padded while '\f(CBall\fP' means pad \fIall\fP words.
 
 The default is \f(CBall\fP. These keywords can be abbreviated.
+
+\fBWARNING\fP: in column/line/tab mode this sub-option is ignored and
+non numbered words are always padded.
 .
 .TP
 \f(CBw\fP (\fB-F\fP|\fB-en\fP|\fB-embedded_number\fP, \
diff --git a/smenu.c b/smenu.c
index fdbee63..10438a8 100644
--- a/smenu.c
+++ b/smenu.c
@@ -8522,6 +8522,12 @@ main(int argc, char * argv[])
   if (win.tab_mode && !win.max_cols)
     win.wide = 1;
 
+  /* Force the padding mode to all when words are numbered and not in */
+  /* col/line/tab_mode.                                               */
+  /* """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" */
+  if (daccess.padding != 'a' && (win.col_mode || win.line_mode || win.tab_mode))
+    daccess.padding = 'a';
+
   win.start = 0;
 
   term.color_method = ANSI; /* We default to setaf/setbf to set colors. */
diff --git a/tests/direct_access/t0020.good b/tests/direct_access/t0020.good
index 7656a90..396c329 100644
--- a/tests/direct_access/t0020.good
+++ b/tests/direct_access/t0020.good
@@ -1,13 +1,13 @@
 $ OUT=$(smenu -l -N -D p:i l:\( -e a t0020.in)
 
-a (1) b 
-0:24 2:01 3:01 4:01 6:07 
-(2) c a 
-0:01 1:01 2:01 6:24 
-aa (3) bb 
-0:24 1:24 3:01 4:01 5:01 
-(4) cc a 
-0:01 1:01 2:01 7:24 
+    a (1) b 
+4:24 6:01 7:01 8:01 10:07 
+(2) c     a 
+0:01 1:01 2:01 10:24 
+    aa (3) bb 
+4:24 5:24 7:01 8:01 9:01 
+(4) cc     a 
+0:01 1:01 2:01 11:24 
 $ 
 
 $ echo ":$OUT:"