From 653e80e6552dbfedc6712b67a956f3f487ac4056 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 14 May 2017 11:54:18 +0200 Subject: [PATCH] Fix missing 'define-fringe-bitmap' function errors If Emacs wasn't built with X, Cocoa or NS display support (as is the case for evm emacs-25.1-travis build), the fringe library is missing and throws errors. --- core/core-ui.el | 4 +++- modules/feature/syntax-checker/config.el | 5 +++-- modules/ui/doom/config.el | 27 ++++++++++++------------ 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/core/core-ui.el b/core/core-ui.el index bd9479711..1e82d4556 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -218,7 +218,9 @@ file." :init (add-hook 'lisp-mode-hook #'rainbow-delimiters-mode)) ;; indicators for empty lines past EOF -(def-package! vi-tilde-fringe :demand t +(def-package! vi-tilde-fringe + :when (display-graphic-p) + :demand t :config (global-vi-tilde-fringe-mode t)) ;; For a distractions-free-like UI, that dynamically resizes margets and can diff --git a/modules/feature/syntax-checker/config.el b/modules/feature/syntax-checker/config.el index 73fb95353..3ca86de7d 100644 --- a/modules/feature/syntax-checker/config.el +++ b/modules/feature/syntax-checker/config.el @@ -22,8 +22,9 @@ :n "k" #'flycheck-error-list-previous-error :n "RET" #'flycheck-error-list-goto-error) - (define-fringe-bitmap 'flycheck-fringe-bitmap-double-arrow - [0 0 0 0 0 4 12 28 60 124 252 124 60 28 12 4 0 0 0 0]) + (when (fboundp 'define-fringe-bitmap) + (define-fringe-bitmap 'flycheck-fringe-bitmap-double-arrow + [0 0 0 0 0 4 12 28 60 124 252 124 60 28 12 4 0 0 0 0])) (after! evil ;; Flycheck buffer on ESC in normal mode. diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el index 38587d215..dfdae5c55 100644 --- a/modules/ui/doom/config.el +++ b/modules/ui/doom/config.el @@ -124,16 +124,17 @@ ;; subtle diff indicators in the fringe -(after! git-gutter-fringe - ;; places the git gutter outside the margins. - (setq-default fringes-outside-margins t) - ;; thin fringe bitmaps - (fringe-helper-define 'git-gutter-fr:added '(center repeated) - "XXX.....") - (fringe-helper-define 'git-gutter-fr:modified '(center repeated) - "XXX.....") - (fringe-helper-define 'git-gutter-fr:deleted 'bottom - "X......." - "XX......" - "XXX....." - "XXXX....")) +(when (display-graphic-p) + (after! git-gutter-fringe + ;; places the git gutter outside the margins. + (setq-default fringes-outside-margins t) + ;; thin fringe bitmaps + (fringe-helper-define 'git-gutter-fr:added '(center repeated) + "XXX.....") + (fringe-helper-define 'git-gutter-fr:modified '(center repeated) + "XXX.....") + (fringe-helper-define 'git-gutter-fr:deleted 'bottom + "X......." + "XX......" + "XXX....." + "XXXX....")))