[Emacs-diffs] Changes to emacs/lisp/dired.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/04/22 13:40:00

Index: dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired.el,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -b -r1.358 -r1.359
--- dired.el    22 Apr 2007 03:30:31 -0000      1.358
+++ dired.el    22 Apr 2007 13:40:00 -0000      1.359
@@ -1251,19 +1251,19 @@
     (define-key map "\177" 'dired-unmark-backward)
     (define-key map [remap undo] 'dired-undo)
     (define-key map [remap advertised-undo] 'dired-undo)
-    ;; thumbnail manipulation (thumbnails)
-    (define-key map "\C-td" 'thumbnails-display-thumbs)
-    (define-key map "\C-tt" 'thumbnails-tag-files)
-    (define-key map "\C-tr" 'thumbnails-delete-tag)
-    (define-key map "\C-tj" 'thumbnails-jump-thumbnail-buffer)
-    (define-key map "\C-ti" 'thumbnails-dired-display-image)
-    (define-key map "\C-tx" 'thumbnails-dired-display-external)
-    (define-key map "\C-ta" 'thumbnails-display-thumbs-append)
-    (define-key map "\C-t." 'thumbnails-display-thumb)
-    (define-key map "\C-tc" 'thumbnails-dired-comment-files)
-    (define-key map "\C-tf" 'thumbnails-mark-tagged-files)
-    (define-key map "\C-t\C-t" 'thumbnails-dired-insert-marked-thumbs)
-    (define-key map "\C-te" 'thumbnails-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 +1310,12 @@
       (cons "Immediate" (make-sparse-keymap "Immediate")))
 
     (define-key map
-      [menu-bar immediate thumbnails-dired-display-external]
-      '(menu-item "Display Image Externally" thumbnails-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 thumbnails-dired-display-image]
-      '(menu-item "Display Image" thumbnails-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,8 +1358,8 @@
       (cons "Regexp" (make-sparse-keymap "Regexp")))
 
     (define-key map
-      [menu-bar regexp thumbnails-mark-tagged-files]
-      '(menu-item "Mark From Image Tag..." thumbnails-mark-tagged-files
+      [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]
@@ -1456,21 +1456,21 @@
       '("--"))
 
     (define-key map
-      [menu-bar operate thumbnails-delete-tag]
-      '(menu-item "Delete Image Tag..." thumbnails-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 thumbnails-tag-files]
-      '(menu-item "Add Image Tags..." thumbnails-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 thumbnails-dired-comment-files]
-      '(menu-item "Add Image Comment..." thumbnails-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 thumbnails-display-thumbs]
-      '(menu-item "Display Thumbnails" thumbnails-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]
       '("--"))