Changeset 4210 for trunk/lisp/dired.el

Timestamp:

06/02/07 09:29:41 (1 year ago)

Author:

miyoshi

Message:

Sync up with Emacs_22_BASE.

Files:

• trunk/lisp/dired.el (modified) (7 diffs)

trunk/lisp/dired.el

@@ -1361 +1361 @@
-      [menu-bar regexp image-dired-mark-tagged-files]
-      '(menu-item "Mark From Image Tag..." image-dired-mark-tagged-files
-    
-
+
+
-    (define-key map [menu-bar regexp dashes-1]
-    
+
-
-    (define-key map [menu-bar regexp downcase]
@@ -1472 +1472 @@
-      '(menu-item "Display Image-Dired" image-dired-display-thumbs
-                  :help "Display image-dired for current or marked image files"))
-
+
-    (define-key map [menu-bar operate dashes-3]
-    
+
-
-    (define-key map [menu-bar operate query-replace]
@@ -2365 +2365 @@
-(defcustom dired-recursive-deletes nil ; Default only delete empty directories.
-  "*Decide whether recursive deletes are allowed.
-
+A value of 
-`always' means delete recursively without asking.  This is DANGEROUS!
-`top' means ask for each directory at top level, but delete its subdirectories
@@ -2411 +2411 @@
-  "In Dired, delete the files flagged for deletion.
-If NOMESSAGE is non-nil, we don't display any message
-
+
+
+
-  (interactive)
-  (let* ((dired-marker-char dired-del-marker)
@@ -2427 +2429 @@
-
-(defun dired-do-delete (&optional arg)
-
+
+
+
-  ;; This is more consistent with the file marking feature than
-  ;; dired-do-flagged-delete.
@@ -3102 +3106 @@
-    (setq mode-name
-          (let (case-fold-search)
- 
+
-                    dired-sort-by-name-regexp dired-actual-switches)
-                   "Dired by name")
@@ -3209 +3213 @@
-(defcustom dired-recursive-copies nil
-  "*Decide whether recursive copies are allowed.
-
+A value of 
-`always' means copy recursively without asking.
-`top' means ask for each directory at top level.