From 957b1266bf9e6c39156f9e38241df879c4a78662 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 29 Jun 2025 14:16:05 +0200 Subject: [PATCH] refactor(minimap): replace minimap.el w/ demap.el The former is unmaintained. Fix: #8430 Ref: https://github.com/orgs/doomemacs/projects/5/views/1?pane=issue&itemId=2922285 --- modules/config/default/+emacs-bindings.el | 2 +- modules/config/default/+evil-bindings.el | 2 +- modules/ui/minimap/README.org | 13 +++---------- modules/ui/minimap/config.el | 10 ++-------- modules/ui/minimap/packages.el | 2 +- 5 files changed, 8 insertions(+), 21 deletions(-) diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index 2d2bbe2cc..af8238d33 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -352,7 +352,7 @@ (:when (modulep! :ui indent-guides) :desc "Indent guides" "i" #'indent-bars-mode) (:when (modulep! :ui minimap) - :desc "Minimap mode" "m" #'minimap-mode) + :desc "Minimap mode" "m" #'demap-toggle) (:when (modulep! :lang org +present) :desc "org-tree-slide mode" "p" #'org-tree-slide-mode) :desc "Read-only mode" "r" #'read-only-mode diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 5007dc968..8198a5135 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -879,7 +879,7 @@ :desc "Indent style" "I" #'doom/toggle-indent-style :desc "Line numbers" "l" #'doom/toggle-line-numbers (:when (modulep! :ui minimap) - :desc "Minimap" "m" #'minimap-mode) + :desc "Minimap" "m" #'demap-toggle) (:when (modulep! :lang org +present) :desc "org-tree-slide mode" "p" #'org-tree-slide-mode) :desc "Read-only mode" "r" #'read-only-mode diff --git a/modules/ui/minimap/README.org b/modules/ui/minimap/README.org index f4949135c..fee7cbf45 100644 --- a/modules/ui/minimap/README.org +++ b/modules/ui/minimap/README.org @@ -8,15 +8,13 @@ This module displays a minimap of the buffer in a sidebar, similar to the feature found in many other editors. ** Maintainers -- [[doom-user:][@rushsteve1]] - -[[doom-contrib-maintainer:][Become a maintainer?]] +/This module has no dedicated maintainers./ [[doom-contrib-maintainer:][Become a maintainer?]] ** Module flags /This module has no flags./ ** Packages -- [[doom-package:minimap]] +- [[doom-package:demap]] ** Hacks /No hacks documented for this module./ @@ -43,12 +41,7 @@ There are a number of options provided by the =minimap.el= package this module is based on. The easiest way to see all of them is [[kbd:][SPC h v minimap]]. * Troubleshooting -[[doom-report:][Report an issue?]] - -** Scrolling is slow/laggy -Disable the minimap using [[kbd:][SPC t m]]. - -** TODO Minimap doesn't close when disabled +/There are no known problems with this module./ [[doom-report:][Report one?]] * Frequently asked questions /This module has no FAQs yet./ [[doom-suggest-faq:][Ask one?]] diff --git a/modules/ui/minimap/config.el b/modules/ui/minimap/config.el index 40389aa22..e884d38c4 100644 --- a/modules/ui/minimap/config.el +++ b/modules/ui/minimap/config.el @@ -1,10 +1,4 @@ ;;; ui/minimap/config.el -*- lexical-binding: t; -*- -(use-package! minimap - :defer t - :config - (setq minimap-window-location 'right - minimap-update-delay 0 - minimap-width-fraction 0.09 - minimap-minimum-width 15) - (pushnew! minimap-major-modes 'text-mode 'conf-mode)) +(use-package! demap + :hook (demap-minimap-window-set-hook . hide-mode-line-mode)) diff --git a/modules/ui/minimap/packages.el b/modules/ui/minimap/packages.el index f2d2972a8..6141257fa 100644 --- a/modules/ui/minimap/packages.el +++ b/modules/ui/minimap/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; ui/minimap/packages.el -(package! minimap :pin "5aa0df40bc0d587dffd23adf2e0873d671b0bebf") +(package! demap :pin "c42ec4752544f80ca7c172ff65e705a56089bc96")