X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-bbdb.el;h=06ea9efe94ea9105c1baeed6d9faec531162817e;hb=6c79137304c0b1d6e94fe8cb3a38f3aad50e0195;hp=d41760641bec8a388c583f641876dc4032356e59;hpb=227a9b3b792a6e82efbeb3a4fdb2490ff7049429;p=elisp%2Ftm.git diff --git a/tm-bbdb.el b/tm-bbdb.el index d417606..06ea9ef 100644 --- a/tm-bbdb.el +++ b/tm-bbdb.el @@ -1,59 +1,114 @@ -;;; -;;; tm-bbdb.el --- tm shred module for BBDB -;;; -;;; Copyright (C) 1995 KOBAYASHI Shuhei -;;; -;;; Author: KOBAYASHI Shuhei -;;; Maintainer: MORIOKA Tomohiko -;;; Version: $Id: tm-bbdb.el,v 2.0 1996/01/23 04:34:12 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. -;;; +;;; tm-bbdb.el --- tm shared module for BBDB + +;; 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 '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")))) + )) + + +;;; @ User Variables +;;; + +(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 (cdr ret)) + (address (car (cdr ret))) (methods tm-bbdb/canonicalize-full-name-methods)) (while (and phrase methods) (setq phrase (funcall (car methods) phrase) methods (cdr methods))) - (cons phrase address) + (if (string= address "") (setq address nil)) + (if (string= phrase "") (setq phrase nil)) + (list phrase address) )) -(fset 'mail-extract-address-components - (symbol-function 'tm-bbdb/extract-address-components)) -(provide 'mail-extr) +(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)) + )) + + +;;; @ bbdb-extract-field-value +;;; (or (fboundp 'tm:bbdb-extract-field-value) (progn ;; (require 'bbdb-hooks) ; not provided. - (or (fboundp 'bbdb-extract-field-value) + ;; (or (fboundp 'bbdb-extract-field-value) ; defined as autoload + (or (fboundp 'bbdb-header-start) (load "bbdb-hooks")) (fset 'tm:bbdb-extract-field-value (symbol-function 'bbdb-extract-field-value)) (defun bbdb-extract-field-value (field) - (let ((value (rfc822/get-field-body field))) + (let ((value (tm:bbdb-extract-field-value field))) (and value (mime-eword/decode-string value)))) )) @@ -86,50 +141,44 @@ (mapconcat 'identity dest " ") )) -(defvar tm-bbdb/canonicalize-full-name-methods nil) - -(setq tm-bbdb/canonicalize-full-name-methods - '(mime-eword/decode-string - tm-bbdb/canonicalize-dots - tm-bbdb/canonicalize-spaces)) +(defvar tm-bbdb/canonicalize-full-name-methods + '(mime-eword/decode-string + tm-bbdb/canonicalize-dots + tm-bbdb/canonicalize-spaces)) ;;; @ 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 tm-bbdb/auto-create-p is non-nil, or if OFFER-TO-CREATE is non-nil and the user confirms the creation." (save-excursion - (and mime::article/preview-buffer - (get-buffer mime::article/preview-buffer) - (set-buffer mime::article/preview-buffer)) + (if (and mime::article/preview-buffer + (get-buffer mime::article/preview-buffer)) + (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"))) - (if (or (null from) - (string-match (bbdb-user-mail-names) - (car - (cdr - ;; (tm-bbdb/extract-address-components from) - (mail-extract-address-components from) - )))) - (setq from (or (rfc822/get-field-body "To") - from))) - (if from - (bbdb-annotate-message-sender - from t - (or (bbdb-invoke-hook-for-value tm-bbdb/auto-create-p) - offer-to-create) - offer-to-create)) - )))) + (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 (std11-field-body "To") from)) + ) + (if from + (bbdb-annotate-message-sender + from t + (or (bbdb-invoke-hook-for-value tm-bbdb/auto-create-p) + offer-to-create) + offer-to-create)) + )))) (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 @@ -160,21 +209,87 @@ 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))) + (define-key mime/viewer-mode-map ";" 'tm-bbdb/edit-notes) + (define-key mime/viewer-mode-map ":" 'tm-bbdb/show-sender) + )) + +(add-hook 'mime-viewer/define-keymap-hook 'tm-bbdb/define-keys) + + +;;; @ for signature.el +;;; + +(defun signature/get-bbdb-sigtype (addr) + "Extract sigtype information from BBDB." + (let ((record (bbdb-search-simple nil addr))) + (and record + (bbdb-record-getprop record 'sigtype)) + )) + +(defun signature/set-bbdb-sigtype (sigtype addr) + "Add sigtype information to BBDB." + (let* ((bbdb-notice-hook nil) + (record (bbdb-annotate-message-sender + addr t + (bbdb-invoke-hook-for-value + bbdb/mail-auto-create-p) + t))) + (if record + (progn + (bbdb-record-putprop record 'sigtype sigtype) + (bbdb-change-record record nil)) + ))) + +(defun signature/get-sigtype-from-bbdb (&optional verbose) + (let* ((to (std11-field-body "To")) + (addr (and to + (car (cdr (mail-extract-address-components to))))) + (sigtype (signature/get-bbdb-sigtype addr)) + return + ) + (if addr + (if verbose + (progn + (setq return (signature/get-sigtype-interactively sigtype)) + (if (and (not (string-equal return sigtype)) + (y-or-n-p + (format "Register \"%s\" for <%s>? " return addr)) + ) + (signature/set-bbdb-sigtype return addr) + ) + return) + (or sigtype + (signature/get-signature-file-name)) + )) + )) ;;; @ end