From: Glenn Morris <rgm@gnu.org>
Date: Sat, 19 Feb 2011 20:44:34 +0000 (-0800)
Subject: dired-x no longer requires dired-aux.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~800
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cad7445b369d55101bf94537292a1142359de60f;p=emacs.git

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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16f1c7dbe5e..26823aa6bcb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
 
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'