2 files changed, 9 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a68b694a34..84c908e20a2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * help-fns.el: Require advice when compiling.
+
 2007-10-14  Drew Adams  <drew.adams@oracle.com>
 
         * emacs-lisp/ring.el (ring-convert-sequence-to-ring)
@@ -99,8 +103,8 @@
 
 2007-10-13  Dan Nicolaescu  <dann@ics.uci.edu>
 
-        * frame.el (select-frame-set-input-focus): Fix typo
-        "max" -> "mac". Do not use a single clause cond.
+        * frame.el (select-frame-set-input-focus): Fix typo "max" -> "mac".
+        Do not use a single clause cond.
 
         * cus-start.el (all): Use test that does not match the X11 version
         for mac.
@@ -148,7 +152,7 @@
         (idlwave-complete-in-buffer):
         * textmodes/org.el (org-export-as-html, org-export-as-ascii)
         (org-fast-tag-selection):
-        * textmodes/reftex-sel.el (reftex-select-item):  Use mapc rather
+        * textmodes/reftex-sel.el (reftex-select-item): Use mapc rather
         than mapcar.
 
 2007-10-13  Dan Nicolaescu  <dann@ics.uci.edu>
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index bf8d5f9a209..8a3a3903b3a 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -34,6 +34,7 @@
 ;;; Code:
 
 (require 'help-mode)
+(eval-when-compile (require 'advice))
 
 ;; Functions
 
@@ -239,7 +240,7 @@ face (according to `face-differs-from-default-p')."
                                    ".elc"))
                                  load-path))
          (str (if (and elc-file (file-readable-p elc-file))
-                  (with-temp-buffer 
+                  (with-temp-buffer
                     (insert-file-contents-literally elc-file nil 0 256)
                     (buffer-string))))
          (src-file (and str