Merge dired-x's redefinition of dired-initial-position into the main version.

* lisp/dired-x.el (dired-initial-position): Merge into dired.el's version.

* lisp/dired.el (dired-initial-position): Merge dired-x's version here.
(dired-find-subdir): Declare.

* doc/misc/dired-x.texi (Technical Details):
No longer redefines dired-initial-position.

2 files changed, 4 insertions, 3 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c11618649da..882eec34193 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,6 +1,7 @@
 2011-02-19  Glenn Morris  <rgm@gnu.org>
 
-        * dired-x.texi (Technical Details): No longer redefines dired-add-entry.
+        * dired-x.texi (Technical Details): No longer redefines dired-add-entry,
+        or dired-initial-position.
 
 2011-02-18  Glenn Morris  <rgm@gnu.org>
 
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index 931af07be4e..9f7b40ceb58 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -185,14 +185,14 @@ from @file{dired.el}
 @code{dired-clean-up-after-deletion}
 @item
 @code{dired-find-buffer-nocreate}
-@item
-@code{dired-initial-position}
 @end itemize
 
 @noindent
 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}).
 
 @node Installation, Omitting Files in Dired, Introduction, Top
 @chapter Installation