From 5cf1857add945f72450c8fabf5dcb994f21a3f27 Mon Sep 17 00:00:00 2001 From: Vincent Zhang Date: Fri, 21 Dec 2018 01:41:39 +0800 Subject: [PATCH] Feature: #70 Support for the package Minions. --- README.md | 1 + doom-modeline.el | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5ec0b83..5d2d6dc 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ The `doom-modeline` was designed for minimalism, and offers: - An indicator for recording a macro - Local `python`/`ruby`/`perl`/`go`/`elixir` version in the major-mode - A customizable mode-line height (see `doom-modeline-height`) +- A minor modes segment which is compatible with `minions` - An error/warning count segment for `flycheck` - A workspace number segment for `eyebrowse` - A perspective name segment for `persp-mode` diff --git a/doom-modeline.el b/doom-modeline.el index 8828340..b4821e5 100644 --- a/doom-modeline.el +++ b/doom-modeline.el @@ -40,6 +40,7 @@ ;; - An indicator for recording a macro ;; - Local python/ruby version in the major-mode ;; - A customizable mode-line height (see doom-modeline-height) +;; - A minor modes segment which is compatible with minions ;; - An error/warning count segment for flycheck ;; - A workspace number segment for eyebrowse ;; - A perspective name segment for persp-mode @@ -170,6 +171,8 @@ It returns a file name which can be used directly as argument of (defvar iedit-mode) (defvar iedit-occurrences-overlays) (defvar mc/mode-line) +(defvar minions-mode) +(defvar minions-mode-line-lighter) (defvar persp-nil-name) (defvar symbol-overlay-keywords-alist) (defvar symbol-overlay-temp-symbol) @@ -205,6 +208,7 @@ It returns a file name which can be used directly as argument of (declare-function image-get-display-property 'image-mode) (declare-function lsp-mode-line 'lsp-mode) (declare-function magit-toplevel 'magit-git) +(declare-function minions-minor-modes-menu 'minions) (declare-function persp-add-buffer 'persp-mode) (declare-function persp-contain-buffer-p 'persp-mode) (declare-function persp-remove-buffer 'persp-mode) @@ -929,10 +933,20 @@ mouse-3: Toggle minor modes" (doom-modeline-def-segment minor-modes (when doom-modeline-minor-modes - (propertize - (concat (format-mode-line `(:propertize ("" minor-mode-alist))) - " ") - 'face (if (doom-modeline--active) 'doom-modeline-buffer-minor-mode)))) + (if (bound-and-true-p minions-mode) + (concat + " " + (propertize minions-mode-line-lighter + 'face (if (doom-modeline--active) 'doom-modeline-buffer-minor-mode) + 'help-echo "Minions +mouse-1: Display minor modes menu" + 'mouse-face 'mode-line-highlight + 'local-map (make-mode-line-mouse-map + 'mouse-1 #'minions-minor-modes-menu)) + " ") + (propertize + (concat (format-mode-line `(:propertize ("" minor-mode-alist))) " ") + 'face (if (doom-modeline--active) 'doom-modeline-buffer-minor-mode))))) ;;