From f2c47650653b20de73ce49ea226624ba35a80843 Mon Sep 17 00:00:00 2001 From: TEC Date: Sun, 28 Mar 2021 15:55:47 +0800 Subject: [PATCH] CI: Odd tweaks that seem to be needed --- config.org | 21 +++++++++++---------- misc/config-publishing/initialise.el | 2 ++ misc/config-publishing/org-html.sh | 2 +- misc/config-publishing/org-pdf.sh | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/config.org b/config.org index 035f571..8dcf220 100644 --- a/config.org +++ b/config.org @@ -751,16 +751,17 @@ if the system doesn't have any of those fonts. (if missing-fonts (pp-to-string - `(add-hook! 'doom-init-ui-hook - (run-at-time nil nil - (lambda () - (message "%s missing the following fonts: %s" - (propertize "Warning!" 'face '(bold warning)) - (mapconcat (lambda (font) - (propertize font 'face 'font-lock-variable-name-face)) - ',missing-fonts - ", ")) - (sleep-for 0.5))))) + `(unless noninteractive + (add-hook! 'doom-init-ui-hook + (run-at-time nil nil + (lambda () + (message "%s missing the following fonts: %s" + (propertize "Warning!" 'face '(bold warning)) + (mapconcat (lambda (font) + (propertize font 'face 'font-lock-variable-name-face)) + ',missing-fonts + ", ")) + (sleep-for 0.5)))))) ";; No missing fonts detected") #+end_src diff --git a/misc/config-publishing/initialise.el b/misc/config-publishing/initialise.el index 53e035e..2d424cc 100644 --- a/misc/config-publishing/initialise.el +++ b/misc/config-publishing/initialise.el @@ -84,6 +84,8 @@ (explain-pause-mode -1)) (setq emojify-download-emojis-p t) + (unless (boundp 'image-types) ; why on earth is this needed? + (setq image-types '(svg png gif tiff jpeg xpm xbm pbm))) (after! undo-tree (global-undo-tree-mode -1) diff --git a/misc/config-publishing/org-html.sh b/misc/config-publishing/org-html.sh index c5fead3..981f8d8 100755 --- a/misc/config-publishing/org-html.sh +++ b/misc/config-publishing/org-html.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh ":"; exec emacs --quick --script "$0" -- "$@" # -*- mode: emacs-lisp; lexical-binding: t; -*- -(setq log-file (format "%s-log.txt" (file-name-base load-file-name))) +(setq log-file (expand-file-name (format "%s-log.txt" (file-name-base load-file-name)))) (load (expand-file-name "initialise.el" (file-name-directory load-file-name)) nil t) (initialise t) diff --git a/misc/config-publishing/org-pdf.sh b/misc/config-publishing/org-pdf.sh index f48358c..4bcfffc 100755 --- a/misc/config-publishing/org-pdf.sh +++ b/misc/config-publishing/org-pdf.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh ":"; exec emacs --quick --script "$0" -- "$@" # -*- mode: emacs-lisp; lexical-binding: t; -*- -(setq log-file (format "%s-log.txt" (file-name-base load-file-name))) +(setq log-file (expand-file-name (format "%s-log.txt" (file-name-base load-file-name)))) (load (expand-file-name "initialise.el" (file-name-directory load-file-name)) nil t) (initialise t)