X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-bbdb.el;h=06ea9efe94ea9105c1baeed6d9faec531162817e;hb=6c79137304c0b1d6e94fe8cb3a38f3aad50e0195;hp=253c1b6fc58da47dd880875a0c8c4688b9c1dc5f;hpb=7daeb476bdb289acaea91d4ef3041194b62f65bb;p=elisp%2Ftm.git diff --git a/tm-bbdb.el b/tm-bbdb.el index 253c1b6..06ea9ef 100644 --- a/tm-bbdb.el +++ b/tm-bbdb.el @@ -1,48 +1,79 @@ -;;; ;;; tm-bbdb.el --- tm shared module for BBDB -;;; -;;; Copyright (C) 1995,1996 KOBAYASHI Shuhei -;;; Copyright (C) 1996 Artur Pioro -;;; -;;; Author: KOBAYASHI Shuhei -;;; Artur Pioro -;;; modified by Pekka Marjola -;;; Maintainer: KOBAYASHI Shuhei -;;; Version: $Id: tm-bbdb.el,v 7.10 1996/07/01 23:43:25 morioka Exp $ -;;; Keywords: mail, news, MIME, multimedia, multilingual, BBDB -;;; -;;; This file is part of tm (Tools for MIME). -;;; -;;; 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 2, 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, write to the Free Software -;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -;;; + +;; Copyright (C) 1995,1996 Shuhei KOBAYASHI +;; Copyright (C) 1996 Artur Pioro + +;; Author: Shuhei KOBAYASHI +;; Artur Pioro +;; Maintainer: Shuhei KOBAYASHI +;; Version: $Id: tm-bbdb.el,v 7.27 1996/12/10 14:24:23 morioka Exp $ +;; Keywords: mail, news, MIME, multimedia, multilingual, BBDB + +;; This file is part of tm (Tools for MIME). + +;; 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 2, 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 GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + ;;; Code: -(require 'bbdb) -(require 'bbdb-com) -(require 'tl-822) +(require 'std11) (require 'tm-ew-d) (require 'tm-view) +(if (module-installed-p 'bbdb-com) + (require 'bbdb-com) + (eval-when-compile + ;; imported from bbdb-1.51 + (defmacro bbdb-pop-up-elided-display () + '(if (boundp 'bbdb-pop-up-elided-display) + bbdb-pop-up-elided-display + bbdb-elided-display)) + (defmacro bbdb-user-mail-names () + "Returns a regexp matching the address of the logged-in user" + '(or bbdb-user-mail-names + (setq bbdb-user-mail-names + (concat "\\b" (regexp-quote (user-login-name)) "\\b")))) + )) -;;; @ mail-extr +;;; @ User Variables ;;; -(defvar tm-bbdb/use-mail-extr t) +(defvar tm-bbdb/use-mail-extr t + "*If non-nil, `mail-extract-address-components' is used. +Otherwise `tm-bbdb/extract-address-components' overrides it.") + +(defvar tm-bbdb/auto-create-p nil + "*If t, create new BBDB records automatically. +If function, then it is called with no arguments to decide whether an +entry should be automatically creaded. + +tm-bbdb uses this variable instead of `bbdb/mail-auto-create-p' or +`bbdb/news-auto-create-p' unless other tm-MUA overrides it.") + +(defvar tm-bbdb/delete-empty-window nil + "*If non-nil, delete empty BBDB window. +All bbdb-MUAs but bbdb-gnus display BBDB window even if it is empty. +If you prefer behavior of bbdb-gnus, set this variable to t. + +For framepop users: If empty, `framepop-banish' is used instead.") + +;;; @ mail-extr +;;; (defun tm-bbdb/extract-address-components (str) - (let* ((ret (rfc822/extract-address-components str)) + (let* ((ret (std11-extract-address-components str)) (phrase (car ret)) (address (car (cdr ret))) (methods tm-bbdb/canonicalize-full-name-methods)) @@ -57,6 +88,9 @@ (or tm-bbdb/use-mail-extr (progn (require 'mail-extr) ; for `what-domain' + (or (fboundp 'tm:mail-extract-address-components) + (fset 'tm:mail-extract-address-components + (symbol-function 'mail-extract-address-components))) (fset 'mail-extract-address-components (symbol-function 'tm-bbdb/extract-address-components)) )) @@ -116,8 +150,6 @@ ;;; @ BBDB functions for mime/viewer-mode ;;; -(defvar tm-bbdb/auto-create-p nil) - (defun tm-bbdb/update-record (&optional offer-to-create) "Return the record corresponding to the current MIME previewing message. Creating or modifying it as necessary. A record will be created if @@ -129,14 +161,14 @@ the user confirms the creation." (set-buffer mime::article/preview-buffer)) (if bbdb-use-pop-up (tm-bbdb/pop-up-bbdb-buffer offer-to-create) - (let* ((from (rfc822/get-field-body "From")) + (let* ((from (std11-field-body "From")) (addr (if from (car (cdr (mail-extract-address-components from)))))) (if (or (null from) (null addr) (string-match (bbdb-user-mail-names) addr)) - (setq from (or (rfc822/get-field-body "To") - from))) + (setq from (or (std11-field-body "To") from)) + ) (if from (bbdb-annotate-message-sender from t @@ -146,7 +178,7 @@ the user confirms the creation." )))) (defun tm-bbdb/annotate-sender (string) - "Add a line to the end of the Notes field of the BBDB record + "Add a line to the end of the Notes field of the BBDB record corresponding to the sender of this message." (interactive (list (if bbdb-readonly-p @@ -177,21 +209,31 @@ This buffer will be in bbdb-mode, with associated keybindings." (defun tm-bbdb/pop-up-bbdb-buffer (&optional offer-to-create) "Make the *BBDB* buffer be displayed along with the MIME preview window(s), displaying the record corresponding to the sender of the current message." - (bbdb-pop-up-bbdb-buffer - (function (lambda (w) - (let ((b (current-buffer))) - (set-buffer (window-buffer w)) - (prog1 (eq major-mode 'mime/viewer-mode) - (set-buffer b)))))) - (let ((bbdb-gag-messages t) - (bbdb-use-pop-up nil) - (bbdb-electric-p nil)) - (let ((record (tm-bbdb/update-record offer-to-create)) - (bbdb-elided-display (bbdb-pop-up-elided-display)) - (b (current-buffer))) - (bbdb-display-records (if record (list record) nil)) - (set-buffer b) - record))) + (let ((framepop (eq temp-buffer-show-function 'framepop-display-buffer))) + (or framepop + (bbdb-pop-up-bbdb-buffer + (function + (lambda (w) + (let ((b (current-buffer))) + (set-buffer (window-buffer w)) + (prog1 (eq major-mode 'mime/viewer-mode) + (set-buffer b))))))) + (let ((bbdb-gag-messages t) + (bbdb-use-pop-up nil) + (bbdb-electric-p nil)) + (let ((record (tm-bbdb/update-record offer-to-create)) + (bbdb-elided-display (bbdb-pop-up-elided-display)) + (b (current-buffer))) + (if framepop + (if record + (bbdb-display-records (list record)) + (framepop-banish)) + (bbdb-display-records (if record (list record) nil)) + (if (and (null record) + tm-bbdb/delete-empty-window) + (delete-windows-on (get-buffer "*BBDB*")))) + (set-buffer b) + record)))) (defun tm-bbdb/define-keys () (let ((mime/viewer-mode-map (current-local-map))) @@ -215,9 +257,9 @@ displaying the record corresponding to the sender of the current message." (defun signature/set-bbdb-sigtype (sigtype addr) "Add sigtype information to BBDB." (let* ((bbdb-notice-hook nil) - (record (bbdb-annotate-message-sender + (record (bbdb-annotate-message-sender addr t - (bbdb-invoke-hook-for-value + (bbdb-invoke-hook-for-value bbdb/mail-auto-create-p) t))) (if record @@ -227,11 +269,11 @@ displaying the record corresponding to the sender of the current message." ))) (defun signature/get-sigtype-from-bbdb (&optional verbose) - (let* ((to (rfc822/get-field-body "To")) + (let* ((to (std11-field-body "To")) (addr (and to (car (cdr (mail-extract-address-components to))))) (sigtype (signature/get-bbdb-sigtype addr)) - return + return ) (if addr (if verbose