--- a/lisp/x11/x-menubar.el	Mon Aug 13 08:46:35 2007 +0200
+++ b/lisp/x11/x-menubar.el	Mon Aug 13 08:46:56 2007 +0200
@@ -923,6 +923,7 @@
 
 
 ;;; The Options menu
+(defvar save-options-font-hack nil)
 
 (defconst options-menu-saved-forms
   ;; This is really quite a kludge, but it gets the job done.
@@ -1062,7 +1063,7 @@
 					(face-property ',face ',property)
 					',(save-options-specifier-spec-list
 					   face property))))
-			      built-in-face-specifiers)))
+p			      built-in-face-specifiers)))
 		   (face-list))))
 
      ))
@@ -1167,6 +1168,25 @@
 			     (prin1 var))))
 		    (if var (princ "\n")))
 		options-menu-saved-forms)
+	(when save-options-font-hack
+	  (princ "(require 'x-font-menu)\n")
+	  (princ "(setq save-options-font-hack '(")
+	  (princ (car save-options-font-hack))
+	  (princ " ")
+	  (prin1 (cadr save-options-font-hack))
+	  (princ " ")
+	  (prin1 (caddr save-options-font-hack))
+	  (princ " ")
+	  (prin1 (format "%d" (cadddr save-options-font-hack)))
+	  (princ "))\n(")
+	  (princ (car save-options-font-hack))
+	  (princ " ")
+	  (prin1 (cadr save-options-font-hack))
+	  (princ " ")
+	  (prin1 (caddr save-options-font-hack))
+	  (princ " ")
+	  (prin1 (format "%d" (cadddr save-options-font-hack)))
+	  (princ ")\n"))
 	))
     (set-marker options-output-marker nil)
     (save-excursion