[Emacs-diffs] emacs/lisp ChangeLog faces.el help-fns.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/08/13 15:59:39

Modified files:
        lisp           : ChangeLog faces.el help-fns.el 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15929&r2=1.15930
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/faces.el?cvsroot=emacs&r1=1.443&r2=1.444
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/help-fns.el?cvsroot=emacs&r1=1.136&r2=1.137

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15929
retrieving revision 1.15930
diff -u -b -r1.15929 -r1.15930
--- ChangeLog   13 Aug 2009 13:20:09 -0000      1.15929
+++ ChangeLog   13 Aug 2009 15:59:34 -0000      1.15930
@@ -1,3 +1,11 @@
+2009-08-13  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/gdb-mi.el (gdb-inferior-io-mode): Use start-process to

Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -b -r1.443 -r1.444
--- faces.el    27 Jun 2009 20:44:07 -0000      1.443
+++ faces.el    13 Aug 2009 15:59:38 -0000      1.444
@@ -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.

Index: help-fns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- help-fns.el 2 Aug 2009 23:09:04 -0000       1.136
+++ help-fns.el 13 Aug 2009 15:59:38 -0000      1.137
@@ -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