[PATCH]: org-attach.el: Use `force' arg everywhere in `org-attach-delete-all'

[PATCH]: org-attach.el: Use `force' arg everywhere in `org-attach-delete-all'

[Tim Visher]

[-- Attachment #1.1: Type: text/plain, Size: 1935 bytes --]

From 9a8abeee9109f24d8643990a561c16c8b402b1b1 Mon Sep 17 00:00:00 2001
From: Tim Visher <tim.visher@gmail.com>
Date: Tue, 3 Mar 2020 09:14:44 -0500
Subject: [PATCH] org-attach.el: Use `force' arg everywhere in
 `org-attach-delete-all'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* lisp/org-attach.el (org-attach-delete-all): Use `force' arg
throughout function.

`org-attach-delete-all` advertised a `force` option but passing it
only forced its way past the initial "Really remove all…" query.  This
was unexpected and not properly documented.

This extends the use of the `force` argument to the `delete-directory`
call and documents its meaning in the docstring.

TINYCHANGE
---
 lisp/org-attach.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 429d69021..26099aab3 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -574,13 +574,17 @@ The attachment is created as an Emacs buffer."
 (defun org-attach-delete-all (&optional force)
   "Delete all attachments from the current outline node.
 This actually deletes the entire attachment directory.
-A safer way is to open the directory in dired and delete from there."
+A safer way is to open the directory in dired and delete from there.
+
+If FORCE is truthy, directory will be recursively deleted with no
+prompts."
   (interactive "P")
   (let ((attach-dir (org-attach-dir)))
     (when (and attach-dir
        (or force
    (yes-or-no-p "Really remove all attachments of this entry? ")))
-      (delete-directory attach-dir (yes-or-no-p "Recursive?") t)
+      (delete-directory attach-dir (or force
+       (yes-or-no-p "Recursive?")) t)
       (message "Attachment directory removed")
       (run-hook-with-args 'org-attach-after-change-hook attach-dir)
       (org-attach-untag))))
-- 
2.19.1

[-- Attachment #1.2: Type: text/html, Size: 2259 bytes --]

[-- Attachment #2: 0001-org-attach.el-Use-force-arg-everywhere-in-org-attach.patch --]
[-- Type: application/octet-stream, Size: 1893 bytes --]

From 9a8abeee9109f24d8643990a561c16c8b402b1b1 Mon Sep 17 00:00:00 2001
From: Tim Visher <tim.visher@gmail.com>
Date: Tue, 3 Mar 2020 09:14:44 -0500
Subject: [PATCH] org-attach.el: Use `force' arg everywhere in
 `org-attach-delete-all'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* lisp/org-attach.el (org-attach-delete-all): Use `force' arg
throughout function.

`org-attach-delete-all` advertised a `force` option but passing it
only forced its way past the initial "Really remove all…" query.  This
was unexpected and not properly documented.

This extends the use of the `force` argument to the `delete-directory`
call and documents its meaning in the docstring.

TINYCHANGE
---
 lisp/org-attach.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 429d69021..26099aab3 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -574,13 +574,17 @@ The attachment is created as an Emacs buffer."
 (defun org-attach-delete-all (&optional force)
   "Delete all attachments from the current outline node.
 This actually deletes the entire attachment directory.
-A safer way is to open the directory in dired and delete from there."
+A safer way is to open the directory in dired and delete from there.
+
+If FORCE is truthy, directory will be recursively deleted with no
+prompts."
   (interactive "P")
   (let ((attach-dir (org-attach-dir)))
     (when (and attach-dir
 	       (or force
 		   (yes-or-no-p "Really remove all attachments of this entry? ")))
-      (delete-directory attach-dir (yes-or-no-p "Recursive?") t)
+      (delete-directory attach-dir (or force
+				       (yes-or-no-p "Recursive?")) t)
       (message "Attachment directory removed")
       (run-hook-with-args 'org-attach-after-change-hook attach-dir)
       (org-attach-untag))))
-- 
2.19.1

Re: [PATCH]: org-attach.el: Use `force' arg everywhere in `org-attach-delete-all'

[Kyle Meyer]

Tim Visher <tim.visher@gmail.com> writes:

> * lisp/org-attach.el (org-attach-delete-all): Use `force' arg
> throughout function.
>
> `org-attach-delete-all` advertised a `force` option but passing it
> only forced its way past the initial "Really remove all…" query.  This
> was unexpected and not properly documented.
>
> This extends the use of the `force` argument to the `delete-directory`
> call and documents its meaning in the docstring.

Sounds reasonable to me.

>  (defun org-attach-delete-all (&optional force)
>    "Delete all attachments from the current outline node.
>  This actually deletes the entire attachment directory.
> -A safer way is to open the directory in dired and delete from there."
> +A safer way is to open the directory in dired and delete from there.
> +
> +If FORCE is truthy, directory will be recursively deleted with no
> +prompts."

While I think any reader would know what you meant by "truthy",
"non-nil" would be more standard/familiar in the context of elisp
docstrings.  Or, given this is an interactive command, "With prefix
argument FORCE" or something along those lines.

>    (interactive "P")
>    (let ((attach-dir (org-attach-dir)))
>      (when (and attach-dir
>         (or force
>     (yes-or-no-p "Really remove all attachments of this entry? ")))
> -      (delete-directory attach-dir (yes-or-no-p "Recursive?") t)
> +      (delete-directory attach-dir (or force
> +       (yes-or-no-p "Recursive?")) t)

With Emacs 25 or newer and the default font-lock levels, you should see
"t)" highlighted with font-lock-warning-face because t is "hidden behind
a deeper element".  You could fix it by moving t to its own line, but to
my eyes keeping the entire delete-directory on a single line would be
readable enough.

Thanks.

Re: [PATCH]: org-attach.el: Use `force' arg everywhere in `org-attach-delete-all'

[Tim Visher]

[-- Attachment #1.1: Type: text/plain, Size: 2089 bytes --]

Hi Kyle,

Thanks for feedback!

------------------------------------------

From 626bd68a324cd65ba697dc1ccafdeff5808fd4c0 Mon Sep 17 00:00:00 2001
From: Tim Visher <tim.visher@gmail.com>
Date: Tue, 3 Mar 2020 09:14:44 -0500
Subject: [PATCH] org-attach.el: Use `force' arg everywhere in
 `org-attach-delete-all'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* lisp/org-attach.el (org-attach-delete-all): Use `force' arg
throughout function.

`org-attach-delete-all` advertised a `force` option but passing it
only forced its way past the initial "Really remove all…" query.  This
was unexpected and not properly documented.

This extends the use of the `force` argument to the `delete-directory`
call and documents its meaning in the docstring.

TINYCHANGE
---
 lisp/org-attach.el | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 429d69021..57d1360fc 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -574,13 +574,18 @@ The attachment is created as an Emacs buffer."
 (defun org-attach-delete-all (&optional force)
   "Delete all attachments from the current outline node.
 This actually deletes the entire attachment directory.
-A safer way is to open the directory in dired and delete from there."
+A safer way is to open the directory in dired and delete from there.
+
+With prefix argument FORCE, directory will be recursively deleted
+with no prompts."
   (interactive "P")
   (let ((attach-dir (org-attach-dir)))
     (when (and attach-dir
               (or force
                   (yes-or-no-p "Really remove all attachments of this
entry? ")))
-      (delete-directory attach-dir (yes-or-no-p "Recursive?") t)
+      (delete-directory attach-dir
+                       (or force (yes-or-no-p "Recursive?"))
+                       t)
       (message "Attachment directory removed")
       (run-hook-with-args 'org-attach-after-change-hook attach-dir)
       (org-attach-untag))))
--
2.19.1

[-- Attachment #1.2: Type: text/html, Size: 2710 bytes --]

[-- Attachment #2: 0001-org-attach.el-Use-force-arg-everywhere-in-org-attach.patch --]
[-- Type: application/octet-stream, Size: 1898 bytes --]

From 626bd68a324cd65ba697dc1ccafdeff5808fd4c0 Mon Sep 17 00:00:00 2001
From: Tim Visher <tim.visher@gmail.com>
Date: Tue, 3 Mar 2020 09:14:44 -0500
Subject: [PATCH] org-attach.el: Use `force' arg everywhere in
 `org-attach-delete-all'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* lisp/org-attach.el (org-attach-delete-all): Use `force' arg
throughout function.

`org-attach-delete-all` advertised a `force` option but passing it
only forced its way past the initial "Really remove all…" query.  This
was unexpected and not properly documented.

This extends the use of the `force` argument to the `delete-directory`
call and documents its meaning in the docstring.

TINYCHANGE
---
 lisp/org-attach.el | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 429d69021..57d1360fc 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -574,13 +574,18 @@ The attachment is created as an Emacs buffer."
 (defun org-attach-delete-all (&optional force)
   "Delete all attachments from the current outline node.
 This actually deletes the entire attachment directory.
-A safer way is to open the directory in dired and delete from there."
+A safer way is to open the directory in dired and delete from there.
+
+With prefix argument FORCE, directory will be recursively deleted
+with no prompts."
   (interactive "P")
   (let ((attach-dir (org-attach-dir)))
     (when (and attach-dir
 	       (or force
 		   (yes-or-no-p "Really remove all attachments of this entry? ")))
-      (delete-directory attach-dir (yes-or-no-p "Recursive?") t)
+      (delete-directory attach-dir
+			(or force (yes-or-no-p "Recursive?"))
+			t)
       (message "Attachment directory removed")
       (run-hook-with-args 'org-attach-after-change-hook attach-dir)
       (org-attach-untag))))
-- 
2.19.1

Re: [PATCH]: org-attach.el: Use `force' arg everywhere in `org-attach-delete-all'

[Kyle Meyer]

Applied with 70c1eec55.