Require help-mode rather than help-fns (bug#4861).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3feaa4002f99fbf9e28e5dc1667f31744b14e631..194fdfdd915e97bd18f4f6079289a19d65562ba4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/descr-text.el b/lisp/descr-text.el
index c16f8fde610118f7f11e8e9dd04430864b88e6a2..77b6bb8254ddc846b52e04e4428b68db9752f04e 100644 (file)
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -29,7 +29,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'quail))
-(require 'help-fns)
+(require 'help-mode)
 
 ;;; Describe-Text Utilities.