@@ -321,14 +321,6 @@ The outline chooses the theme based on the following criteria:
321
321
(fboundp 'evil-window-middle )
322
322
(fboundp 'evil-window-bottom )))
323
323
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
-
332
324
333
325
; ;;; --- Core objects
334
326
@@ -645,17 +637,17 @@ check the `org-ol-tree-ui-icon-set' variable documentation."
645
637
(cond
646
638
((member org-ol-tree-ui-icon-set org-ol-tree-ui-icon-set-list)
647
639
org-ol-tree-ui-icon-set)
648
- ((and (org-ol-tree-system--graphical-frame -p)
640
+ ((and (display-graphic -p )
649
641
(org-ol-tree-system--all-the-icons-p))
650
642
'all-the-icons )
651
- ((org-ol-tree-system--graphical-frame -p)
643
+ ((display-graphic -p )
652
644
'unicode )
653
645
(t 'ascii )))))
654
646
655
647
656
648
(defun org-ol-tree-ui--use-fancy-icons-p ()
657
649
" 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 )
659
651
(org-ol-tree-system--all-the-icons-p)
660
652
(or (not org-ol-tree-ui-icon-set)
661
653
(member org-ol-tree-ui-icon-set '(all-the-icons iconless-fancy)))))
@@ -800,7 +792,7 @@ Valid states are 'visible, 'exists and 'none."
800
792
801
793
This function takes in account the value of `org-ol-tree-ui-window-use-pixel'
802
794
and if this frame is a graphical frame or not."
803
- (and (org-ol-tree-system--graphical-frame -p)
795
+ (and (display-graphic -p )
804
796
org-ol-tree-ui-window-use-pixel))
805
797
806
798
0 commit comments