From 7dcc262d39fbdaae87698b26e6b0be517200df56 Mon Sep 17 00:00:00 2001 From: Miranda Marquez Date: Sat, 25 May 2024 20:45:06 -0800 Subject: [PATCH] move elpaca eldoc seq fix to obsolete.el --- init.el | 23 ----------------------- lisp/obsolete.el | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/init.el b/init.el index 2b8ab80..a081f38 100644 --- a/init.el +++ b/init.el @@ -333,29 +333,6 @@ If the current window occupies the whole frame, split it." `(use-package--orig ,@(-replace :git use-package-git-keyword args)))) ;; (use-package lua-mode :git nil) -;; see https://www.reddit.com/r/emacs/comments/1937vaz/emacs_291_on_windows_install_magit_requires_seq/?rdt=48529 -;; ;; seq version workaround -;; (defun +elpaca-unload-seq (e) -;; (and (featurep 'seq) (unload-feature 'seq t)) -;; (elpaca--continue-build e)) -;; (defun +elpaca-seq-build-steps () -;; (append (butlast (if (file-exists-p (expand-file-name "seq" elpaca-builds-directory)) -;; elpaca--pre-built-steps elpaca-build-steps)) -;; (list '+elpaca-unload-seq 'elpaca--activate-package))) -;; (elpaca seq :build (+elpaca-seq-build-steps)) -;; ;; eldoc version workarounds... -;; (defun global-eldoc-mode (&rest args) -;; "Placeholder function. Do nothing and return nil." -;; nil) -;; (defun +elpaca-unload-eldoc (e) -;; (and (featurep 'eldoc) (unload-feature 'eldoc t)) -;; (elpaca--continue-build e)) -;; (defun +elpaca-eldoc-build-steps () -;; (append (butlast (if (file-exists-p (expand-file-name "eldoc" elpaca-builds-directory)) -;; elpaca--pre-built-steps elpaca-build-steps)) -;; (list '+elpaca-unload-eldoc 'elpaca--activate-package))) -;; (elpaca eldoc :build (+elpaca-eldoc-build-steps)) - (use-package compat) (use-package marginalia :init (marginalia-mode)) ;; (elpaca gcmh (gcmh-mode)) diff --git a/lisp/obsolete.el b/lisp/obsolete.el index be4907e..a65764c 100644 --- a/lisp/obsolete.el +++ b/lisp/obsolete.el @@ -26,6 +26,31 @@ ;;; Code: (error "Please don't load `obsolete.el', it's obsolete.") +;; elpaca eldoc stuff, probably not good anymore +;; see https://www.reddit.com/r/emacs/comments/1937vaz/emacs_291_on_windows_install_magit_requires_seq/?rdt=48529 +;; seq version workaround +(defun +elpaca-unload-seq (e) + (and (featurep 'seq) (unload-feature 'seq t)) + (elpaca--continue-build e)) +(defun +elpaca-seq-build-steps () + (append (butlast (if (file-exists-p (expand-file-name "seq" elpaca-builds-directory)) + elpaca--pre-built-steps elpaca-build-steps)) + (list '+elpaca-unload-seq 'elpaca--activate-package))) +(elpaca seq :build (+elpaca-seq-build-steps)) +;; eldoc version workarounds... +(defun global-eldoc-mode (&rest args) + "Placeholder function. Do nothing and return nil." + nil) +(defun +elpaca-unload-eldoc (e) + (and (featurep 'eldoc) (unload-feature 'eldoc t)) + (elpaca--continue-build e)) +(defun +elpaca-eldoc-build-steps () + (append (butlast (if (file-exists-p (expand-file-name "eldoc" elpaca-builds-directory)) + elpaca--pre-built-steps elpaca-build-steps)) + (list '+elpaca-unload-eldoc 'elpaca--activate-package))) +(elpaca eldoc :build (+elpaca-eldoc-build-steps)) + + ;; scribble SVGs in org buffers like it's 2005 (idk I was a baby then) (use-package edraw :elpaca (:repo "https://github.com/misohena/el-easydraw")