Skip to content

Commit 116c777

Browse files
committed
Make use of display-graphical-p
No need for `org-ol-tree-system--graphical-frame-p' as we have the built-in `display-graphical-p', and that recognises the pgtk window system.
1 parent 207c748 commit 116c777

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

org-ol-tree.el

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -321,14 +321,6 @@ The outline chooses the theme based on the following criteria:
321321
(fboundp 'evil-window-middle)
322322
(fboundp 'evil-window-bottom)))
323323

324-
(defun org-ol-tree-system--graphical-frame-p ()
325-
"Return t if current frame is a GUI frame, nil otherwise.
326-
327-
To find out if Emacs is running in GUI mode, we query the variable
328-
`window-system'."
329-
(member window-system '(x w32 ns)))
330-
331-
332324

333325
;;;; --- Core objects
334326

@@ -645,17 +637,17 @@ check the `org-ol-tree-ui-icon-set' variable documentation."
645637
(cond
646638
((member org-ol-tree-ui-icon-set org-ol-tree-ui-icon-set-list)
647639
org-ol-tree-ui-icon-set)
648-
((and (org-ol-tree-system--graphical-frame-p)
640+
((and (display-graphic-p)
649641
(org-ol-tree-system--all-the-icons-p))
650642
'all-the-icons)
651-
((org-ol-tree-system--graphical-frame-p)
643+
((display-graphic-p)
652644
'unicode)
653645
(t 'ascii)))))
654646

655647

656648
(defun org-ol-tree-ui--use-fancy-icons-p ()
657649
"Return t if the selected icon set is one of the `all-the-icons' set."
658-
(and (org-ol-tree-system--graphical-frame-p)
650+
(and (display-graphic-p)
659651
(org-ol-tree-system--all-the-icons-p)
660652
(or (not org-ol-tree-ui-icon-set)
661653
(member org-ol-tree-ui-icon-set '(all-the-icons iconless-fancy)))))
@@ -800,7 +792,7 @@ Valid states are 'visible, 'exists and 'none."
800792
801793
This function takes in account the value of `org-ol-tree-ui-window-use-pixel'
802794
and if this frame is a graphical frame or not."
803-
(and (org-ol-tree-system--graphical-frame-p)
795+
(and (display-graphic-p)
804796
org-ol-tree-ui-window-use-pixel))
805797

806798

0 commit comments

Comments
 (0)