aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1999-12-09 02:01:26 +0000
committerRichard M. Stallman1999-12-09 02:01:26 +0000
commit72af98670a79c4672e5637cddd3869a7adcbb53f (patch)
tree3b4175e1ed87382e3e4fca25e6c6bb1fe1bd8bd6
parent77ba49d8a6dc45e7d62f80d8031dbb5adfa87fef (diff)
downloademacs-72af98670a79c4672e5637cddd3869a7adcbb53f.tar.gz
emacs-72af98670a79c4672e5637cddd3869a7adcbb53f.zip
(dired-insert-subdir): Add autoload cookie.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/dired-aux.el1
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f1497fc3b2..c1ccd79bf3b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
11999-12-08 Richard M. Stallman <rms@caffeine.ai.mit.edu>
2
3 * dired-aux.el (dired-insert-subdir): Add autoload cookie.
4
11999-12-07 Dave Love <fx@gnu.org> 51999-12-07 Dave Love <fx@gnu.org>
2 6
3 * help.el (view-emacs-problems): New command, bound to C-h P. 7 * help.el (view-emacs-problems): New command, bound to C-h P.
@@ -130,7 +134,6 @@
130 tags-recognize-empty-tags-table. 134 tags-recognize-empty-tags-table.
131 (complete-tag): Call tags-complete-tag bypassing try-completion. 135 (complete-tag): Call tags-complete-tag bypassing try-completion.
132 136
133>>>>>>> 1.221
1341999-12-06 Kenichi Handa <handa@etl.go.jp> 1371999-12-06 Kenichi Handa <handa@etl.go.jp>
135 138
136 * international/mule.el (set-buffer-file-coding-system): Docstring 139 * international/mule.el (set-buffer-file-coding-system): Docstring
@@ -232,6 +235,7 @@
232 235
233 * delsel.el: Grok skeleton-pair-insert-maybe. 236 * delsel.el: Grok skeleton-pair-insert-maybe.
234 237
238>>>>>>> 1.224
2351999-11-30 Richard M. Stallman <rms@caffeine.ai.mit.edu> 2391999-11-30 Richard M. Stallman <rms@caffeine.ai.mit.edu>
236 240
237 * progmodes/cperl-mode.el (cperl-under-as-char): 241 * progmodes/cperl-mode.el (cperl-under-as-char):
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b4ea496eceb..0dbe65007a8 100644
--- 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."
1549 ;; insert message so that the user sees the `Mark set' message. 1549 ;; insert message so that the user sees the `Mark set' message.
1550 (push-mark opoint))) 1550 (push-mark opoint)))
1551 1551
1552;;;###autoload
1552(defun dired-insert-subdir (dirname &optional switches no-error-if-not-dir-p) 1553(defun dired-insert-subdir (dirname &optional switches no-error-if-not-dir-p)
1553 "Insert this subdirectory into the same dired buffer. 1554 "Insert this subdirectory into the same dired buffer.
1554If it is already present, overwrites previous entry, 1555If it is already present, overwrites previous entry,