X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/d7a0267c8d6be2a9885de797b25ec8f4a61b8895..2536fb611876d5526fe40b9bee2a16e2836d4ff3:/lisp/dired.el diff --git a/lisp/dired.el b/lisp/dired.el index 508c5510c9..e71160c801 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -56,7 +56,7 @@ may contain even `F', `b', `i' and `s'. See also the variable `dired-ls-F-marks-symlinks' concerning the `F' switch. On systems such as MS-DOS and MS-Windows, which use `ls' emulation in Lisp, some of the `ls' switches are not supported; see the doc string of -`insert-directory' on `ls-lisp.el' for more details." +`insert-directory' in `ls-lisp.el' for more details." :type 'string :group 'dired) @@ -1247,23 +1247,24 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map "$" 'dired-hide-subdir) (define-key map "\M-$" 'dired-hide-all) ;; misc + (define-key map "\C-x\C-q" 'wdired-change-to-wdired-mode) (define-key map "?" 'dired-summary) (define-key map "\177" 'dired-unmark-backward) (define-key map [remap undo] 'dired-undo) (define-key map [remap advertised-undo] 'dired-undo) - ;; thumbnail manipulation (tumme) - (define-key map "\C-td" 'tumme-display-thumbs) - (define-key map "\C-tt" 'tumme-tag-files) - (define-key map "\C-tr" 'tumme-delete-tag) - (define-key map "\C-tj" 'tumme-jump-thumbnail-buffer) - (define-key map "\C-ti" 'tumme-dired-display-image) - (define-key map "\C-tx" 'tumme-dired-display-external) - (define-key map "\C-ta" 'tumme-display-thumbs-append) - (define-key map "\C-t." 'tumme-display-thumb) - (define-key map "\C-tc" 'tumme-dired-comment-files) - (define-key map "\C-tf" 'tumme-mark-tagged-files) - (define-key map "\C-t\C-t" 'tumme-dired-insert-marked-thumbs) - (define-key map "\C-te" 'tumme-dired-edit-comment-and-tags) + ;; thumbnail manipulation (image-dired) + (define-key map "\C-td" 'image-dired-display-thumbs) + (define-key map "\C-tt" 'image-dired-tag-files) + (define-key map "\C-tr" 'image-dired-delete-tag) + (define-key map "\C-tj" 'image-dired-jump-thumbnail-buffer) + (define-key map "\C-ti" 'image-dired-dired-display-image) + (define-key map "\C-tx" 'image-dired-dired-display-external) + (define-key map "\C-ta" 'image-dired-display-thumbs-append) + (define-key map "\C-t." 'image-dired-display-thumb) + (define-key map "\C-tc" 'image-dired-dired-comment-files) + (define-key map "\C-tf" 'image-dired-mark-tagged-files) + (define-key map "\C-t\C-t" 'image-dired-dired-insert-marked-thumbs) + (define-key map "\C-te" 'image-dired-dired-edit-comment-and-tags) ;; Make menu bar items. @@ -1310,12 +1311,12 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (cons "Immediate" (make-sparse-keymap "Immediate"))) (define-key map - [menu-bar immediate tumme-dired-display-external] - '(menu-item "Display Image Externally" tumme-dired-display-external + [menu-bar immediate image-dired-dired-display-external] + '(menu-item "Display Image Externally" image-dired-dired-display-external :help "Display image in external viewer")) (define-key map - [menu-bar immediate tumme-dired-display-image] - '(menu-item "Display Image" tumme-dired-display-image + [menu-bar immediate image-dired-dired-display-image] + '(menu-item "Display Image" image-dired-dired-display-image :help "Display sized image in a separate window")) (define-key map [menu-bar immediate dashes-4] @@ -1358,12 +1359,12 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (cons "Regexp" (make-sparse-keymap "Regexp"))) (define-key map - [menu-bar regexp tumme-mark-tagged-files] - '(menu-item "Mark From Image Tag..." tumme-mark-tagged-files - :help "Mark files whose image tags matches regexp")) - + [menu-bar regexp image-dired-mark-tagged-files] + '(menu-item "Mark From Image Tag..." image-dired-mark-tagged-files + :help "Mark files whose image tags matches regexp")) + (define-key map [menu-bar regexp dashes-1] - '("--")) + '("--")) (define-key map [menu-bar regexp downcase] '(menu-item "Downcase" dired-downcase @@ -1452,28 +1453,25 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map [menu-bar operate] (cons "Operate" (make-sparse-keymap "Operate"))) - (define-key map [menu-bar operate dashes-2] - '("--")) - (define-key map - [menu-bar operate tumme-delete-tag] - '(menu-item "Delete Image Tag..." tumme-delete-tag + [menu-bar operate image-dired-delete-tag] + '(menu-item "Delete Image Tag..." image-dired-delete-tag :help "Delete image tag from current or marked files")) (define-key map - [menu-bar operate tumme-tag-files] - '(menu-item "Add Image Tags..." tumme-tag-files + [menu-bar operate image-dired-tag-files] + '(menu-item "Add Image Tags..." image-dired-tag-files :help "Add image tags to current or marked files")) (define-key map - [menu-bar operate tumme-dired-comment-files] - '(menu-item "Add Image Comment..." tumme-dired-comment-files + [menu-bar operate image-dired-dired-comment-files] + '(menu-item "Add Image Comment..." image-dired-dired-comment-files :help "Add image comment to current or marked files")) (define-key map - [menu-bar operate tumme-display-thumbs] - '(menu-item "Display Thumbnails" tumme-display-thumbs - :help "Display thumbnails for current or marked image files")) - + [menu-bar operate image-dired-display-thumbs] + '(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] '(menu-item "Query Replace in Files..." dired-do-query-replace-regexp @@ -2362,9 +2360,9 @@ Optional argument means return a file name relative to `default-directory'." ;; Deleting files -(defcustom dired-recursive-deletes nil ; Default only delete empty directories. +(defcustom dired-recursive-deletes 'top ; Default only delete empty directories. "*Decide whether recursive deletes are allowed. -nil means no recursive deletes. +A value of nil means no recursive deletes. `always' means delete recursively without asking. This is DANGEROUS! `top' means ask for each directory at top level, but delete its subdirectories without asking. @@ -2410,7 +2408,9 @@ Anything else, ask for each sub-directory." (defun dired-do-flagged-delete (&optional nomessage) "In Dired, delete the files flagged for deletion. If NOMESSAGE is non-nil, we don't display any message -if there are no flagged files." +if there are no flagged files. +`dired-recursive-deletes' controls whether +deletion of non-empty directories is allowed." (interactive) (let* ((dired-marker-char dired-del-marker) (regexp (dired-marker-regexp)) @@ -2426,7 +2426,9 @@ if there are no flagged files." (message "(No deletions requested)"))))) (defun dired-do-delete (&optional arg) - "Delete all marked (or next ARG) files." + "Delete all marked (or next ARG) files. +`dired-recursive-deletes' controls whether +deletion of non-empty directories is allowed." ;; This is more consistent with the file marking feature than ;; dired-do-flagged-delete. (interactive "P") @@ -3101,7 +3103,7 @@ The idea is to set this buffer-locally in special dired buffers.") (when (eq major-mode 'dired-mode) (setq mode-name (let (case-fold-search) - (cond ((string-match + (cond ((string-match dired-sort-by-name-regexp dired-actual-switches) "Dired by name") ((string-match @@ -3206,9 +3208,9 @@ To be called first in body of `dired-sort-other', etc." ;;;; Drag and drop support -(defcustom dired-recursive-copies nil +(defcustom dired-recursive-copies 'top "*Decide whether recursive copies are allowed. -nil means no recursive copies. +A value of 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."