* faces.el (help-argument-name): Define it here instead of

help-fns.el, because in daemon mode help-fns.el may be loaded when
faces are still uninitialized (Bug#1078).

* help-fns.el (help-argument-name): Move defface to faces.el.

3 files changed, 11 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c53edc8a9d..ca7cc805b70 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * faces.el (help-argument-name): Define it here instead of
+        help-fns.el, because in daemon mode help-fns.el may be loaded when
+        faces are still uninitialized (Bug#1078).
+
+        * help-fns.el (help-argument-name): Move defface to faces.el.
+
 2009-08-13  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-mi.el (gdb-inferior-io-mode): Use start-process to
diff --git a/lisp/faces.el b/lisp/faces.el
index bc7513eab64..b8d21404e87 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2506,6 +2506,9 @@ Note: Other faces cannot inherit from the cursor face."
   :group 'menu
   :group 'basic-faces)
 
+(defface help-argument-name '((((supports :slant italic)) :inherit italic))
+  "Face to highlight argument names in *Help* buffers."
+  :group 'help)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Manipulating font names.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 7747c505ec9..b9530d89be9 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -158,10 +158,6 @@ KIND should be `var' for a variable or `subr' for a subroutine."
             (concat "src/" file)
           file)))))
 
-(defface help-argument-name '((((supports :slant italic)) :inherit italic))
-  "Face to highlight argument names in *Help* buffers."
-  :group 'help)
-
 (defun help-default-arg-highlight (arg)
   "Default function to highlight arguments in *Help* buffers.
 It returns ARG in face `help-argument-name'; ARG is also