summaryrefslogtreecommitdiff
path: root/lisp/dired-x.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-02-19 12:44:34 -0800
committerGlenn Morris <rgm@gnu.org>2011-02-19 12:44:34 -0800
commit64b9bd678495c6891c436ef89e95b64fe318c35d (patch)
treea690e9421455c7f2bf388a59f0e2f4ea46e8acef /lisp/dired-x.el
parentc5bdd9b558764a6d0dcccaaf07a1a271121aaa71 (diff)
downloademacs-64b9bd678495c6891c436ef89e95b64fe318c35d.tar.gz
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.
Diffstat (limited to 'lisp/dired-x.el')
-rw-r--r--lisp/dired-x.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index ff051f65fe9..8b1dbb1ef83 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -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'