From 7cce3c911d6ab7ae52f9e4570ffb303634c88dd9 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 15 Nov 2009 16:23:07 +0000 Subject: [PATCH] * dired.el (dired-mode-map): Move encryption items to "Operate" menu (Bug#4703). --- lisp/ChangeLog | 3 +++ lisp/dired.el | 51 ++++++++++++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5f623e20a9e..1a2edac321d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2009-11-15 Chong Yidong + * dired.el (dired-mode-map): Move encryption items to "Operate" + menu (Bug#4703). + * strokes.el (strokes-update-window-configuration): Make strokes buffer current before erasing (Bug#4906). diff --git a/lisp/dired.el b/lisp/dired.el index d4e79485bcd..756e8fea6ce 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1410,29 +1410,6 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map [menu-bar immediate] (cons "Immediate" (make-sparse-keymap "Immediate"))) - (define-key map - [menu-bar immediate epa-dired-do-decrypt] - '(menu-item "Decrypt" epa-dired-do-decrypt - :help "Decrypt file at cursor")) - - (define-key map - [menu-bar immediate epa-dired-do-verify] - '(menu-item "Verify" epa-dired-do-verify - :help "Verify digital signature of file at cursor")) - - (define-key map - [menu-bar immediate epa-dired-do-sign] - '(menu-item "Sign" epa-dired-do-sign - :help "Create digital signature of file at cursor")) - - (define-key map - [menu-bar immediate epa-dired-do-encrypt] - '(menu-item "Encrypt" epa-dired-do-encrypt - :help "Encrypt file at cursor")) - - (define-key map [menu-bar immediate dashes-4] - '("--")) - (define-key map [menu-bar immediate image-dired-dired-display-external] '(menu-item "Display Image Externally" image-dired-dired-display-external @@ -1442,9 +1419,6 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." '(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] - '("--")) - (define-key map [menu-bar immediate revert-buffer] '(menu-item "Refresh" revert-buffer :help "Update contents of shown directories")) @@ -1603,6 +1577,29 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." '(menu-item "Display image thumbnails" image-dired-display-thumbs :help "Display image thumbnails for current or marked image files")) + (define-key map [menu-bar operate dashes-4] + '("--")) + + (define-key map + [menu-bar operate epa-dired-do-decrypt] + '(menu-item "Decrypt" epa-dired-do-decrypt + :help "Decrypt file at cursor")) + + (define-key map + [menu-bar operate epa-dired-do-verify] + '(menu-item "Verify" epa-dired-do-verify + :help "Verify digital signature of file at cursor")) + + (define-key map + [menu-bar operate epa-dired-do-sign] + '(menu-item "Sign" epa-dired-do-sign + :help "Create digital signature of file at cursor")) + + (define-key map + [menu-bar operate epa-dired-do-encrypt] + '(menu-item "Encrypt" epa-dired-do-encrypt + :help "Encrypt file at cursor")) + (define-key map [menu-bar operate dashes-3] '("--")) @@ -3471,7 +3468,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "e207e02ac395d10ee4a09e208081a0ce") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "87433c3c284e8cef58102a1583e29438") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ -- 2.39.5