Require format-spec and fix some adding/removal to frame-title

memento-mori.el

@@ -46,12 +46,14 @@
 
 ;;; Code:
 
+(require 'format-spec)
+
 (defgroup memento-mori nil
   "Reminder of our mortality."
   :group 'help)
 
 (defcustom memento-mori-display-in-modeline t
   "If non-nil, `memento-mori-mode' will add mementos to the mode line.
 Really, it adds it to the `global-mode-string', which usually
 appears in the mode line, however, if you have customized your
 mode line it may not appear."
@@ -59,7 +61,7 @@
   :type 'boolean)
 
 (defcustom memento-mori-display-in-frame-title nil
   "If non-nil, `memento-mori-mode' will add mementos to the frame title."
   :group 'memento-mori
   :type 'boolean)
 
@@ -245,8 +247,8 @@
 (defvar memento-mori-string ""
   "The memento mori memento.
 The string shown in the mode line and/or frame title when
 `memento-mori-mode' is enabled.  This is not meant to be changed
 by the user, but can be used in other places such as org-mode
 agendas to display the current momento.")
 
 (defvar memento-mori--modeline-construct
@@ -278,7 +280,7 @@
     (error "Birth date not set.  Try M-x customize-group memento-mori")))
 
 (defun memento-mori--parse-time (value)
   "Return your birth time in `encode-time' format.
 The birth time is parsed from `memento-mori-birth-date' using
 `parse-time-string'.  An error is signaled if it is not valid."
   (when (symbolp value)
@@ -312,7 +314,7 @@
   "Randomly choose a quote from `memento-mori-quotes'."
   (nth (random (length memento-mori-quotes)) memento-mori-quotes))
 
 (defun memento-mori--format-memento (memento)
   "Format MEMENTO based on the current time."
   (let* ((format-string (car memento))
          (args-plist (cdr memento))
@@ -320,7 +322,7 @@
          (since-value (plist-get args-plist :since))
          (_ (when (not (or until-value since-value))
                  (error ":since or :until required.  Parsing %s" memento)))
          (current-time-list nil)
          (until-seconds (when until-value
                           (float-time
                            (time-subtract
@@ -351,7 +353,7 @@
                                      (/ since-seconds (* 60 60 24))
                                      days))
                            (t 0)))))
     (format-spec format-string
                  `((?Y . ,years)
                    (?y . ,(truncate years))
                    (?M . ,months)
@@ -387,13 +389,13 @@
   (when (and memento-mori-initial-scratch-message
              (boundp 'initial-scratch-message))
     (setq initial-scratch-message
           (format-spec memento-mori-initial-scratch-message
                        `((?m . ,memento-mori-string)
                          (?q . ,(memento-mori--random-quote)))
                        'ignore))))
 
 (defun memento-mori--add-mementos ()
   "Adds constructs to mode line and/or frame title to display `memento-mori-mementos'.
 Where it adds it is controlled by `memento-mori-display-in-modeline' and
 `memento-mori-display-in-frame-title' respectively.
 
@@ -409,12 +411,13 @@
   (if memento-mori-display-in-frame-title
       (if (stringp frame-title-format)
           (setq frame-title-format
-                (list frame-title-format memento-mori--frame-title-construct))
+                (list frame-title-format 'memento-mori--frame-title-construct))
         (add-to-list 'frame-title-format
-                     'memento-mori--frame-title-construct))
+                     'memento-mori--frame-title-construct
+                     t))
     (when (listp frame-title-format)
       (setq frame-title-format
-            (delete memento-mori--frame-title-construct frame-title-format)))))
+            (delete 'memento-mori--frame-title-construct frame-title-format)))))
 
 ;;;###autoload
 (define-minor-mode memento-mori-mode