Commit cad7445b authored by Glenn Morris's avatar Glenn Morris
Browse files

dired-x no longer requires dired-aux.

* lisp/dired-x.el: Don't require dired-aux.
(dired-do-create-files, dired-mark-read-regexp)
(dired-do-create-files-regexp): Autoload from dired-aux.
parent bea584fa
......@@ -22,6 +22,10 @@
2011-02-19 Glenn Morris <rgm@gnu.org>
* dired-x.el: Don't require dired-aux.
(dired-do-create-files, dired-mark-read-regexp)
(dired-do-create-files-regexp): Autoload from dired-aux.
* dired-x.el (dired-find-buffer-nocreate): Merge into dired.el.
* dired.el (dired-find-buffer-nocreate): Merge dired-x version.
......
......@@ -53,15 +53,10 @@
;;; Code:
;; LOAD.
;; This is a no-op if dired-x is being loaded via `dired-load-hook',
;; but maybe not if a dired-x function is being autoloaded.
(require 'dired)
;; We will redefine some functions and also need some macros.
(require 'dired-aux)
;;; User-defined variables.
(defgroup dired-x nil
......@@ -1149,6 +1144,8 @@ results in
; (trailing slash!)
name2 ok-if-already-exists)))
(autoload 'dired-do-create-files "dired-aux")
;;;###autoload
(defun dired-do-relsymlink (&optional arg)
"Relative symlink all marked (or next ARG) files into a directory.
......@@ -1166,6 +1163,9 @@ For absolute symlinks, use \\[dired-do-symlink]."
(dired-do-create-files 'relsymlink #'dired-make-relative-symlink
"RelSymLink" arg dired-keep-marker-relsymlink))
(autoload 'dired-mark-read-regexp "dired-aux")
(autoload 'dired-do-create-files-regexp "dired-aux")
(defun dired-do-relsymlink-regexp (regexp newname &optional arg whole-name)
"RelSymlink all marked files containing REGEXP to NEWNAME.
See functions `dired-do-rename-regexp' and `dired-do-relsymlink'
......
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