merge: pull request #5333 from tecosaur/mu4e-hotfixes

Mu4e hotfixes

modules/email/mu4e/README.org

@@ -260,7 +260,7 @@ If you have completely lost your install then you can use this handy command!
 
 #+BEGIN_SRC  shell
 find / -type d -iname '*mu4e*'
-# I reccomend rerouting all of the error to /dev/null
+# I recommend rerouting all of the errors to /dev/null
 find / -type d -iname '*mu4e*' 2> /dev/null
 #+END_SRC
 

modules/email/mu4e/autoload/mu-lock.el

@@ -22,7 +22,7 @@
                    (insert-file-contents +mu4e-lock-file)
                    (buffer-string))))
            (process (process-attributes pid)))
-      (if (and process (string-match-p "emacs" (alist-get 'args process)))
+      (if (and process (string-match-p "[Ee]macs" (alist-get 'comm process)))
           (cons pid process)
         (delete-file +mu4e-lock-file) nil))))
 

modules/email/mu4e/config.el

@@ -282,11 +282,11 @@ Usefull for affecting HTML export config.")
     (+mu4e-compose-org-msg-handle-toggle (/= 1 (or toggle-p 0)))
     (funcall orig-fn))
 
-  (defadvice! +mu4e-draft-open-signature-a (orig-fn compose-type &optional msg)
+  (defadvice! +mu4e-draft-open-signature-a (orig-fn &rest args)
     "Prevent `mu4e-compose-signature' from being used with `org-msg-mode'."
     :around #'mu4e-draft-open
     (let ((mu4e-compose-signature (unless org-msg-mode mu4e-compose-signature)))
-      (funcall orig-fn compose-type msg)))
+      (apply orig-fn args)))
 
   (map! :map org-msg-edit-mode-map
         "TAB" #'org-msg-tab) ; only <tab> bound by default