Browse Source

Incorporate changes from downstream Emacs

Carsten Dominik 16 năm trước cách đây
mục cha
commit
439b4ba088
1 tập tin đã thay đổi với 2 bổ sung2 xóa
  1. 2 2
      lisp/org-bbdb.el

+ 2 - 2
lisp/org-bbdb.el

@@ -237,7 +237,7 @@ italicised, in all other cases it is left unchanged."
 (defun org-bbdb-anniv-extract-date (time-str)
   "Convert YYYY-MM-DD to (month date year).
 Argument TIME-STR is the value retrieved from BBDB."
-  (multiple-value-bind (y m d) (bbdb-split time-str "-")
+  (multiple-value-bind (y m d) (values-list (bbdb-split time-str "-"))
     (list (string-to-number m)
 	  (string-to-number d)
 	  (string-to-number y))))
@@ -270,7 +270,7 @@ The anniversaries are assumed to be stored `org-bbdb-anniversary-field'."
         (while annivs
           (setq split (org-bbdb-anniv-split (pop annivs)))
           (multiple-value-bind (m d y)
-              (funcall org-bbdb-extract-date-fun (car split))
+              (values-list (funcall org-bbdb-extract-date-fun (car split)))
             (setq tmp (gethash (list m d) org-bbdb-anniv-hash))
             (puthash (list m d) (cons (list y
                                             (bbdb-record-name rec)