From ad728652d802f6bed1cd3e71d3ccb3d12f9333e9 Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Sun, 21 Dec 2008 16:47:16 +0100
Subject: [PATCH] FUEL: Improved internal font definition handling.

---
 misc/fuel/fuel-font-lock.el | 19 +++++++++++++++----
 misc/fuel/fuel-help.el      |  6 ++----
 misc/fuel/fuel-stack.el     |  9 ++++-----
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/misc/fuel/fuel-font-lock.el b/misc/fuel/fuel-font-lock.el
index 616bff2def..af3731f240 100644
--- a/misc/fuel/fuel-font-lock.el
+++ b/misc/fuel/fuel-font-lock.el
@@ -21,13 +21,24 @@
 
 ;;; Faces:
 
+(defgroup fuel-faces nil
+  "Faces used by FUEL."
+  :group 'fuel
+  :group 'faces)
+
+(defmacro fuel-font-lock--defface (face def group doc)
+  `(defface ,face (face-default-spec ,def)
+     ,(format "Face for %s." doc)
+     :group ',group
+     :group 'fuel-faces
+     :group 'faces))
+
+(put 'fuel-font-lock--defface 'lisp-indent-function 1)
+
 (defmacro fuel-font-lock--make-face (prefix def-prefix group face def doc)
   (let ((face (intern (format "%s-%s" prefix face)))
         (def (intern (format "%s-%s-face" def-prefix def))))
-    `(defface ,face (face-default-spec ,def)
-       ,(format "Face for %s." doc)
-       :group ',group
-       :group 'faces)))
+    `(fuel-font-lock--defface ,face ,def ,group ,doc)))
 
 (defmacro fuel-font-lock--define-faces (prefix def-prefix group faces)
   (let ((setup (make-symbol (format "%s--faces-setup" prefix))))
diff --git a/misc/fuel/fuel-help.el b/misc/fuel/fuel-help.el
index ac57954360..a8aaa80ee5 100644
--- a/misc/fuel/fuel-help.el
+++ b/misc/fuel/fuel-help.el
@@ -48,10 +48,8 @@
   :type 'integer
   :group 'fuel-help)
 
-(defface fuel-help-font-lock-headlines '((t (:bold t :weight bold)))
-  "Face for headlines in help buffers."
-  :group 'fuel-help
-  :group 'faces)
+(fuel-font-lock--defface fuel-help-font-lock-headlines
+  'bold fuel-hep "headlines in help buffers")
 
 
 ;;; Help browser history:
diff --git a/misc/fuel/fuel-stack.el b/misc/fuel/fuel-stack.el
index 3a19a59026..ef8b2e2d41 100644
--- a/misc/fuel/fuel-stack.el
+++ b/misc/fuel/fuel-stack.el
@@ -17,6 +17,7 @@
 (require 'fuel-autodoc)
 (require 'fuel-syntax)
 (require 'fuel-eval)
+(require 'fuel-font-lock)
 (require 'fuel-base)
 
 
@@ -26,12 +27,10 @@
   "Customization for FUEL's stack inference engine"
   :group 'fuel)
 
-(defface fuel-font-lock-stack-region (face-user-default-spec 'highlight)
-  "Face used to highlight the region whose stack effect is shown"
-  :group 'fuel-stack
-  :group 'faces)
+(fuel-font-lock--defface fuel-font-lock-stack-region
+  'highlight fuel-stack "highlighting the stack effect region")
 
-(defcustom fuel-stack-highlight-period 2
+(defcustom fuel-stack-highlight-period 2.0
   "Time, in seconds, the region is highlighted when showing its
 stack effect.