From 838520902cd4f0d83fb57929a7323b4d9142739f Mon Sep 17 00:00:00 2001 From: Rutherther Date: Tue, 25 Jun 2024 21:54:53 +0200 Subject: [PATCH] fix: use system-type, not window-system, it's nil for daemon --- early-init.el | 2 +- init.el | 2 +- lisp/android-setup.el | 2 +- lisp/elpaca-loader.el | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/early-init.el b/early-init.el index c349828..ca3485a 100644 --- a/early-init.el +++ b/early-init.el @@ -58,7 +58,7 @@ (setq-default font-lock-multiline t) (when - (memq window-system '(pgtk x)) + (memq system-type '(gnu gnu/linux)) (customize-set-variable 'default-frame-alist '((font . "Hack") diff --git a/init.el b/init.el index 5b5623e..5682615 100644 --- a/init.el +++ b/init.el @@ -165,7 +165,7 @@ "XDG_DATA_HOME" "NIX_PATH")) :config - (unless (memq window-system '(w32 android)) + (unless (memq system-type '(windows-nt android)) (exec-path-from-shell-initialize))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/android-setup.el b/lisp/android-setup.el index 0ebf296..1444950 100644 --- a/lisp/android-setup.el +++ b/lisp/android-setup.el @@ -1,5 +1,5 @@ ;; Android early setup -(when (eq window-system 'android) +(when (eq system-type 'android) (setenv "PATH" (format "%s:%s" "/data/data/com.termux/files/usr/bin" (getenv "PATH"))) (push "/data/data/com.termux/files/usr/bin" exec-path) diff --git a/lisp/elpaca-loader.el b/lisp/elpaca-loader.el index c38b010..8e49177 100644 --- a/lisp/elpaca-loader.el +++ b/lisp/elpaca-loader.el @@ -39,7 +39,7 @@ (add-hook 'after-init-hook #'elpaca-process-queues) (elpaca `(,@elpaca-order)) -(when (eq window-system 'w32) +(when (eq system-type 'windows-nt) (elpaca-no-symlink-mode)) (elpaca elpaca-use-package -- 2.48.1