[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/nano-modeline 9d5290a 14/24: Merge pull request #4 from
From: |
ELPA Syncer |
Subject: |
[elpa] externals/nano-modeline 9d5290a 14/24: Merge pull request #4 from seblemaguer/fix-mu4e |
Date: |
Wed, 6 Oct 2021 17:57:35 -0400 (EDT) |
branch: externals/nano-modeline
commit 9d5290a045b2f61e585b7e361b42b9743e336dbb
Merge: edcbfe4 53d327a
Author: Nicolas P. Rougier <Nicolas.Rougier@inria.fr>
Commit: GitHub <noreply@github.com>
Merge pull request #4 from seblemaguer/fix-mu4e
Fix function names for mu4e 1.6
---
nano-modeline.el | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/nano-modeline.el b/nano-modeline.el
index b4caadb..fe7cb4c 100644
--- a/nano-modeline.el
+++ b/nano-modeline.el
@@ -196,6 +196,15 @@ Modeline is composed as:
'nano-modeline-inactive-secondary)))))
;; ---------------------------------------------------------------------
+(with-eval-after-load 'mu4e
+ (if (string> mu4e-mu-version "1.6.5")
+ (defun nano-modeline-mu4e-server-props ()
+ "Encapsulates the call to the variable mu4e-/~server-props depending
on the version mu4e."
+ mu4e--server-props)
+ (defun nano-modeline-mu4e-server-props ()
+ "Encapsulates the call to the variable mu4e-/~server-props depending on
the version mu4e."
+ mu4e~server-props)))
+
(defun nano-modeline-mu4e-dashboard-mode-p ()
(bound-and-true-p mu4e-dashboard-mode))
@@ -203,7 +212,7 @@ Modeline is composed as:
(nano-modeline-compose (nano-modeline-status)
"Mail"
(nano-modeline-mu4e-context)
- (format "%d messages" (plist-get mu4e~server-props
:doccount))))
+ (format "%d messages" (plist-get
(nano-modeline-mu4e-server-props) :doccount))))
;; ---------------------------------------------------------------------
;; since the EIN library itself is constantly re-rendering the notebook, and
thus
@@ -372,11 +381,15 @@ Modeline is composed as:
(defun nano-modeline-mu4e-headers-mode ()
(nano-modeline-compose (nano-modeline-status)
- (mu4e~quote-for-modeline mu4e~headers-last-query)
+ (mu4e-quote-for-modeline (mu4e-last-query))
""
""))
(with-eval-after-load 'mu4e
+ (unless (fboundp 'mu4e-last-query)
+ (defun mu4e-last-query ()
+ "Get the most recent query or nil if there is none."
+ mu4e~headers-last-query))
(defun mu4e~header-line-format () (nano-modeline)))
;; ---------------------------------------------------------------------
- [elpa] externals/nano-modeline 42f172f 01/24: Initial import, (continued)
- [elpa] externals/nano-modeline 42f172f 01/24: Initial import, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 8b049b8 02/24: Added installation and usage instructions, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline c574429 07/24: Added screenshots, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 992acf6 10/24: Merge pull request #2 from vllur/patch-1, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 3bfc046 11/24: Added buffer menu mode, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 5036cd2 08/24: Added screenshots for some modes, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline b572986 09/24: Fixed modeline display in HTML files in web-mode, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 5690ea3 06/24: Added screenshots, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 53d327a 13/24: Fix incompatibilities with mu4e > 1.6.5, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 5edeac2 22/24: Typo, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 9d5290a 14/24: Merge pull request #4 from seblemaguer/fix-mu4e,
ELPA Syncer <=
- [elpa] externals/nano-modeline ac0b497 15/24: Cleanup code, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline c3c6f4c 17/24: Fix mu4e modeline and added user mode, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 0c94fc8 20/24: Linting, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline d6cb2a6 23/24: Linting + bugfix (mu4e), ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 8052795 24/24: Added autoload, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline edcbfe4 12/24: Merge remote-tracking branch 'origin/master', ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 18c437b 04/24: Added TTY top/bottom case, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline e84ca06 05/24: Removed optional position, ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 9ca47db 16/24: Merge remote-tracking branch 'origin/master', ELPA Syncer, 2021/10/06
- [elpa] externals/nano-modeline 2bbe1d5 19/24: Linting and removed s.el dependency, ELPA Syncer, 2021/10/06