(dired-insert-subdir): Add autoload cookie.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f1497fc3b2c205e15a6cdad3e636d81fd3699ed..c1ccd79bf3b86f58c6e665db5e294fb536d156df 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+1999-12-08  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+
+       * dired-aux.el (dired-insert-subdir): Add autoload cookie.
+
 1999-12-07  Dave Love  <fx@gnu.org>
 
        * help.el (view-emacs-problems): New command, bound to C-h P.
@@ -130,7 +134,6 @@
        tags-recognize-empty-tags-table.
        (complete-tag): Call tags-complete-tag bypassing try-completion.
        
->>>>>>> 1.221
 1999-12-06  Kenichi Handa  <handa@etl.go.jp>
 
        * international/mule.el (set-buffer-file-coding-system): Docstring
@@ -232,6 +235,7 @@
 
        * delsel.el: Grok skeleton-pair-insert-maybe.
 
+>>>>>>> 1.224
 1999-11-30  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
 
        * progmodes/cperl-mode.el (cperl-under-as-char):

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b4ea496eceb6a78392fbe17f0b77170b5b850ee7..0dbe65007a82bd40658126594afddc05550af54e 100644 (file)
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1549,6 +1549,7 @@ This function takes some pains to conform to `ls -lR' output."
     ;; insert message so that the user sees the `Mark set' message.
     (push-mark opoint)))
 
+;;;###autoload
 (defun dired-insert-subdir (dirname &optional switches no-error-if-not-dir-p)
   "Insert this subdirectory into the same dired buffer.
 If it is already present, overwrites previous entry,