2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1ddd68685b..132bb45cb81 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-30  Richard M. Stallman  <rms@gnu.org>
+
+        * emacs-lisp/advice.el (documentation): Add ad-define-subr-args call.
+
 2002-04-29  Richard M. Stallman  <rms@gnu.org>
 
         * net/zone-mode.el (zone-mode): Add write-file-hooks hook locally.
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index b03dd3603bd..34e2a92ed37 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3925,6 +3925,10 @@ undone on exit of this macro."
 ;; Use the advice mechanism to advise `documentation' to make it
 ;; generate proper documentation strings for advised definitions:
 
+;; This makes sure we get the right arglist for `documentation'
+;; during bootstrapping.
+(ad-define-subr-args 'documentation '(function &optional raw))
+
 (defadvice documentation (after ad-advised-docstring first disable preact)
   "Builds an advised docstring if FUNCTION is advised."
   ;; Because we get the function name from the advised docstring