diff options
| -rw-r--r-- | .emacs.d/init.el | 4 | ||||
| -rw-r--r-- | .emacs.d/lisp/bandali-ebdb.el | 53 | ||||
| -rw-r--r-- | .emacs.d/lisp/bandali-gnus.el | 5 | ||||
| -rw-r--r-- | .emacs.d/lisp/bandali-message.el | 5 |
4 files changed, 7 insertions, 60 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 0d46aa4..d0ea368 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -145,7 +145,6 @@ This sets each user option VAR's value to the corresponding VALUE. '(;; GNU ELPA (debbugs "0.26") (delight "1.7") - (ebdb "0.6.21") (orgalist "1.13") (rt-liberation "1.31") (yasnippet "0.14.0") @@ -670,7 +669,7 @@ Make N (default: 1) copies of the current line or region." (csetq shr-max-width 80) -;; Email (with Gnus, message, and EBDB) +;; Email (with Gnus and message) (require 'bandali-gnus) (with-eval-after-load 'sendmail (csetq sendmail-program (executable-find "msmtp") @@ -678,7 +677,6 @@ Make N (default: 1) copies of the current line or region." mail-specify-envelope-from t mail-envelope-from 'header)) (require 'bandali-message) -(require 'bandali-ebdb) ;; IRC (with ERC) (require 'bandali-erc) diff --git a/.emacs.d/lisp/bandali-ebdb.el b/.emacs.d/lisp/bandali-ebdb.el deleted file mode 100644 index cc8d577..0000000 --- a/.emacs.d/lisp/bandali-ebdb.el +++ /dev/null @@ -1,53 +0,0 @@ -;;; bandali-ebdb.el --- bandali's EBDB configuration -*- lexical-binding: t; -*- - -;; Copyright (C) 2018-2021 Amin Bandali - -;; Author: Amin Bandali <bandali@gnu.org> -;; Keywords: tools - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see <https://www.gnu.org/licenses/>. - -;;; Commentary: - -;; My EBDB setup. - -;;; Code: - -(with-eval-after-load 'gnus - (require 'ebdb) - (csetq ebdb-sources (b/var "ebdb")) - (with-eval-after-load 'swiper - (add-to-list 'swiper-font-lock-exclude #'ebdb-mode t)) - ;; local key bindings - (define-key gnus-group-mode-map (kbd "e") #'ebdb)) - -(with-eval-after-load 'ebdb - (with-eval-after-load 'ebdb-complete - ;; (csetq ebdb-complete-mail 'capf) - (csetq ebdb-completion-display-record nil) ; <87pn2kk2ig.fsf@ericabrahamsen.net> - (ebdb-complete-enable)) - - (require 'ebdb-message) - - (require 'ebdb-gnus) - (csetq ebdb-gnus-window-size 0.3) - - (require 'ebdb-mua) - (csetq ebdb-mua-pop-up nil)) - -;; (with-eval-after-load 'company-ebdb -;; (defun company-ebdb--post-complete (_) nil)) - -(provide 'bandali-ebdb) -;;; bandali-ebdb.el ends here diff --git a/.emacs.d/lisp/bandali-gnus.el b/.emacs.d/lisp/bandali-gnus.el index 337e620..15f5bd5 100644 --- a/.emacs.d/lisp/bandali-gnus.el +++ b/.emacs.d/lisp/bandali-gnus.el @@ -334,9 +334,8 @@ jami:bandali") (with-eval-after-load 'gnus-group (csetq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)")) -;; problematic with ebdb's popup, *EBDB-Gnus* -;; (with-eval-after-load 'gnus-win -;; (csetq gnus-use-full-window nil)) +(with-eval-after-load 'gnus-win + (csetq gnus-use-full-window nil)) (with-eval-after-load 'gnus-dired (add-hook 'dired-mode-hook 'gnus-dired-mode)) diff --git a/.emacs.d/lisp/bandali-message.el b/.emacs.d/lisp/bandali-message.el index 5952b52..c66a669 100644 --- a/.emacs.d/lisp/bandali-message.el +++ b/.emacs.d/lisp/bandali-message.el @@ -61,7 +61,6 @@ '(gnus-find-subscribed-addresses) message-dont-reply-to-names "\\(\\(amin@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|bandali@fsf\\.org\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\|amin\\.bandali@savoirfairelinux\\.com\\)") - ;; (require 'company-ebdb) ;; (custom-set-faces ;; '(message-header-subject ;; ((t (:foreground "#111" :weight semi-bold)))) @@ -104,6 +103,10 @@ non-nil." (kbd "M-RET") #'b/message-newline-or-asterism) ;; local key bindings + (define-key message-mode-map + [remap next-line] #'mail-abbrev-next-line) + (define-key message-mode-map + [remap end-of-buffer] #'mail-abbrev-end-of-buffer) (defvar b/footnote-prefix-map) (define-prefix-command 'b/footnote-prefix-map) (define-key message-mode-map (kbd "C-c f n") |