;;; dired.el --- directory-browsing commands
;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 2000,
-;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
;; Maintainer: FSF
("^file:" . dired-dnd-handle-local-file))
"The functions to call when a drop in `dired-mode' is made.
See `dnd-protocol-alist' for more information. When nil, behave
-as in other buffers."
+as in other buffers. Changing this option is effective only for
+new dired buffers."
:type '(choice (repeat (cons (regexp) (function)))
(const :tag "Behave as in other buffers" nil))
:version "22.1"
(define-key map "f" 'dired-find-file)
(define-key map "\C-m" 'dired-advertised-find-file)
(define-key map "g" 'revert-buffer)
- (define-key map "\M-g" 'dired-goto-file)
(define-key map "h" 'describe-mode)
(define-key map "i" 'dired-maybe-insert-subdir)
+ (define-key map "j" 'dired-goto-file)
(define-key map "k" 'dired-do-kill-lines)
(define-key map "l" 'dired-do-redisplay)
(define-key map "m" 'dired-mark)
(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)
;; Make menu bar items.
(define-key map [menu-bar immediate]
(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
+ :help "Display image in external viewer"))
+ (define-key map
+ [menu-bar immediate tumme-dired-display-image]
+ '(menu-item "Display Image" tumme-dired-display-image
+ :help "Display sized image in a separate window"))
+
+ (define-key map [menu-bar immediate dashes-4]
+ '("--"))
+
(define-key map [menu-bar immediate revert-buffer]
'(menu-item "Refresh" revert-buffer
:help "Update contents of shown directories"))
'("--"))
(define-key map [menu-bar immediate compare-directories]
- '(menu-item "Compare directories..." dired-compare-directories
+ '(menu-item "Compare Directories..." dired-compare-directories
:help "Mark files with different attributes in two dired buffers"))
(define-key map [menu-bar immediate backup-diff]
'(menu-item "Compare with Backup" dired-backup-diff
(define-key map [menu-bar regexp]
(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"))
+
+ (define-key map [menu-bar regexp dashes-1]
+ '("--"))
+
(define-key map [menu-bar regexp downcase]
'(menu-item "Downcase" dired-downcase
;; When running on plain MS-DOS, there's only one
(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
+ :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
+ :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
+ :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"))
+
+ (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
:help "Replace regexp in marked files"))
(forward-line 1))))
(defun dired-goto-file (file)
- "Go to file line of FILE in this dired buffer."
+ "Go to line describing file FILE in this dired buffer."
;; Return value of point on success, else nil.
;; FILE must be an absolute file name.
;; Loses if FILE contains control chars like "\007" for which ls
(insert "\f\n")))))))
(defun dired-log-summary (string failures)
+ "State a summary of a command's failures, in echo area and log buffer.
+STRING is an overall summary of the failures.
+FAILURES is a list of file names that we failed to operate on,
+or nil if file names are not applicable."
(if (= (length failures) 1)
(message "%s"
(with-current-buffer dired-log-buffer