From 490554d3c49e6a6fd5efb98e76b4e0be3d4101fd Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 22 Dec 2018 22:30:29 -0500 Subject: [PATCH] [emacs] switch from bbdb to ebdb again --- .gitmodules | 13 ++++++++++++ init.org | 54 +++++++++++++++++++++++++++++++++++++++++++++++- lib/company-ebdb | 1 + lib/ebdb | 1 + lib/ebdb-gnorb | 1 + lib/gnorb | 1 + 6 files changed, 70 insertions(+), 1 deletion(-) create mode 160000 lib/company-ebdb create mode 160000 lib/ebdb create mode 160000 lib/ebdb-gnorb create mode 160000 lib/gnorb diff --git a/.gitmodules b/.gitmodules index 0d78b1b..b4eb1d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -35,6 +35,9 @@ [submodule "company"] path = lib/company url = git@github.com:company-mode/company-mode.git +[submodule "company-ebdb"] + path = lib/company-ebdb + url = git@github.com:emacsmirror/company-ebdb.git [submodule "crux"] path = lib/crux url = git@github.com:bbatsov/crux.git @@ -55,6 +58,12 @@ [submodule "doom-themes"] path = lib/doom-themes url = git@github.com:hlissner/emacs-doom-themes.git +[submodule "ebdb"] + path = lib/ebdb + url = git@github.com:emacsmirror/ebdb.git +[submodule "ebdb-gnorb"] + path = lib/ebdb-gnorb + url = git@github.com:emacsmirror/ebdb-gnorb.git [submodule "edit-indirect"] path = lib/edit-indirect url = git@github.com:Fanael/edit-indirect.git @@ -109,6 +118,10 @@ [submodule "git-modes"] path = lib/git-modes url = git@github.com:magit/git-modes.git +[submodule "gnorb"] + path = lib/gnorb + url = git@github.com:girzel/gnorb.git + no-byte-compile = gnorb-bbdb.el [submodule "graphql"] path = lib/graphql url = git@github.com:vermiculus/graphql.el.git diff --git a/init.org b/init.org index ae458c7..eea005d 100644 --- a/init.org +++ b/init.org @@ -2229,7 +2229,59 @@ Convenient footnotes in =message-mode=. footnote-style 'unicode)) #+end_src -** bbdb +** ebdb + +#+begin_src emacs-lisp +(use-package ebdb + :defer 1 + :bind (:map gnus-group-mode-map ("e" . ebdb)) + :config + (setq ebdb-sources (no-littering-expand-var-file-name "ebdb")) + (after! swiper + (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t))) + +(use-package ebdb-com + :after ebdb) + +;; (use-package ebdb-complete +;; :after ebdb +;; :config +;; (ebdb-complete-enable)) + +(use-package company-ebdb + :after (:all company message) + :config + (defun company-ebdb--post-complete (_) nil) + :hook + (message-mode . (lambda () + (add-to-list (make-local-variable 'company-backends) + 'company-ebdb)))) + +(use-package ebdb-gnus + :after ebdb + :custom + (ebdb-gnus-window-configuration + '(article + (vertical 1.0 + (summary 0.25 point) + (horizontal 1.0 + (article 1.0) + (ebdb-gnus 0.3)))))) + +(use-package ebdb-mua + :after ebdb + ;; :custom (ebdb-mua-pop-up nil) + ) + +;; (use-package ebdb-message +;; :after ebdb) + + +;; (use-package ebdb-vcard +;; :after ebdb) +#+end_src + +** COMMENT bbdb Manually install bbdb (=lisp/bbdb= copied from an ELPA-based setup), because installing it from source on Emacs 27 using the following diff --git a/lib/company-ebdb b/lib/company-ebdb new file mode 160000 index 0000000..692a272 --- /dev/null +++ b/lib/company-ebdb @@ -0,0 +1 @@ +Subproject commit 692a272a47d4f48d0ea38ced4375f9eb2cd47ff6 diff --git a/lib/ebdb b/lib/ebdb new file mode 160000 index 0000000..4444031 --- /dev/null +++ b/lib/ebdb @@ -0,0 +1 @@ +Subproject commit 44440310e739df9d46aaa38f9ac275199f25f439 diff --git a/lib/ebdb-gnorb b/lib/ebdb-gnorb new file mode 160000 index 0000000..461a6b3 --- /dev/null +++ b/lib/ebdb-gnorb @@ -0,0 +1 @@ +Subproject commit 461a6b35dc9322d1ec59547ad845d26a6c65a698 diff --git a/lib/gnorb b/lib/gnorb new file mode 160000 index 0000000..17fd6e9 --- /dev/null +++ b/lib/gnorb @@ -0,0 +1 @@ +Subproject commit 17fd6e9ca6f116e2d0d70ab1e9d7132b3a8bfd47 -- 2.20.1