[elpa] externals/org 0522c1850b 3/3: org-read-property-value: Fix DEFAULT arg when values are not restricted

[ELPA Syncer]

branch: externals/org
commit 0522c1850bec82df8daa052637c6cb4a7ccbe943
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    org-read-property-value: Fix DEFAULT arg when values are not restricted
    
    * lisp/org.el (org-read-property-value): Honor DEFAULT argument when
    property can have arbitrary value.
    
    Reported-by: Janek F <xerusx@pm.me>
    Link: 
https://orgmode.org/list/hh0ohv2LgPq86aW2Kp4AFV1VZ3yLuZafFLFqWN_NCciQcy86rxDkcZryr7gyPXrNzjFdP8lhdC0GS4c_XQtVXjOKDD-lqkJjlswSGX7OWvo=@pm.me
---
 lisp/org.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 1947c63a8a..b87d298370 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -13183,7 +13183,11 @@ Optional argument DEFAULT provides a default value for 
PROPERTY."
                         (if (org-string-nw-p current)
                             (format " [%s]" current)
                           "")))
-        (set-function (org-set-property-function property)))
+        (set-function (org-set-property-function property))
+         (default (cond
+                   ((not allowed) default)
+                   ((member default allowed) default)
+                   (t nil))))
     (org-trim
      (if allowed
         (funcall set-function
@@ -13195,7 +13199,7 @@ Optional argument DEFAULT provides a default value for 
PROPERTY."
                                  (and pom
                                       (org-with-point-at pom
                                         (org-property-values property)))))))
-        (funcall set-function prompt all nil nil "" nil current))))))
+        (funcall set-function prompt all nil nil default nil current))))))
 
 (defvar org-last-set-property nil)
 (defvar org-last-set-property-value nil)