Index: lisp/apropos.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/apropos.el,v
retrieving revision 1.114
diff -c -r1.114 apropos.el
*** lisp/apropos.el	6 Feb 2006 14:33:31 -0000	1.114
--- lisp/apropos.el	18 Feb 2006 22:33:04 -0000
***************
*** 85,91 ****
    :group 'apropos
    :type 'face)
  
! (defcustom apropos-label-face 'italic
    "*Face for label (`Command', `Variable' ...) in Apropos output.
  A value of nil means don't use any special font for them, and also
  turns off mouse highlighting."
--- 85,91 ----
    :group 'apropos
    :type 'face)
  
! (defcustom apropos-label-face 'button
    "*Face for label (`Command', `Variable' ...) in Apropos output.
  A value of nil means don't use any special font for them, and also
  turns off mouse highlighting."
***************
*** 980,994 ****
    (if (stringp (setq i (nth i apropos-item)))
        (progn
  	(insert "  ")
! 	(insert-text-button (button-type-get type 'apropos-label)
! 			    'type type
! 			    ;; Can't use the default button face, since
! 			    ;; user may have changed the variable!
! 			    ;; Just say `no' to variables containing faces!
! 			    'face apropos-label-face
! 			    'apropos-symbol (car apropos-item))
! 	(insert ": ")
! 	(insert (if do-keys (substitute-command-keys i) i))
  	(or (bolp) (terpri)))))
  
  
--- 980,996 ----
    (if (stringp (setq i (nth i apropos-item)))
        (progn
  	(insert "  ")
!         (let ((start (point)))
!           (insert-text-button (button-type-get type 'apropos-label)
!                               'type type
!                               ;; Can't use the default button face, since
!                               ;; user may have changed the variable!
!                               ;; Just say `no' to variables containing faces!
!                               'face apropos-label-face
!                               'apropos-symbol (car apropos-item))
!           (insert ": ")
!           (insert (if do-keys (substitute-command-keys i) i))
!           (fill-region start (point)))
  	(or (bolp) (terpri)))))