* [PATCH] org-attach: Make dispatcher commands customizable
@ 2019-04-26 19:33 Eric Danan
2019-04-27 16:51 ` Nicolas Goaziou
0 siblings, 1 reply; 4+ messages in thread
From: Eric Danan @ 2019-04-26 19:33 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
Hello,
As discussed previously,
https://lists.gnu.org/r/emacs-orgmode/2018-11/msg00038.html
here is a patch to make the list of commands in the org-attach
dispatcher customizable.
Eric
[-- Attachment #2: 0001-org-attach-Make-dispatcher-commands-customizable.patch --]
[-- Type: text/plain, Size: 7294 bytes --]
From 868d2f26a7f4a3ad6d70477193f2abed2d245970 Mon Sep 17 00:00:00 2001
From: Eric Danan <ricouilletaff@gmail.com>
Date: Fri, 26 Apr 2019 21:21:00 +0200
Subject: [PATCH] org-attach: Make dispatcher commands customizable
* lisp/org-attach.el (org-attach-commands): New custom variable.
(org-attach): Use the above variable.
---
lisp/org-attach.el | 109 ++++++++++++++++++++++++---------------------
1 file changed, 58 insertions(+), 51 deletions(-)
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 63b3840a..22dc3765 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -152,12 +152,47 @@ (defcustom org-attach-annex-auto-get 'ask
(const :tag "always get from annex if necessary" t)
(const :tag "never get from annex" nil)))
+(defcustom org-attach-commands
+ '(((?a ?\C-a) org-attach-attach "Select a file and attach it to the task, using `org-attach-method'.")
+ ((?c ?\C-c) org-attach-attach-cp "Attach a file using copy method.")
+ ((?m ?\C-m) org-attach-attach-mv "Attach a file using move method.")
+ ((?l ?\C-l) org-attach-attach-ln "Attach a file using link method.")
+ ((?y ?\C-y) org-attach-attach-lns "Attach a file using symbolic-link method.")
+ ((?u ?\C-u) org-attach-url "Attach a file from URL (downloading it).")
+ ((?b) org-attach-buffer "Select a buffer and attach its contents to the task.")
+ ((?n ?\C-n) org-attach-new "Create a new attachment, as an Emacs buffer.")
+ ((?z ?\C-z) org-attach-sync "Synchronize the current task with its attachment\n directory, in case you added attachments yourself.\n")
+ ((?o ?\C-o) org-attach-open "Open current task's attachments.")
+ ((?O) org-attach-open-in-emacs "Like \"o\", but force opening in Emacs.")
+ ((?f ?\C-f) org-attach-reveal "Open current task's attachment directory.")
+ ((?F) org-attach-reveal-in-emacs "Like \"f\", but force using dired in Emacs.\n")
+ ((?d ?\C-d) org-attach-delete-one "Delete one attachment, you will be prompted for a file name.")
+ ((?D) org-attach-delete-all "Delete all of a task's attachments. A safer way is\n to open the directory in dired and delete from there.\n")
+ ((?s ?\C-s) org-attach-set-directory "Set a specific attachment directory for this entry or reset to default.")
+ ((?i ?\C-i) org-attach-set-inherit "Make children of the current entry inherit its attachment directory.\n")
+ ((?q) (lambda () (interactive) (message "Abort")) "Abort."))
+ "The list of commands for the attachment dispatcher.
+Each entry in this list is a list of three elements:
+- A list of keys (characters) to select the command (the fist
+ character in the list is shown in the attachment dispatcher's
+ splash buffer and minubuffer prompt).
+- A command that is called interactively when one of these keys
+ is pressed.
+- A docstring for this command in the attachment dispatcher's
+ splash buffer."
+ :group 'org-attach
+ :package-version '(Org . "9.2")
+ :version "26.2"
+ :type '(repeat (list (repeat :tag "Keys" character)
+ (function :tag "Command")
+ (string :tag "Docstring"))))
+
;;;###autoload
(defun org-attach ()
"The dispatcher for attachment commands.
Shows a list of commands and prompts for another key to execute a command."
(interactive)
- (let (c marker)
+ (let (c marker command)
(when (eq major-mode 'org-agenda-mode)
(setq marker (or (get-text-property (point) 'org-hd-marker)
(get-text-property (point) 'org-marker)))
@@ -172,59 +207,31 @@ (defun org-attach ()
(save-window-excursion
(unless org-attach-expert
(with-output-to-temp-buffer "*Org Attach*"
- (princ "Select an Attachment Command:
-
-a Select a file and attach it to the task, using `org-attach-method'.
-c/m/l/y Attach a file using copy/move/link/symbolic-link method.
-u Attach a file from URL (downloading it).
-b Select a buffer and attach its contents to the task.
-n Create a new attachment, as an Emacs buffer.
-z Synchronize the current task with its attachment
- directory, in case you added attachments yourself.
-
-o Open current task's attachments.
-O Like \"o\", but force opening in Emacs.
-f Open current task's attachment directory.
-F Like \"f\", but force using dired in Emacs.
-
-d Delete one attachment, you will be prompted for a file name.
-D Delete all of a task's attachments. A safer way is
- to open the directory in dired and delete from there.
-
-s Set a specific attachment directory for this entry or reset to default.
-i Make children of the current entry inherit its attachment directory.")))
+ (princ (format "Select an Attachment Command:\n\n%s"
+ (mapconcat
+ (lambda (entry)
+ (format "%s %s"
+ (char-to-string (car (nth 0 entry)))
+ (replace-regexp-in-string "\n\\([\t ]*\\)"
+ " "
+ (nth 2 entry)
+ nil nil 1)))
+ org-attach-commands
+ "\n")))))
(org-fit-window-to-buffer (get-buffer-window "*Org Attach*"))
- (message "Select command: [acmlyubnzoOfFdD]")
+ (message "Select command: [%s]" (mapconcat
+ (lambda (entry)
+ (char-to-string (car (nth 0 entry))))
+ org-attach-commands
+ ""))
(setq c (read-char-exclusive))
(and (get-buffer "*Org Attach*") (kill-buffer "*Org Attach*"))))
- (cond
- ((memq c '(?a ?\C-a)) (call-interactively 'org-attach-attach))
- ((memq c '(?c ?\C-c))
- (let ((org-attach-method 'cp)) (call-interactively 'org-attach-attach)))
- ((memq c '(?m ?\C-m))
- (let ((org-attach-method 'mv)) (call-interactively 'org-attach-attach)))
- ((memq c '(?l ?\C-l))
- (let ((org-attach-method 'ln)) (call-interactively 'org-attach-attach)))
- ((memq c '(?y ?\C-y))
- (let ((org-attach-method 'lns)) (call-interactively 'org-attach-attach)))
- ((memq c '(?u ?\C-u))
- (let ((org-attach-method 'url)) (call-interactively 'org-attach-url)))
- ((eq c ?b) (call-interactively 'org-attach-buffer))
- ((memq c '(?n ?\C-n)) (call-interactively 'org-attach-new))
- ((memq c '(?z ?\C-z)) (call-interactively 'org-attach-sync))
- ((memq c '(?o ?\C-o)) (call-interactively 'org-attach-open))
- ((eq c ?O) (call-interactively 'org-attach-open-in-emacs))
- ((memq c '(?f ?\C-f)) (call-interactively 'org-attach-reveal))
- ((memq c '(?F)) (call-interactively 'org-attach-reveal-in-emacs))
- ((memq c '(?d ?\C-d)) (call-interactively
- 'org-attach-delete-one))
- ((eq c ?D) (call-interactively 'org-attach-delete-all))
- ((eq c ?q) (message "Abort"))
- ((memq c '(?s ?\C-s)) (call-interactively
- 'org-attach-set-directory))
- ((memq c '(?i ?\C-i)) (call-interactively
- 'org-attach-set-inherit))
- (t (error "No such attachment command %c" c))))))
+ (if (setq command (cl-some (lambda (entry)
+ (when (memq c (nth 0 entry))
+ (nth 1 entry)))
+ org-attach-commands))
+ (call-interactively command)
+ (error "No such attachment command %c" c)))))
(defun org-attach-dir (&optional create-if-not-exists-p)
"Return the directory associated with the current entry.
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] org-attach: Make dispatcher commands customizable
2019-04-26 19:33 [PATCH] org-attach: Make dispatcher commands customizable Eric Danan
@ 2019-04-27 16:51 ` Nicolas Goaziou
2019-05-02 8:11 ` Eric Danan
0 siblings, 1 reply; 4+ messages in thread
From: Nicolas Goaziou @ 2019-04-27 16:51 UTC (permalink / raw)
To: Eric Danan; +Cc: emacs-orgmode
Hello,
Eric Danan <eric.danan@u-cergy.fr> writes:
> As discussed previously,
>
> https://lists.gnu.org/r/emacs-orgmode/2018-11/msg00038.html
>
> here is a patch to make the list of commands in the org-attach
> dispatcher customizable.
Applied, with small fixes. Thank you.
Would you mind proving an entry in ORG-NEWS?
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] org-attach: Make dispatcher commands customizable
2019-04-27 16:51 ` Nicolas Goaziou
@ 2019-05-02 8:11 ` Eric Danan
2019-05-02 22:04 ` Nicolas Goaziou
0 siblings, 1 reply; 4+ messages in thread
From: Eric Danan @ 2019-05-02 8:11 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
Sure, here it is.
On 2019-04-27 18:51, Nicolas Goaziou wrote:
> Hello,
>
> Eric Danan <eric.danan@u-cergy.fr> writes:
>
>> As discussed previously,
>>
>> https://lists.gnu.org/r/emacs-orgmode/2018-11/msg00038.html
>>
>> here is a patch to make the list of commands in the org-attach
>> dispatcher customizable.
>
> Applied, with small fixes. Thank you.
>
> Would you mind proving an entry in ORG-NEWS?
>
>
> Regards,
>
[-- Attachment #2: 0001-ORG-NEWS-Mention-new-variable-org-attach-commands.patch --]
[-- Type: text/plain, Size: 852 bytes --]
From 6005fd1c68ddaf15eeb060726e6d8324c2526e85 Mon Sep 17 00:00:00 2001
From: Eric Danan <ricouilletaff@gmail.com>
Date: Thu, 2 May 2019 10:05:00 +0200
Subject: [PATCH] ORG-NEWS: Mention new variable org-attach-commands
---
etc/ORG-NEWS | 3 +++
1 file changed, 3 insertions(+)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 8568b23d..6d467722 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -261,6 +261,9 @@ specify default directory and with ~:file~ header argument.
If breadcrumbs are showed in org-agenda with the help of "%b" format
in ~org-agenda-prefix-format~, user can customize breadcrumbs's
separator using ~org-agenda-breadcrumbs-separator~.
+*** New variable ~org-attach-commands~
+This variable makes it possible to customize the list of commands for
+the attachment dispatcher.
* Version 9.2
** Incompatible changes
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] org-attach: Make dispatcher commands customizable
2019-05-02 8:11 ` Eric Danan
@ 2019-05-02 22:04 ` Nicolas Goaziou
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Goaziou @ 2019-05-02 22:04 UTC (permalink / raw)
To: Eric Danan; +Cc: emacs-orgmode
Hello,
Eric Danan <eric.danan@u-cergy.fr> writes:
> Sure, here it is.
Applied. Thank you.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-02 22:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-26 19:33 [PATCH] org-attach: Make dispatcher commands customizable Eric Danan
2019-04-27 16:51 ` Nicolas Goaziou
2019-05-02 8:11 ` Eric Danan
2019-05-02 22:04 ` Nicolas Goaziou
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).