# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1250179174 0
# Node ID 81cbeb1f6df1f5ac5ea0947491628ea5dbbbe7b6
# Parent  a577041a03704e316bc0c861adc7a9560ab6aa60
* 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.

diff -r a577041a0370 -r 81cbeb1f6df1 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Aug 13 13:22:55 2009 +0000
+++ b/lisp/ChangeLog	Thu Aug 13 15:59:34 2009 +0000
@@ -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 -r a577041a0370 -r 81cbeb1f6df1 lisp/faces.el
--- a/lisp/faces.el	Thu Aug 13 13:22:55 2009 +0000
+++ b/lisp/faces.el	Thu Aug 13 15:59:34 2009 +0000
@@ -2506,6 +2506,9 @@
   :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 -r a577041a0370 -r 81cbeb1f6df1 lisp/help-fns.el
--- a/lisp/help-fns.el	Thu Aug 13 13:22:55 2009 +0000
+++ b/lisp/help-fns.el	Thu Aug 13 15:59:34 2009 +0000
@@ -158,10 +158,6 @@
 	    (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