alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mu4e: attempt to delete loading window upon mu4e-error

Browse Source 
When there's a mu4e-error, opportunistically delete the 'Loading..' window.
This commit is contained in:
Dirk-Jan C. Binnema
2022-01-15 10:44:03 +02:00
parent dfe592ac4f
commit a4e5e3adf5
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mu4e/mu4e-headers.el
View File

@ -1,6 +1,6 @@
;;; mu4e-headers.el -- part of mu4e, the mu mail user agent -*- lexical-binding: t -*- ;;; mu4e-headers.el -- part of mu4e, the mu mail user agent -*- lexical-binding: t -*-
;; Copyright (C) 2011-2021 Dirk-Jan C. Binnema ;; Copyright (C) 2011-2022 Dirk-Jan C. Binnema
;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
@ -1779,19 +1779,13 @@ other windows."
;;; Loading messages ;;; Loading messages
;; ;;
(defvar mu4e-loading-mode-map nil "Keymap for *mu4e-loading* buffers.") (defvar mu4e-loading-mode-map
(unless mu4e-loading-mode-map (let ((map (make-sparse-keymap)))
(setq mu4e-loading-mode-map (define-key map "n" #'ignore)
(let ((map (make-sparse-keymap))) (define-key map "p" #'ignore)
(define-key map "n" 'ignore) (define-key map "q" #'bury-buffer)
(define-key map "p" 'ignore) map)
(define-key map "q" "Keymap for *mu4e-loading* buffers.")
(lambda()(interactive)
(if (eq mu4e-split-view 'single-window)
'kill-buffer
'kill-buffer-and-window)))
map)))
(fset 'mu4e-loading-mode-map mu4e-loading-mode-map)
(define-derived-mode mu4e-loading-mode special-mode (define-derived-mode mu4e-loading-mode special-mode
"mu4e:loading" "mu4e:loading"
@ -1801,7 +1795,12 @@ other windows."
(insert (propertize "Loading message..." (insert (propertize "Loading message..."
'face 'mu4e-system-face 'intangible t)))) 'face 'mu4e-system-face 'intangible t))))
(defun mu4e~loading-close ()
"Bury the mu4e Loading... buffer, if any."
(let* ((buf mu4e~headers-loading-buf)
(win (and (buffer-live-p buf) (get-buffer-window buf t))))
(when (window-live-p win)
(delete-window win))))
;;; _
(provide 'mu4e-headers) (provide 'mu4e-headers)
;;; mu4e-headers.el ends here ;;; mu4e-headers.el ends here

4
mu4e/mu4e-helpers.el
View File

@ -188,6 +188,8 @@ echo area, don't show anything."
(unless (or (active-minibuffer-window)) (unless (or (active-minibuffer-window))
(message "%s" (apply 'mu4e-format frm args)))) (message "%s" (apply 'mu4e-format frm args))))
(declare-function mu4e~loading-close "mu4e-headers")
(defun mu4e-error (frm &rest args) (defun mu4e-error (frm &rest args)
"Display an error with FRM and ARGS like `mu4e-message'. "Display an error with FRM and ARGS like `mu4e-message'.
@ -195,6 +197,8 @@ Create [mu4e]-prefixed error based on format FRM and ARGS. Does a
local-exit and does not return, and raises a local-exit and does not return, and raises a
debuggable (backtrace) error." debuggable (backtrace) error."
(mu4e-log 'error (apply 'mu4e-format frm args)) (mu4e-log 'error (apply 'mu4e-format frm args))
;; opportunistically close the "loading" window.
(mu4e~loading-close)
(error "%s" (apply 'mu4e-format frm args))) (error "%s" (apply 'mu4e-format frm args)))
(defun mu4e-warn (frm &rest args) (defun mu4e-warn (frm &rest args)