(dired-recursive-copies): Moved to dired.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 895580f..3a06704 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-22  Richard M. Stallman  <rms@gnu.org>
+
+       * dired.el (dired-recursive-copies): Moved from dired-aux.el.
+       * dired-aux.el (dired-recursive-copies): Moved to dired.el.
+
 2004-11-22  Nick Roberts  <nickrob@snap.net.nz>
 
        * progmodes/gdb-ui.el (gdb-resync): New function.
@@ -130,6 +135,13 @@
 
 2004-11-20  Richard M. Stallman  <rms@gnu.org>
 
+       * isearch.el (isearch-mode-map): Don't bind SPC.
+       (isearch-whitespace-chars): Function deleted.
+       (isearch-search): Bind search-spaces-regexp.
+       (isearch-lazy-highlight-search): Likewise.
+       (search-whitespace-regexp): Doc fix.
+       (isearch-forward-regexp): Doc fix.
+
        * emacs-lisp/bytecomp.el (byte-compile-form):
        Move the calls to byte-compile-set-symbol-position,
        to avoid having two for the same symbol occurrence.

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 6c1a9ad..2e210d0 100644 (file)
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1093,19 +1093,6 @@ See Info node `(emacs-xtra)Subdir switches' for more details."
 \f
 ;;; Copy, move/rename, making hard and symbolic links
 
-(defcustom dired-recursive-copies nil
-  "*Decide whether recursive copies are allowed.
-nil means no recursive copies.
-`always' means copy recursively without asking.
-`top' means ask for each directory at top level.
-Anything else means ask for each directory."
-  :type '(choice :tag "Copy directories"
-                (const :tag "No recursive copies" nil)
-                (const :tag "Ask for each directory" t)
-                (const :tag "Ask for each top directory only" top)
-                (const :tag "Copy directories without asking" always))
-  :group 'dired)
-
 (defcustom dired-backup-overwrite nil
   "*Non-nil if Dired should ask about making backups before overwriting files.
 Special value `always' suppresses confirmation."