branch: externals/bbdb
commit 9ab5a174bb739b63df2fb1579648da862b89f77f
Author: Roland Winkler <wink...@gnu.org>
Commit: Roland Winkler <wink...@gnu.org>
bbdb-message-header: Use rmail-get-header.
---
bbdb-mua.el | 8 +++++---
bbdb-rmail.el | 13 +------------
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/bbdb-mua.el b/bbdb-mua.el
index db31b06..46b993b 100644
--- a/bbdb-mua.el
+++ b/bbdb-mua.el
@@ -1,6 +1,6 @@
;;; bbdb-mua.el --- various MUA functionality for BBDB -*- lexical-binding: t
-*-
-;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
;; This file is part of the Insidious Big Brother Database (aka BBDB),
@@ -48,7 +48,7 @@
(autoload 'vm-check-for-killed-summary "vm-misc")
(autoload 'vm-error-if-folder-empty "vm-misc")
- (autoload 'bbdb/rmail-header "bbdb-rmail")
+ (autoload 'rmail-get-header "rmail")
(defvar rmail-buffer)
(autoload 'bbdb/mh-header "bbdb-mhe")
@@ -115,7 +115,9 @@ MIME encoded headers are decoded. Return nil if HEADER
does not exist."
;; See
http://permalink.gmane.org/gmane.emacs.gnus.general/78741
(eq mua 'gnus) (gnus-fetch-original-field header))
((eq mua 'vm) (bbdb/vm-header header))
- ((eq mua 'rmail) (bbdb/rmail-header header))
+ ((eq mua 'rmail)
+ (with-current-buffer rmail-buffer
+ (rmail-get-header header)))
((eq mua 'mh) (bbdb/mh-header header))
((eq mua 'mu4e) (message-field-value header))
((eq mua 'wl) (bbdb/wl-header header))
diff --git a/bbdb-rmail.el b/bbdb-rmail.el
index 719617d..35449b5 100644
--- a/bbdb-rmail.el
+++ b/bbdb-rmail.el
@@ -1,6 +1,6 @@
;;; bbdb-rmail.el --- BBDB interface to Rmail -*- lexical-binding: t -*-
-;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
;; This file is part of the Insidious Big Brother Database (aka BBDB),
@@ -26,18 +26,7 @@
(require 'bbdb)
(require 'bbdb-com)
(require 'bbdb-mua)
-(require 'rmail)
(require 'rmailsum)
-(require 'mailheader)
-
-;;;###autoload
-(defun bbdb/rmail-header (header)
- "Pull HEADER out of Rmail header."
- (with-current-buffer rmail-buffer
- (save-restriction
- (with-no-warnings (rmail-narrow-to-non-pruned-header))
- (mail-header (intern-soft (downcase header))
- (mail-header-extract)))))
;;;###autoload
(defun bbdb-insinuate-rmail ()
