Don't require help-mode (to avoid bootstrap issues).

2 files changed, 6 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e78a3c28ee1..8b352d1f884 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * help-fns.el: Don't require help-mode (to avoid bootstrap issues).
+
 2009-10-21  Eric Ludlam  <zappo@gnu.org>
 
         * cedet/semantic/bovine/c.el (semantic-c-debug-mode-init)
@@ -14,8 +18,8 @@
         (tramp-smb-handle-file-attributes): Use it.
         (tramp-smb-do-file-attributes-with-stat): Don't raise an error.
         (tramp-smb-handle-insert-directory): Use `mapc' rather than
-        `mapcar'.  Use `tramp-smb-get-stat-capability'.  Add
-        `dired-filename' text properties.
+        `mapcar'.  Use `tramp-smb-get-stat-capability'.
+        Add `dired-filename' text properties.
         (tramp-smb-get-cifs-capabilities): Apply `save-match-data'.
         (tramp-smb-maybe-open-connection): Simplify check for smbclient
         version.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index eed605e3e93..9af6e38c491 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -32,8 +32,6 @@
 
 ;;; Code:
 
-(require 'help-mode)
-
 ;; Functions
 
 ;;;###autoload