Use message-field-value instead of message-fetch-field in FCC header setup.

[notmuch] / emacs / notmuch-maildir-fcc.el

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index e5e0549be8e10248cd4587b67919e19e724bbc38..aede753702d01e8d2de62984690d676824cffce2 100644 (file)
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -80,7 +80,7 @@ will NOT be removed or replaced."
   (let ((subdir
         (cond
          ((or (not notmuch-fcc-dirs)
-              (message-fetch-field "Fcc"))
+              (message-field-value "Fcc"))
           ;; Nothing set or an existing header.
           nil)
 
@@ -93,7 +93,7 @@ will NOT be removed or replaced."
           (error "Invalid `notmuch-fcc-dirs' setting (old style)"))
 
          ((listp notmuch-fcc-dirs)
-          (let* ((from (message-fetch-field "From"))
+          (let* ((from (message-field-value "From"))
                  (match
                   (catch 'first-match
                     (dolist (re-folder notmuch-fcc-dirs)
@@ -110,14 +110,15 @@ will NOT be removed or replaced."
     (when subdir
       (message-add-header
        (concat "Fcc: "
-              ;; If the resulting directory is not an absolute path,
-              ;; prepend the standard notmuch database path.
-              (if (= (elt subdir 0) ?/)
-                  subdir
-                (concat (notmuch-database-path) "/" subdir))))
+              (file-truename
+               ;; If the resulting directory is not an absolute path,
+               ;; prepend the standard notmuch database path.
+               (if (= (elt subdir 0) ?/)
+                   subdir
+                 (concat (notmuch-database-path) "/" subdir)))))
       
       ;; finally test if fcc points to a valid maildir
-      (let ((fcc-header (message-fetch-field "Fcc")))
+      (let ((fcc-header (message-field-value "Fcc")))
        (unless (notmuch-maildir-fcc-dir-is-maildir-p fcc-header)
          (cond ((not (file-writable-p fcc-header))
                 (error (format "No permission to create %s, which does not exist"