branch: externals/ebdb
commit 4290d25f749cf33e2d9195e4914d983760a18c0d
Author: Eric Abrahamsen <e...@ericabrahamsen.net>
Commit: Eric Abrahamsen <e...@ericabrahamsen.net>
Fix errors caught by compiler, release 0.8.2
Things I should have caught (with the compiler) _before_ I pushed
* ebdb-i18n-basic.el (ebdb-parse-i18n): Was throwing away this value.
* ebdb.el (ebdb-diary-anniversaries): There's no longer an "entry" variable.
(ebdb-field-anniv-diary-entry): Ignore ignorable vars.
---
ebdb-i18n-basic.el | 3 ++-
ebdb.el | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ebdb-i18n-basic.el b/ebdb-i18n-basic.el
index 65843ee..d2bf7f4 100644
--- a/ebdb-i18n-basic.el
+++ b/ebdb-i18n-basic.el
@@ -113,7 +113,8 @@ number, and any remaining as an extension."
slots
:extension
(when (and (null (string-empty-p numstr))
- (string-to-number numstr)))))
+ (string-match-p "[[:digit:]]+" numstr))
+ (string-to-number numstr))))
(args-out-of-range nil))
slots))
diff --git a/ebdb.el b/ebdb.el
index cfffec5..42cab93 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -2,7 +2,7 @@
;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
-;; Version: 0.8.1
+;; Version: 0.8.2
;; Package-Requires: ((emacs "25.1") (seq "2.15"))
;; Maintainer: Eric Abrahamsen <e...@ericabrahamsen.net>
@@ -2214,7 +2214,7 @@ Eventually this method will go away."
;; If not, we're just marking dates on the
;; calendar, so any non-nil response value is
;; fine.
- entry))
+ t))
entries "; ")))))
(cl-defmethod ebdb-init-field ((anniv ebdb-field-anniversary) record)
@@ -3276,7 +3276,7 @@ If FIELD doesn't specify a year, use the current year."
The entry is a string noting how many years have passed for
RECORD's FIELD anniversary, relative to NOW-YEAR."
;; Essentially a re-write of `diary-anniversary'.
- (pcase-let* ((`(,month ,day ,year) (slot-value field 'date))
+ (pcase-let* ((`(,_ ,_ ,year) (slot-value field 'date))
(label (slot-value field 'label))
(num-years (when (and year now-year)
(- now-year year))))
