Commit 203784cc authored by Glenn Morris's avatar Glenn Morris
Browse files

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.
parent 30abce25
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>
......
......@@ -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
......
2011-02-19 Glenn Morris <rgm@gnu.org>
* dired-x.el (dired-initial-position): Merge into dired.el's version.
* dired.el (dired-initial-position): Merge dired-x's version here.
(dired-find-subdir): Declare.
* dired-x.el (dired-omit-new-add-entry): Merge into dired-add-entry.
* dired-aux.el (dired-add-entry): Give it a doc-string.
Merge dired-x's dired-omit handling here.
......
......@@ -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.
......
......@@ -2544,11 +2544,15 @@ instead of `dired-actual-switches'."
;; return value of point (i.e., FOUND):
(goto-char found))))
(defvar dired-find-subdir)
;; FIXME document whatever dired-x is doing.
(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.
"Where point should go in a new listing of DIRNAME.
Point assumed at beginning of new subdir line."
(end-of-line)
(and (featurep 'dired-x) dired-find-subdir
(dired-goto-subdir dirname))
(if dired-trivial-filenames (dired-goto-next-nontrivial-file)))
;; These are hooks which make tree dired work.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment