X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-maildir-fcc.el;h=07eedba22a33a28ae802f260781c3fbfdeeca582;hp=6fbf82d220b667286c63d13615f814931b1ee5be;hb=71fb37d48236e49b64e300c3764c0e17e02c8f9e;hpb=e3260d025389c2e98dbda58cff1c214497813bc2

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index 6fbf82d2..07eedba2 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -51,13 +51,13 @@ the database.path option in the notmuch configuration file).
 You will be prompted to create the directory if it does not exist
 yet when sending a mail."
 
- :require 'notmuch-fcc-initialization
- :group 'notmuch
  :type '(choice
 	 (const :tag "No FCC header" nil)
 	 (string :tag "A single folder")
 	 (repeat :tag "A folder based on the From header"
-		 (cons regexp (string :tag "Folder")))))
+		 (cons regexp (string :tag "Folder"))))
+ :require 'notmuch-fcc-initialization
+ :group 'notmuch-send)
 
 (defun notmuch-fcc-initialization ()
   "If notmuch-fcc-directories is set,
@@ -140,13 +140,12 @@ will NOT be removed or replaced."
 			    t))
 
 (defun notmuch-maildir-fcc-make-uniq-maildir-id ()
-   (let* ((ct (current-time))
-	  (timeid (+ (* (car ct) 65536) (cadr ct)))
-	  (microseconds (car (cdr (cdr ct))))
+   (let* ((ftime (float-time))
+	  (microseconds (mod (* 1000000 ftime) 1000000))
 	  (hostname (notmuch-maildir-fcc-host-fixer system-name)))
      (setq notmuch-maildir-fcc-count (+ notmuch-maildir-fcc-count 1))
      (format "%d.%d_%d_%d.%s"
-	     timeid
+	     ftime
 	     (emacs-pid)
 	     microseconds
 	     notmuch-maildir-fcc-count