function rename

3 files changed, 10 insertions, 10 deletions

diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el
index 3993147..5c7e18f 100644
--- a/custom/jao-custom-notmuch.el
+++ b/custom/jao-custom-notmuch.el
@@ -370,7 +370,7 @@
         notmuch-wash-citation-lines-suffix 120
         notmuch-show-text/html-blocked-images "."
         jao-notmuch-header-line-format
-        (if jao-modeline-in-minibuffer
+        (if jao-mode-line-in-minibuffer
             "%Q  [%N / %M / %T] %n / %m / %t"
           "[%N / %M / %T] %n / %m / %t")
         notmuch-show-header-line #'jao-notmuch-message-header-line)
diff --git a/init.el b/init.el
index 4ea0ab8..74e0690 100644
--- a/init.el
+++ b/init.el
@@ -429,7 +429,7 @@
 (column-number-mode 1)
 
 ;;;; jao-mode-line
-(defvar jao-modeline-in-minibuffer (and window-system t))
+(defvar jao-mode-line-in-minibuffer nil)
 
 (use-package jao-mode-line
   :commands (jao-mode-line-add-to-minibuffer
@@ -437,7 +437,7 @@
 
 (add-hook 'after-init-hook
           (lambda ()
-            (when jao-modeline-in-minibuffer
+            (when jao-mode-line-in-minibuffer
               (jao-mode-line-add-to-minibuffer 90))))
 
 ;;;; time display
@@ -456,7 +456,7 @@
 ;;;; mode line toggle
 (use-package jao-mode-line
   :init
-  (when (and window-system (not jao-modeline-in-minibuffer))
+  (when (and window-system (not jao-mode-line-in-minibuffer))
     (add-to-list 'after-make-frame-functions #'jao-mode-line-hide-inactive)
     (add-hook 'after-init-hook #'jao-mode-line-toggle-inactive))
   :demand t
@@ -480,7 +480,7 @@
               battery-mode-line-format " 🔋%b%p% "))
 
 (with-eval-after-load "jao-minibuffer"
-  (unless jao-modeline-in-minibuffer
+  (unless jao-mode-line-in-minibuffer
     (jao-minibuffer-add-variable 'battery-mode-line-string 80)))
 
 ;;; Notifications
@@ -2552,7 +2552,7 @@
     :lighter (:eval (format " [%s]" (jao-circe-nick-no))))
 
   (defun jao-circe-channel-hook ()
-    (if jao-modeline-in-minibuffer
+    (if jao-mode-line-in-minibuffer
         (setq header-line-format
               '(" %b" (:eval (format " - %s nicks" (jao-circe-nick-no)))))
       (jao-circe-user-number-mode 1)))
@@ -2824,7 +2824,7 @@
 (defalias 'jao-streaming-volume-down #'jao-mpris-vol-down)
 
 (jao-mpris-register "playerctld"
-                    :session (if jao-modeline-in-minibuffer -10 70))
+                    :session (if jao-mode-line-in-minibuffer -10 70))
 
 ;;;; mpc
 (use-package jao-mpc
@@ -2842,7 +2842,7 @@
 
 (defsubst jao-mpc-mopidy-p () (equal jao-mpc-last-port jao-mopidy-port))
 
-(jao-mpc-setup jao-mopidy-port (if jao-modeline-in-minibuffer -10 70))
+(jao-mpc-setup jao-mopidy-port (if jao-mode-line-in-minibuffer -10 70))
 
 (defun jao-mpc-pport (&optional mop)
   (cond ((or mop (jao-mpc-playing-p jao-mopidy-port)) jao-mopidy-port)
@@ -3091,7 +3091,7 @@
 (defun jao-xmonad-enable ()
   (setq jao-browse-doc-use-emacs-p (display-graphic-p))
   (setq jao-wallpaper-random-wake t)
-  (setq jao-modeline-in-minibuffer nil)
+  (setq jao-mode-line-in-minibuffer nil)
   (display-battery-mode -1)
   (jao-set-transparency)
   (jao-trisect)
diff --git a/lib/media/jao-spt.el b/lib/media/jao-spt.el
index 649a393..4065905 100644
--- a/lib/media/jao-spt.el
+++ b/lib/media/jao-spt.el
@@ -48,7 +48,7 @@
     st))
 
 (defun jao-spt--pb* (&rest args)
-  (message (apply 'jao-spt--pb args)))
+  (message "%s" (apply 'jao-spt--pb args)))
 
 ;;;###autoload
 (defun jao-spt-play-uri (uri)