Fix the format/2-3 predicates missing the numbervars(true) option in the ~w and ...

diff --git a/src/lib/format.pl b/src/lib/format.pl
index db5eb48f3e4ff7ff6f2ad1bb96b7b50613d0c1e2..d2a2a78bfeca2b39206a40ef4a0b55eb8edf91bb 100644 (file)
--- a/src/lib/format.pl
+++ b/src/lib/format.pl
@@ -165,10 +165,10 @@ cells([], Args, Tab, Es, _) --> !,
 cells([~,~|Fs], Args, Tab, Es, VNs) --> !,
         cells(Fs, Args, Tab, [chars("~")|Es], VNs).
 cells([~,w|Fs], [Arg|Args], Tab, Es, VNs) --> !,
-        { write_term_to_chars(Arg, [variable_names(VNs)], Chars) },
+        { write_term_to_chars(Arg, [numbervars(true),variable_names(VNs)], Chars) },
         cells(Fs, Args, Tab, [chars(Chars)|Es], VNs).
 cells([~,q|Fs], [Arg|Args], Tab, Es, VNs) --> !,
-        { write_term_to_chars(Arg, [quoted(true),variable_names(VNs)], Chars) },
+        { write_term_to_chars(Arg, [quoted(true),numbervars(true),variable_names(VNs)], Chars) },
         cells(Fs, Args, Tab, [chars(Chars)|Es], VNs).
 cells([~,a|Fs], [Arg|Args], Tab, Es, VNs) --> !,
         { atom_chars(Arg, Chars) },