comparison lisp/dired.el @ 90918:e9f94688a064

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 781-792) - Update from CVS - Merge from gnus--rel--5.10 - Merge from emacs--rel--22 * emacs--rel--22 (patch 33-41) * gnus--rel--5.10 (patch 226-228) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-219
author Miles Bader <miles@gnu.org>
date Mon, 11 Jun 2007 00:58:11 +0000
parents 31beec9ee600 f0c0678c068d
children f55f9811f5d7
comparison
equal deleted inserted replaced
90917:9f1c3e957d3e 90918:e9f94688a064
1450 :help "Mark unmarked files, unmark marked ones")) 1450 :help "Mark unmarked files, unmark marked ones"))
1451 1451
1452 (define-key map [menu-bar operate] 1452 (define-key map [menu-bar operate]
1453 (cons "Operate" (make-sparse-keymap "Operate"))) 1453 (cons "Operate" (make-sparse-keymap "Operate")))
1454 1454
1455 (define-key map [menu-bar operate dashes-2]
1456 '("--"))
1457
1458 (define-key map 1455 (define-key map
1459 [menu-bar operate image-dired-delete-tag] 1456 [menu-bar operate image-dired-delete-tag]
1460 '(menu-item "Delete Image Tag..." image-dired-delete-tag 1457 '(menu-item "Delete Image Tag..." image-dired-delete-tag
1461 :help "Delete image tag from current or marked files")) 1458 :help "Delete image tag from current or marked files"))
1462 (define-key map 1459 (define-key map
2360 (point-max) 2357 (point-max)
2361 (point)))) 2358 (point))))
2362 2359
2363 ;; Deleting files 2360 ;; Deleting files
2364 2361
2365 (defcustom dired-recursive-deletes nil ; Default only delete empty directories. 2362 (defcustom dired-recursive-deletes 'top ; Default only delete empty directories.
2366 "*Decide whether recursive deletes are allowed. 2363 "*Decide whether recursive deletes are allowed.
2367 A value of nil means no recursive deletes. 2364 A value of nil means no recursive deletes.
2368 `always' means delete recursively without asking. This is DANGEROUS! 2365 `always' means delete recursively without asking. This is DANGEROUS!
2369 `top' means ask for each directory at top level, but delete its subdirectories 2366 `top' means ask for each directory at top level, but delete its subdirectories
2370 without asking. 2367 without asking.
2408 (delete-directory file)))) 2405 (delete-directory file))))
2409 2406
2410 (defun dired-do-flagged-delete (&optional nomessage) 2407 (defun dired-do-flagged-delete (&optional nomessage)
2411 "In Dired, delete the files flagged for deletion. 2408 "In Dired, delete the files flagged for deletion.
2412 If NOMESSAGE is non-nil, we don't display any message 2409 If NOMESSAGE is non-nil, we don't display any message
2413 if there are no flagged files." 2410 if there are no flagged files.
2411 `dired-recursive-deletes' controls whether
2412 deletion of non-empty directories is allowed."
2414 (interactive) 2413 (interactive)
2415 (let* ((dired-marker-char dired-del-marker) 2414 (let* ((dired-marker-char dired-del-marker)
2416 (regexp (dired-marker-regexp)) 2415 (regexp (dired-marker-regexp))
2417 case-fold-search) 2416 case-fold-search)
2418 (if (save-excursion (goto-char (point-min)) 2417 (if (save-excursion (goto-char (point-min))
2424 nil) 2423 nil)
2425 (or nomessage 2424 (or nomessage
2426 (message "(No deletions requested)"))))) 2425 (message "(No deletions requested)")))))
2427 2426
2428 (defun dired-do-delete (&optional arg) 2427 (defun dired-do-delete (&optional arg)
2429 "Delete all marked (or next ARG) files." 2428 "Delete all marked (or next ARG) files.
2429 `dired-recursive-deletes' controls whether
2430 deletion of non-empty directories is allowed."
2430 ;; This is more consistent with the file marking feature than 2431 ;; This is more consistent with the file marking feature than
2431 ;; dired-do-flagged-delete. 2432 ;; dired-do-flagged-delete.
2432 (interactive "P") 2433 (interactive "P")
2433 (dired-internal-do-deletions 2434 (dired-internal-do-deletions
2434 ;; this may move point if ARG is an integer 2435 ;; this may move point if ARG is an integer
3204 (list (car (reverse dired-subdir-alist)))))))) 3205 (list (car (reverse dired-subdir-alist))))))))
3205 3206
3206 3207
3207 ;;;; Drag and drop support 3208 ;;;; Drag and drop support
3208 3209
3209 (defcustom dired-recursive-copies nil 3210 (defcustom dired-recursive-copies 'top
3210 "*Decide whether recursive copies are allowed. 3211 "*Decide whether recursive copies are allowed.
3211 A value of nil means no recursive copies. 3212 A value of nil means no recursive copies.
3212 `always' means copy recursively without asking. 3213 `always' means copy recursively without asking.
3213 `top' means ask for each directory at top level. 3214 `top' means ask for each directory at top level.
3214 Anything else means ask for each directory." 3215 Anything else means ask for each directory."