Changeset 4091 for trunk/lisp/dired.el

Timestamp:

2006年05月27日 10時35分24秒 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/dired.el (modified) (7 diffs)

trunk/lisp/dired.el

@@ -1213 +1213 @@
-    (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)
@@ -1252 +1252 @@
-    (define-key map "\C-td" 'tumme-display-thumbs)
-    (define-key map "\C-tt" 'tumme-tag-files)
-tag-remove
+delete-tag
-    (define-key map "\C-tj" 'tumme-jump-thumbnail-buffer)
-splay-dired
+red-display
-    (define-key map "\C-tx" 'tumme-dired-display-external)
-    (define-key map "\C-ta" 'tumme-display-thumbs-append)
@@ -1306 +1306 @@
-      (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
@@ -1314 +1326 @@
-
-    (define-key map [menu-bar immediate compare-directories]
-d
+D
-                  :help "Mark files with different attributes in two dired buffers"))
-    (define-key map [menu-bar immediate backup-diff]
@@ -1341 +1353 @@
-    (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]
@@ -1428 +1448 @@
-    (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]
@@ -2219 +2262 @@
-
-(defun dired-goto-file (file)
-file line of
+line describing file
-  ;; Return value of point on success, else nil.
-  ;; FILE must be an absolute file name.