proof-assistant-format: always pass through proof-assistant-setting-format;

1 files changed, 8 insertions, 7 deletions

diff --git a/generic/proof-menu.el b/generic/proof-menu.el
index 30612aff..1247fe9b 100644
--- a/generic/proof-menu.el
+++ b/generic/proof-menu.el
@@ -648,13 +648,14 @@ Finally, apply `proof-assistant-setting-format' if non-nil.
 As a special case for boolean settings: the setting STRING 
 can be a cons cell of two strings, the first one for true (non-nil
 value) and the second for false."
-  (if (consp string)
-      (if curvalue (car string) (cdr string))
-    ;; Otherwise must use % format characters
-    (let ((setting (proof-format proof-assistant-format-table string)))
-      (if proof-assistant-setting-format
-	  (funcall proof-assistant-setting-format setting)
-	setting))))
+  (let ((setting
+	 (if (consp string)
+	     (if curvalue (car string) (cdr string))
+	   ;; Otherwise must use % format characters
+	   (proof-format proof-assistant-format-table string))))
+    (if proof-assistant-setting-format
+	(funcall proof-assistant-setting-format setting)
+      setting)))
 
 (defvar proof-assistant-format-table 
   (list