From 3693899406d4ac67ac19f7859182bc406c03b4ce Mon Sep 17 00:00:00 2001 From: Mathias Dahl Date: Thu, 25 May 2006 12:09:01 +0000 Subject: [PATCH] (dired-mode-map): `tumme-display-dired-image' was renamed in tumme.el, but there was still a key binding to it here. Changed the binding to the new name. --- lisp/ChangeLog | 23 +++++++++++++++++++++++ lisp/dired.el | 43 ++++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c908eb016a..4bb65b1fe31 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2006-05-25 Mathias Dahl + + * dired.el (dired-mode-map): `tumme-display-dired-image' was + renamed in tumme.el, but there was still a key binding to it + here. Changed the binding to the new name. + 2006-05-25 Thien-Thi Nguyen * emacs-lisp/bindat.el (bindat-unpack, bindat-pack): @@ -13,6 +19,15 @@ * subr.el (read-passwd): Copy PROMPT before changing its properties. +2006-05-25 Mathias Dahl + + * dired.el (dired-mode-map): Changed menu items for tumme as per + suggestions in emacs-devel. + +2006-05-25 Nick Roberts + + * dired.el (dired-mode-map): Fix breakage. + 2006-05-25 Mathias Dahl * tumme.el (tumme-display-dired-image): Renamed to @@ -20,13 +35,21 @@ (tumme-track-movement): Changed default value to t. (tumme-display-thumbs): Added new optional parameter DO-NOT-POP, used from `tumme-next-line-and-display' and similar commands. +<<<<<<< ChangeLog + (tumme-dired-display-properties): + +======= +>>>>>>> 1.9600 * dired.el (dired-mode-map): Added Thumbnail sub menu under the Immediate menu. Added some tumme commands there. +<<<<<<< ChangeLog +======= 2006-05-25 Nick Roberts * dired.el (dired-mode-map): Fix breakage. +>>>>>>> 1.9600 2006-05-24 Luc Teirlinck diff --git a/lisp/dired.el b/lisp/dired.el index 990c023b698..69825626ddf 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1253,7 +1253,7 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map "\C-tt" 'tumme-tag-files) (define-key map "\C-tr" 'tumme-tag-remove) (define-key map "\C-tj" 'tumme-jump-thumbnail-buffer) - (define-key map "\C-ti" 'tumme-display-dired-image) + (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) @@ -1316,33 +1316,34 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (cons "Thumbnail Images" (make-sparse-keymap "tumme"))) (define-key map - [menu-bar immediate tumme tumme-display-thumbs] - '(menu-item "Display Thumbnails" - tumme-display-thumbs)) - (define-key map - [menu-bar immediate tumme tumme-tag-files] - '(menu-item "Add Image Tag..." - tumme-tag-files)) + [menu-bar immediate tumme tumme-mark-tagged-files] + '(menu-item "Mark From Image Tag..." + tumme-mark-tagged-files)) (define-key map [menu-bar immediate tumme tumme-tag-remove] - '(menu-item "Remove Image Tag..." - tumme-tag-remove)) + '(menu-item "Remove Image Tag..." + tumme-tag-remove)) (define-key map - [menu-bar immediate tumme tumme-dired-display-image] - '(menu-item "Display Image" - tumme-dired-display-image)) + [menu-bar immediate tumme tumme-tag-files] + '(menu-item "Add Image Tag..." + tumme-tag-files)) + (define-key map + [menu-bar immediate tumme tumme-dired-comment-files] + '(menu-item "Add Comment" + tumme-dired-comment-files)) (define-key map [menu-bar immediate tumme tumme-dired-display-external] - '(menu-item "Display Image Externally" - tumme-dired-display-external)) + '(menu-item "Display Image Externally" + tumme-dired-display-external)) (define-key map - [menu-bar immediate tumme tumme-dired-comment-files] - '(menu-item "Add Comment" - tumme-dired-comment-files)) + [menu-bar immediate tumme tumme-dired-display-image] + '(menu-item "Display Image" + tumme-dired-display-image)) (define-key map - [menu-bar immediate tumme tumme-mark-tagged-files] - '(menu-item "Mark From Image Tag..." - tumme-mark-tagged-files)) + [menu-bar immediate tumme tumme-display-thumbs] + '(menu-item "Display Thumbnails" + tumme-display-thumbs)) + (define-key map [menu-bar immediate compare-directories] '(menu-item "Compare directories..." dired-compare-directories -- 2.39.2