[elpa] externals/org f469257: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit f4692572baa082394bcf6c27c59deebe2f62c3c4
Merge: f5cfd32 4ab2a4b
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'maint'
---
 lisp/org-clock.el | 2 +-
 lisp/org.el       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 72f84f6..c94f607 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1366,7 +1366,7 @@ the default behavior."
                        (end-of-line 0)
                        (org-in-item-p)))
             (beginning-of-line 1)
-            (indent-line-to (- (current-indentation) 2)))
+            (indent-line-to (max 0 (- (current-indentation) 2))))
           (insert org-clock-string " ")
           (setq org-clock-effort (org-entry-get (point) org-effort-property))
           (setq org-clock-total-time (org-clock-sum-current-item
diff --git a/lisp/org.el b/lisp/org.el
index ed209c3..7d87334 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1587,7 +1587,7 @@ When this variable is set to t, Org assumes that you write
 outlines by indenting text in each node to align with the
 headline (after the stars).
 
-When this variable is set to 'headline-data, only adapt the
+When this variable is set to `headline-data', only adapt the
 indentation of the data lines right below the headline, such as
 planning/clock lines and property/logbook drawers.
 
@@ -1613,9 +1613,9 @@ time in Emacs."
   :type '(choice
          (const :tag "Adapt indentation for all lines" t)
          (const :tag "Adapt indentation for headline data lines"
-                'headline-data)
+                headline-data)
          (const :tag "Do not adapt indentation at all" nil))
-  :safe #'booleanp)
+  :safe (lambda (x) (memq x '(t nil headline-data))))
 
 (defvaralias 'org-special-ctrl-a 'org-special-ctrl-a/e)