[nongnu] elpa/org-superstar fc62da2f85 077/162: fixed README conflict

[Stefan Kangas]

branch: elpa/org-superstar
commit fc62da2f8501f3b9bd41b406247c3f4bd9563366
Merge: 61bf289b42 a0d2cfaae1
Author: D. Williams <d.williams@posteo.net>
Commit: D. Williams <d.williams@posteo.net>

    fixed README conflict
---
 README.org       | 11 +++++------
 org-superstar.el | 19 +++++++------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/README.org b/README.org
index eb99a8755c..976f6e1086 100644
--- a/README.org
+++ b/README.org
@@ -11,12 +11,11 @@
         now.  Get it out, get it tested, get feedback.
      + UPDATE :: The pull request is done.  Now it's time to be
                  patient.
-   * put the project on Worg :: I guess it's only reasonable to put
-        =org-superstar= on Worg at that point.
-   * (optional) achieving ELPA compliance and getting on ELPA :: I
-        will try to get the package on ELPA too.  However, this seems
-        more involved than to get it on MELPA, with more checks and
-        monitoring before things can go live.
+   * +put the project on Worg+ *UPDATE:* The project is now listed 
[[https://orgmode.org/worg/org-contrib/index.html][here]].
+   * +reviewing open suggestions left on org-bullets+ UPDATE ::  Done.
+   * +(optional) achieving ELPA compliance and getting on ELPA+
+     I have decided against it for the time being.
+
 
 ** =2020-02-26=
    Version *1.0.0* has been released!  With this I consider the package
diff --git a/org-superstar.el b/org-superstar.el
index e8f99584b8..3d5cfbc75e 100644
--- a/org-superstar.el
+++ b/org-superstar.el
@@ -1,11 +1,11 @@
-;;; org-superstar.el --- Prettify headings and plain lists in org-mode -*- 
lexical-binding: t; -*-
+;;; org-superstar.el --- Prettify headings and plain lists in Org mode -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2020  D. Williams, sabof
 
 ;; Author: D. Williams <d.williams@posteo.net>
 ;; Maintainer: D. Williams <d.williams@posteo.net>
 ;; Keywords: faces, outlines
-;; Version: 1.0.0
+;; Version: 1.0.1
 ;; Homepage: https://github.com/integral-dw/org-superstar-mode
 ;; Package-Requires: ((org "9.1.9") (emacs "26.2"))
 
@@ -434,25 +434,20 @@ replaced by their corresponding entry in 
‘org-superstar-item-bullet-alist’."
 (defun org-superstar-headline-or-inlinetask-p ()
   "Return t if the current match is a proper headline or inlinetask."
   (save-match-data
-    (when (org-element-lineage (org-element-at-point)
-                               '(headline inlinetask) t)
-      t)))
+    (and (org-at-heading-p) t)))
 
 (defun org-superstar-headline-p ()
   "Return t if the current match is a proper headline."
   (interactive)
   (save-match-data
-    (when (org-element-lineage (org-element-at-point)
-                               '(headline) t)
-      t)))
+    (org-with-limited-levels
+     (and (org-at-heading-p) t))))
 
 (defun org-superstar-inlinetask-p ()
   "Return t if the current match is a proper inlinetask."
   (and (featurep 'org-inlinetask)
-       (save-match-data
-         (when (org-element-lineage (org-element-at-point)
-                                    '(inlinetask) t)
-           t))))
+       (org-superstar-headline-or-inlinetask-p)
+       (not (org-superstar-headline-p))))
 
 (defun org-superstar-graphic-p ()
   "Return t if the current display supports proper composing."