X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/71d35b2418ec19b79c09f15f88e7a46acae9f8c4..db55f368650667b0686cdcd36afa43d33ef219ca:/lisp/org/org-bbdb.el diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el index ca68a20f68..04fd681f87 100644 --- a/lisp/org/org-bbdb.el +++ b/lisp/org/org-bbdb.el @@ -6,7 +6,7 @@ ;; Thomas Baumann ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.10c +;; Version: 6.15a ;; ;; This file is part of GNU Emacs. ;; @@ -259,8 +259,8 @@ The anniversaries are assumed to be stored `org-bbdb-anniversary-field'." (multiple-value-bind (m d y) (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) + (puthash (list m d) (cons (list y + (bbdb-record-name rec) (cadr split)) tmp) org-bbdb-anniv-hash)))))) @@ -292,7 +292,7 @@ This is used by Org to re-create the anniversary hash table." (annivs (gethash (list m d) org-bbdb-anniv-hash)) (text ()) split class form rec recs) - + ;; we don't want to miss people born on Feb. 29th (when (and (= m 3) (= d 1) (not (null (gethash (list 2 29) org-bbdb-anniv-hash))) @@ -303,7 +303,7 @@ This is used by Org to re-create the anniversary hash table." (when annivs (while (setq rec (pop annivs)) - (when rec + (when rec (let* ((class (or (nth 2 rec) org-bbdb-default-anniversary-format)) (form (or (cdr (assoc class