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.

1 files changed, 1 insertions, 12 deletions

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 0bdf4950a58..901614e49d0 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -48,8 +48,7 @@
 ;; User customization: M-x customize-group RET dired-x RET.
 
 ;; When loaded this code redefines the following functions of GNU Emacs:
-;; From dired.el: dired-clean-up-after-deletion, dired-find-buffer-nocreate,
-;; and dired-initial-position.
+;; From dired.el: dired-clean-up-after-deletion, dired-find-buffer-nocreate.
 ;; From dired-aux.el: dired-read-shell-command.
 
 ;; *Please* see the `dired-x' info pages for more details.
@@ -1408,16 +1407,6 @@ Considers buffers closer to the car of `buffer-list' to be more recent."
 ;;           (setq dired-buffers (delq elt dired-buffers)))))
 ;;     result))
 
-;; REDEFINE.
-;; Redefines dired.el's version of `dired-initial-position'
-(defun dired-initial-position (dirname)
-  "Where point should go in a new listing of DIRNAME.
-Point assumed at beginning of new subdir line.
-You may redefine this function as you wish, e.g. like in `dired-x.el'."
-  (end-of-line)
-  (if dired-find-subdir (dired-goto-subdir dirname)) ; new
-  (if dired-trivial-filenames (dired-goto-next-nontrivial-file)))
-
 
 ;; Does anyone use this? - lrd 6/29/93.
 ;; Apparently people do use it. - lrd 12/22/97.