diff options
| -rw-r--r-- | init.el | 9 | ||||
| -rw-r--r-- | lib/eos/jao-minibuffer.el | 6 |
2 files changed, 6 insertions, 9 deletions
@@ -466,18 +466,13 @@ (column-number-mode -1) ;;;; jao-mode-line -(defvar jao-mode-line-in-minibuffer t) +(defvar jao-mode-line-in-minibuffer nil) (use-package jao-mode-line :commands (jao-mode-line-add-to-minibuffer-left jao-mode-line-add-to-minibuffer-right jao-mode-line-remove-from-minibuffer)) -(add-hook 'after-init-hook - (lambda () - (when jao-mode-line-in-minibuffer - (jao-mode-line-add-to-minibuffer-left 90)))) - ;;;; time display (setq world-clock-list '(("Europe/Paris" "Barcelona") @@ -3050,9 +3045,9 @@ (setq jao-exwm-enabled t) (display-time-mode -1) (jao-ednc-setup 95) - (jao-mode-line-add-to-minibuffer-left) (exwm-enable) (x-change-window-property "_XMONAD_TRAYPAD" "" nil nil nil nil 0) + (jao-mode-line-add-to-minibuffer-left 90) (jao-xmobar-restart) (jao-trisect t)) diff --git a/lib/eos/jao-minibuffer.el b/lib/eos/jao-minibuffer.el index 9bf6f92..44af185 100644 --- a/lib/eos/jao-minibuffer.el +++ b/lib/eos/jao-minibuffer.el @@ -88,7 +88,7 @@ (defun jao-minibuffer--set-message (msg) (when jao-minibuffer-mode - (or (and (string= jao-minibuffer--name (buffer-name)) msg) + (or (and (string= jao-minibuffer--name (or (buffer-name) "")) msg) jao-minibuffer-inhibit (let* ((info (and jao-minibuffer-msg-info (jao-minibuffer--format-info jao-minibuffer-msg-info))) @@ -98,7 +98,9 @@ (pref (when info (let ((len (+ (length info) (length sep)))) (format (format "\n%%%ds" len) "")))) - (msg (if pref (replace-regexp-in-string "\n" pref msg) msg)) + (msg (if (and msg pref) + (replace-regexp-in-string "\n" pref msg) + msg)) (msg (if info (format "%s%s%s " info sep (or msg "")) msg))) (jao-minibuffer--format-msg (or msg "")))))) |