From 56f14120aee00a81708d9d5030de2fafb23dd016 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 4 Nov 2009 04:32:04 +0000
Subject: [PATCH] Require help-mode rather than help-fns (bug#4861).

---
 lisp/ChangeLog     | 4 ++++
 lisp/descr-text.el | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3feaa4002f9..194fdfdd915 100644
--- 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 c16f8fde610..77b6bb8254d 100644
--- 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.
 
-- 
2.11.4.GIT