# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1257309124 0
# Node ID 788b904aa868a64b9c2977032597c5c12c728991
# Parent  e7f7399383e9be717261c85371cacdfe44214670
Require help-mode rather than help-fns (bug#4861).

diff -r e7f7399383e9 -r 788b904aa868 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Nov 04 03:17:15 2009 +0000
+++ b/lisp/ChangeLog	Wed Nov 04 04:32:04 2009 +0000
@@ -1,3 +1,7 @@
+2009-11-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* descr-text.el: Require help-mode rather than help-fns (bug#4861).
+
 2009-11-04  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp/bytecomp.el (byte-compile-version-cond): Remove macro.
diff -r e7f7399383e9 -r 788b904aa868 lisp/descr-text.el
--- a/lisp/descr-text.el	Wed Nov 04 03:17:15 2009 +0000
+++ b/lisp/descr-text.el	Wed Nov 04 04:32:04 2009 +0000
@@ -29,7 +29,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'quail))
-(require 'help-fns)
+(require 'help-mode)
 
 ;;; Describe-Text Utilities.