Merge dired-x's dired-find-buffer-nocreate into dired.el.

* lisp/dired-x.el (dired-find-buffer-nocreate): Merge into dired.el.

* lisp/dired.el (dired-find-buffer-nocreate): Merge dired-x version.

* doc/misc/dired-x.texi (Technical Details):
No longer redefines dired-find-buffer-nocreate.

2 files changed, 13 insertions, 13 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 164fdc4ed65..8906c53aeed 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -51,8 +51,8 @@
 2011-02-19  Glenn Morris  <rgm@gnu.org>
 
         * dired-x.texi (Technical Details): No longer redefines dired-add-entry,
-        dired-initial-position, dired-clean-up-after-deletion, or
-        dired-read-shell-command.
+        dired-initial-position, dired-clean-up-after-deletion,
+        dired-read-shell-command, or dired-find-buffer-nocreate.
 
 2011-02-18  Glenn Morris  <rgm@gnu.org>
 
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index c4e474f0943..003046d5a7c 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -174,19 +174,19 @@ Point}).
 
 @node Technical Details, , Features, Introduction
 @section Technical Details
-@cindex Redefined functions
+@cindex Modified functions
 @cindex @file{dired-aux.el}
 
-When loaded this code @emph{redefines} the standard @file{dired.el}
-function @code{dired-find-buffer-nocreate}.  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}.
-@code{dired-read-shell-command} uses @code{dired-guess-shell-command}
-(@pxref{Shell Command Guessing}) to offer a smarter default command.
+When @file{dired-x.el} is loaded, some standard Dired functions from
+@file{dired.el} and @file{dired-aux.el} offer additional features.
+@code{dired-add-entry} obeys Dired Omit mode (@pxref{Omitting Files in
+Dired}), if it is active.  @code{dired-find-buffer-nocreate} and
+@code{dired-initial-position} respect the value of
+@code{dired-find-subdir} (@pxref{Miscellaneous Commands}).
+@code{dired-clean-up-after-deletion} respects the value of
+@code{dired-clean-up-buffers-too}.  @code{dired-read-shell-command} uses
+@code{dired-guess-shell-command} (@pxref{Shell Command Guessing}) to
+offer a smarter default command.
 
 @node Installation, Omitting Files in Dired, Introduction, Top
 @chapter Installation