mu4e: Adapt to changes after upgrade to mu4e 1.10.8

lisp/init-mu4e.el.template

@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
+(add-to-list 'load-path "/usr/share/emacs/site-lisp/elpa-src/mu4e-1.10.8")
 (require 'mu4e)
 
 
@@ -17,15 +17,14 @@
 ;;(setq mu4e-get-mail-command "offlineimap")
 
 ;; http://cachestocaches.com/2017/3/complete-guide-email-emacs-using-mu-and-/
+;; https://www.djcbsoftware.nl/code/mu/mu4e/Bookmarks.html
 ;; Include a bookmark to open all of my inboxes
 (add-to-list 'mu4e-bookmarks
-             (make-mu4e-bookmark
-              :name "All Inboxes"
+             '(:name "All Inboxes"
               :query "maildir:/INBOX"
               :key ?i))
 (add-to-list 'mu4e-bookmarks
-             (make-mu4e-bookmark
-              :name "Gmail unread"
+             '(:name "Gmail unread"
               :query "maildir:/Gmail AND flag:unread AND NOT flag:trashed"
               :key ?g))
 ;; This allows me to use 'helm' to select mailboxes
@@ -116,7 +115,7 @@
 
 ;; http://pragmaticemacs.com/emacs/master-your-inbox-with-mu4e-and-org-mode/
 ;;store org-mode links to messages
-(require 'org-mu4e)
+(require 'mu4e-org)
 ;;store link to message if in header view, not to header query
 (setq org-mu4e-link-query-in-headers-mode nil)