tm 7.48.1.

diff --git a/ChangeLog b/ChangeLog
index 29647b7..e82969e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Mar 14 13:39:57 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * signature.el: Function `signature-check-in-bbdb' was moved to
+       tm-bbdb.el.
+
+       * tm-bbdb.el (signature-check-in-bbdb): New function; moved from
+       signature.el.
+
 Wed Mar 13 18:05:28 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * tl: Version 7.18 was released.
@@ -14,8 +22,8 @@ Wed Mar 13 17:55:33 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 Wed Mar 13 16:23:26 1996  Shuhei KOBAYASHI <shuhei@cmpt01.phys.tohoku.ac.jp>
 
-       * tm-bbdb.el: fixed problem for no-phrase route-address like
-       ``From: <route-address>''. (cf.[tm-ja:1663])
+       * tm-bbdb.el: fixed problem for wrong From field, such as
+       ``From: <>''. (cf.[tm-ja:1663])
 
 Tue Mar 12 19:37:54 1996  Artur Pioro <artur@flugor.if.uj.edu.pl>
 

diff --git a/Makefile b/Makefile
index 7470280..490b618 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els tl/*.el \
 
 FILES  = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
 
-TARFILE = tm7.48.tar.gz
+TARFILE = tm7.48.1.tar.gz
 
 elc:
        $(EMACS) $(FLAGS) -l inst-tm -f compile-tm

diff --git a/signature.el b/signature.el
index 3d9a52c..129f28c 100644 (file)
--- a/signature.el
+++ b/signature.el
@@ -11,7 +11,7 @@
 ;;;         Artur Pioro <artur@flugor.if.uj.edu.pl>
 ;;; Created: 1994/7/11
 ;;; Version:
-;;;    $Id: signature.el,v 7.6 1996/03/13 17:30:16 morioka Exp $
+;;;    $Id: signature.el,v 7.7 1996/03/14 13:39:57 morioka Exp $
 ;;; Keywords: mail, news, signature
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -61,6 +61,8 @@ if non-nil. [signature.el]")
 ;;;        (("To" . ("sim" "oku"))   . "~/.signature-formal")
 ;;;        ))
 
+(autoload 'signature-check-in-bbdb "tm-bbdb")
+
 (defun signature/get-signature-file-name ()
   (catch 'tag
     (let ((r signature-file-alist) cell b f)
@@ -156,38 +158,6 @@ named <signature-file-name>-DISTRIBUTION interactively."
        (call-interactively 'signature/insert-signature-at-eof)
     (call-interactively 'signature/insert-signature-at-point)))
 
-(defun signature-check-in-bbdb (address)
-  "Returns 'sigtype field from BBDB for user specified by ADDRESS"
-  (require 'bbdb)
-  (require 'bbdb-com)
-  (let ((addr-comp (mail-extract-address-components address))
-       full-name net-name records record sigtype)
-    (setq full-name (car addr-comp))
-    (setq net-name (mapconcat (lambda (x) x) (cdr addr-comp) "\\|"))
-    (setq records
-         (or
-          (and full-name
-               (bbdb-search (bbdb-records) full-name))
-          (and net-name
-               (bbdb-search (bbdb-records) nil nil net-name))))
-    (setq record (car records))
-    (setq records (cdr records))
-    (setq sigtype (and record (bbdb-record-getprop record 'sigtype)))
-    (while (and (not sigtype) records)
-      (setq record (car records))
-      (setq records (cdr records))
-      (setq sigtype (bbdb-record-getprop record 'sigtype)))
-    (if sigtype
-       (message (concat "Using signature for: "
-                        (bbdb-record-firstname record) " "
-                        (bbdb-record-lastname record)
-                        (and (bbdb-record-aka record)
-                             (concat " (AKA: "
-                                     (car (bbdb-record-aka record))
-                                     ")"))
-                        " <" (car (bbdb-record-net record)) ">")))
-    sigtype))
-
 
 ;;; @ end
 ;;;

diff --git a/tm-bbdb.el b/tm-bbdb.el
index 277371d..023ac84 100644 (file)
--- a/tm-bbdb.el
+++ b/tm-bbdb.el
@@ -1,11 +1,13 @@
 ;;;
 ;;; tm-bbdb.el --- tm shared module for BBDB
 ;;;
-;;; Copyright (C) 1995 KOBAYASHI Shuhei <shuhei@cmpt01.phys.tohoku.ac.jp>
+;;; Copyright (C) 1995,1996 KOBAYASHI Shuhei
+;;; Copyright (C) 1996 Artur Pioro
 ;;;
 ;;; Author: KOBAYASHI Shuhei <shuhei@cmpt01.phys.tohoku.ac.jp>
+;;;         Artur Pioro <artur@flugor.if.uj.edu.pl>
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; Version: $Id: tm-bbdb.el,v 7.0 1996/03/13 16:23:26 morioka Exp $
+;;; Version: $Id: tm-bbdb.el,v 7.2 1996/03/14 13:41:48 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual, BBDB
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -27,6 +29,7 @@
 ;;; Code:
 
 (require 'bbdb)
+(require 'bbdb-com)
 (require 'tl-822)
 (require 'tm-ew-d)
 (require 'tm-view)
@@ -189,6 +192,40 @@ displaying the record corresponding to the sender of the current message."
       record)))
 
 
+;;; @ for signature.el
+;;;
+
+(defun signature-check-in-bbdb (address)
+  "Returns 'sigtype field from BBDB for user specified by ADDRESS"
+  (let ((addr-comp (mail-extract-address-components address))
+       full-name net-name records record sigtype)
+    (setq full-name (car addr-comp))
+    (setq net-name (mapconcat (lambda (x) x) (cdr addr-comp) "\\|"))
+    (setq records
+         (or
+          (and full-name
+               (bbdb-search (bbdb-records) full-name))
+          (and net-name
+               (bbdb-search (bbdb-records) nil nil net-name))))
+    (setq record (car records))
+    (setq records (cdr records))
+    (setq sigtype (and record (bbdb-record-getprop record 'sigtype)))
+    (while (and (not sigtype) records)
+      (setq record (car records))
+      (setq records (cdr records))
+      (setq sigtype (bbdb-record-getprop record 'sigtype)))
+    (if sigtype
+       (message (concat "Using signature for: "
+                        (bbdb-record-firstname record) " "
+                        (bbdb-record-lastname record)
+                        (and (bbdb-record-aka record)
+                             (concat " (AKA: "
+                                     (car (bbdb-record-aka record))
+                                     ")"))
+                        " <" (car (bbdb-record-net record)) ">")))
+    sigtype))
+
+
 ;;; @ end
 ;;;