changeset 4562:1c6cf8aa798b

Automated merge with file:///Sources/xemacs-21.5-checked-out
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 09 Jun 2008 21:17:50 +0200
parents 0204391fc17c (diff) 44d10aae73ef (current diff)
children b074f79040d1
files lisp/ChangeLog
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sun Jun 01 18:11:37 2008 +0200
+++ b/lisp/ChangeLog	Mon Jun 09 21:17:50 2008 +0200
@@ -1,3 +1,8 @@
+2008-06-04  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* descr-text.el (describe-property-list): 
+	#'require hyper-apropos, since we use hyper-apropos-face
+
 2008-05-25  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* descr-text.el: New.
--- a/lisp/descr-text.el	Sun Jun 01 18:11:37 2008 +0200
+++ b/lisp/descr-text.el	Mon Jun 09 21:17:50 2008 +0200
@@ -82,6 +82,7 @@
 into help buttons that call `describe-text-category' or
 `describe-face' when pushed."
   ;; Sort the properties by the size of their value.
+  (require 'hyper-apropos)
   (dolist (elt (sort (let (ret)
 		       (while properties
 			 (push (list (pop properties) (pop properties)) ret))