diff options
| author | Glenn Morris <[email protected]> | 2011-02-19 10:55:15 -0800 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2011-02-19 10:55:15 -0800 |
| commit | 429242317e3abaa40dad9f3d2a9eb537cd0fd9b3 (patch) | |
| tree | 7d993e586781cd40c5c215891054a6c87926c8c2 /doc/misc | |
| parent | 56e96bed349771df1df56546450a21afc75c00d3 (diff) | |
Merge dired-x's dired-clean-up-after-deletion into dired's version.
* lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el.
* lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version.
(dired-clean-up-buffers-too): Declare.
* doc/misc/dired-x.texi (Technical Details):
No longer redefine dired-clean-up-after-deletion.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/ChangeLog | 2 | ||||
| -rw-r--r-- | doc/misc/dired-x.texi | 23 |
2 files changed, 9 insertions, 16 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 882eec3419..d6fbc06d72 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,7 +1,7 @@ 2011-02-19 Glenn Morris <[email protected]> * dired-x.texi (Technical Details): No longer redefines dired-add-entry, - or dired-initial-position. + dired-initial-position, or dired-clean-up-after-deletion. 2011-02-18 Glenn Morris <[email protected]> diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi index 9f7b40ceb5..3bc2964c1b 100644 --- a/doc/misc/dired-x.texi +++ b/doc/misc/dired-x.texi @@ -177,22 +177,15 @@ Point}). @cindex Redefined functions @cindex @file{dired-aux.el} -When loaded this code @emph{redefines} the following functions of GNU Emacs -from @file{dired.el} - -@itemize @bullet -@item -@code{dired-clean-up-after-deletion} -@item -@code{dired-find-buffer-nocreate} -@end itemize - -@noindent +When loaded this code @emph{redefines} some standard Dired functions. +From @file{dired.el}, the function @code{dired-find-buffer-nocreate}; and from @file{dired-aux.el} the function @code{dired-read-shell-command}. -In addition, once @file{dired.el} is loaded, @code{dired-add-entry} -obeys Dired Omit mode (@pxref{Omitting Files in Dired}), if it is active. -Similarly, @code{dired-initial-position} obeys @code{dired-find-subdir} -(@pxref{Miscellaneous Commands}). +In addition, once @file{dired-x.el} is loaded, the following Dired +functions offer additional features. @code{dired-add-entry} obeys Dired +Omit mode (@pxref{Omitting Files in Dired}), if it is active. +@code{dired-initial-position} obeys @code{dired-find-subdir} +(@pxref{Miscellaneous Commands}). @code{dired-clean-up-after-deletion} +respects the value of @code{dired-clean-up-buffers-too}. @node Installation, Omitting Files in Dired, Introduction, Top @chapter Installation |