From 4a830a8e34e12c4f8c99cc5b5ee635a58f94c483 Mon Sep 17 00:00:00 2001 From: djcb Date: Sat, 21 Apr 2012 10:35:30 +0300 Subject: [PATCH] * s/mu4e-attachments-actions/mu4e-attachment-actions/ --- emacs/mu4e-utils.el | 2 +- emacs/mu4e-vars.el | 2 +- emacs/mu4e-view.el | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/emacs/mu4e-utils.el b/emacs/mu4e-utils.el index e75a6908..6e868e9f 100644 --- a/emacs/mu4e-utils.el +++ b/emacs/mu4e-utils.el @@ -395,7 +395,7 @@ point in eiter the headers buffer or the view buffer." (defun mu4e-choose-action (prompt actions) "Ask user with PROMPT to choose some action from ACTIONS. ACTIONS -is a list of actions like `mu4e-view-attachments-actions', +is a list of actions like `mu4e-view-attachment-actions', `mu4e-view-actions', `mu4e-header-actions'. Returns the action (function) to invoke, or nil. " (if (null actions) diff --git a/emacs/mu4e-vars.el b/emacs/mu4e-vars.el index 7c250f7e..8170040e 100644 --- a/emacs/mu4e-vars.el +++ b/emacs/mu4e-vars.el @@ -300,7 +300,7 @@ where: (defalias 'mu4e-view-open-attachment-emacs 'mu4e--dummy-func) (defalias 'mu4e-view-open-pipe-attachment 'mu4e--dummy-func) -(defvar mu4e-view-attachments-actions +(defvar mu4e-view-attachment-actions '( ("open-with" ?w mu4e-view-open-attachment-with) ("in-emacs" ?e mu4e-view-open-attachment-emacs) ("pipe" ?| mu4e-view-pipe-attachment)) diff --git a/emacs/mu4e-view.el b/emacs/mu4e-view.el index 0c5c8b94..8ce32b65 100644 --- a/emacs/mu4e-view.el +++ b/emacs/mu4e-view.el @@ -277,7 +277,7 @@ is nil, and otherwise open it." (define-key map "e" 'mu4e-view-save-attachment) (define-key map "o" 'mu4e-view-open-attachment) (define-key map "A" 'mu4e-view-attachment-action) - + ;; marking/unmarking (define-key map (kbd "") 'mu4e-mark-for-trash) (define-key map "d" 'mu4e-view-mark-for-trash) @@ -692,7 +692,7 @@ message-at-point, then do it. The actions are specified in (let* ((msg (or msg (mu4e-message-at-point t))) (actionfunc (mu4e-choose-action "Action on attachment: " - mu4e-view-attachments-actions)) + mu4e-view-attachment-actions)) (attnum (mu4e--get-attach-num "Which attachment" msg))) (when (and actionfunc attnum) (funcall actionfunc msg attnum))))