branch: externals/ebdb
commit d806d7da0d5dfc5618c1db4a5f64e7f90b3f3e72
Author: Eric Abrahamsen <e...@ericabrahamsen.net>
Commit: Eric Abrahamsen <e...@ericabrahamsen.net>
Compiler-inspired fixes, vol 335534
Where "compiler" is understood to mean "Stefan"
* ebdb-migrate.el (ebdb-migrate-from-bbdb,
ebdb-migrate-vector-to-class): Get rid of remaining usages of oset.
* ebdb-mu4e.el: Declare functions from message.el
* ebdb-mua.el (ebdb-delete-field): Note unused argument.
* ebdb-pgp.el: Declare function from ebdb-mua.
* ebdb.el (ebdb-sources): Change default and type of ebdb-sources.
---
ebdb-migrate.el | 4 ++--
ebdb-mu4e.el | 1 +
ebdb-mua.el | 2 +-
ebdb-pgp.el | 2 ++
ebdb.el | 18 ++++++++++++------
5 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ebdb-migrate.el b/ebdb-migrate.el
index 0375757..fa48d7a 100644
--- a/ebdb-migrate.el
+++ b/ebdb-migrate.el
@@ -456,7 +456,7 @@ BBDB sets the default of that option."
(goto-char (point-min)))
(dolist (r c-records)
(ebdb-init-record r))
- (eieio-oset target-db 'dirty t)
+ (setf (slot-value target-db 'dirty) t)
(message "Migrating records from BBDB... %d records migrated"
(length c-records))))))
@@ -530,7 +530,7 @@ BBDB sets the default of that option."
:mail (cadr bits))
mails))))
(when mails
- (oset (car (last mails)) priority 'primary)))
+ (setf (slot-value (car (last mails)) 'priority) 'primary)))
(when xfields
(dolist (x xfields)
(setq lab (car x)
diff --git a/ebdb-mu4e.el b/ebdb-mu4e.el
index 04fd715..dc87fef 100644
--- a/ebdb-mu4e.el
+++ b/ebdb-mu4e.el
@@ -29,6 +29,7 @@
(defvar mu4e~view-buffer-name)
(defvar mu4e-view-mode-map)
+(declare-function message-field-value "message")
;; Tackle `mu4e-headers-mode' later
diff --git a/ebdb-mua.el b/ebdb-mua.el
index 33130d6..d2cc931 100644
--- a/ebdb-mua.el
+++ b/ebdb-mua.el
@@ -543,7 +543,7 @@ variable should be set before EBDB is loaded.")
(cl-call-next-method))
(cl-defmethod ebdb-delete-field ((f ebdb-field-mail-folder)
- &optional record unload)
+ &optional record _unload)
(when record
(let* ((folder (slot-value f 'folder))
(mails (mapcar #'regexp-quote (ebdb-record-mail-canon record)))
diff --git a/ebdb-pgp.el b/ebdb-pgp.el
index 0dc7fa3..cad93a0 100644
--- a/ebdb-pgp.el
+++ b/ebdb-pgp.el
@@ -28,6 +28,8 @@
(require 'message)
(require 'ebdb-com)
+(declare-function ebdb-mua-message-header "ebdb-mua")
+
(defcustom ebdb-pgp-default-action nil
"Default action when sending a message and the recipients are not in EBDB.
This should be one of the following symbols:
diff --git a/ebdb.el b/ebdb.el
index 1c9249a..c029918 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -109,18 +109,24 @@ See also `ebdb-silent'.")
"Options for an EIEIO version of EBDB."
:group 'ebdb)
-(defcustom ebdb-sources "~/.emacs.d/ebdb"
- "User option specifying where EBDB contacts should be loaded
-from. It can be a single element, or a list of multiple
-elements. If an element is a string, it is treated as a
-filename, and used to create an instance of `ebdb-db-file'.
+(defcustom ebdb-sources (locate-user-emacs-file "ebdb")
+ "User option specifying EBDB database sources.
+It can be a single element, or a list of elements. If an element
+is a string, it is treated as a filename, and used to create an
+instance of `ebdb-db-file'.
Elements can also be instances of subclasses of `ebdb-db'.
Currently, the only subclass is `ebdb-db-file', though you can
create your own. When EBDB is loaded, the `ebdb-db-load' method
will be called on each of class instances."
:group 'ebdb-eieio
- :type 'string)
+ ;; Apparently we can't specify EBDB objects here.
+ :type '(choice (file :tag "File")
+ ; (ebdb-db :tag "EBDB database instance")
+ (repeat (file :tag "File")
+ ;; (choice (file :tag "File")
+ ;; (ebdb-db :tag "EBDB database instance"))
+ )))
(defcustom ebdb-auto-merge-records nil
"If t, EBDB will automatically merge multiple records with the
