tm 7.39.

[elisp/semi.git] / signature.el

diff --git a/signature.el b/signature.el
index c1362d2..324ace7 100644 (file)
--- a/signature.el
+++ b/signature.el
@@ -1,17 +1,46 @@
 ;;;
-;;; $Id: signature.el,v 1.6 1994/08/03 04:42:40 morioka Exp $
-;;; Modified by Yasuo OKABE 1994/08/01
-;;; 
-
-(provide 'signature)
+;;; signature.el --- signature utility for GNU Emacs
+;;;
+;;; Copyright (C) 1995 Free Software Foundation, Inc.
+;;; Copyright (C) 1994,1995 MORIOKA Tomohiko
+;;; Copyright (C) 1994 OKABE Yasuo
+;;;
+;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;;         OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp> (1994/08/01)
+;;; Created: 1994/7/11
+;;; Version:
+;;;    $Id: signature.el,v 7.3 1995/12/25 05:29:00 morioka Exp $
+;;; Keywords: mail, news, signature
+;;;
+;;; 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.
+;;;
+;;; Code:
 
-(require 'tl-header)
+(require 'tl-822)
 
 (defvar signature-insert-at-eof nil
-  "*Insert signature at the end of file if non-nil.")
+  "*Insert signature at the end of file if non-nil. [signature.el]")
+
+(defvar signature-delete-blank-lines-at-eof nil
+  "*Signature-insert-at-eof deletes blank lines at the end of file
+if non-nil. [signature.el]")
 
 (defvar signature-file-name "~/.signature"
-  "*Name of file containing the user's signature.")
+  "*Name of file containing the user's signature. [signature.el]")
 
 (defvar signature-file-alist nil)
 
@@ -29,27 +58,39 @@
 (defun signature/get-signature-file-name ()
   (catch 'tag
     (let ((r signature-file-alist) cell b f)
-      (while r
-       (setq cell (car r))
-       (setq b (car cell))
-       (if (setq f (message/get-field-body (car b)))
-           (cond ((listp (cdr b))
-                  (let ((r (cdr b)))
-                    (while r
-                      (if (string-match (car r) f)
+      (save-excursion
+       (save-restriction
+         (narrow-to-region
+          (point-min)
+          (progn
+            (goto-char (point-min))
+            (if (re-search-forward
+                 (concat "^" (regexp-quote mail-header-separator) "$")
+                 nil t)
+                (match-beginning 0)
+              (point-max)
+              )))
+         (while r
+           (setq cell (car r))
+           (setq b (car cell))
+           (if (setq f (rfc822/get-field-body (car b)))
+               (cond ((listp (cdr b))
+                      (let ((r (cdr b)))
+                        (while r
+                          (if (string-match (car r) f)
+                              (throw 'tag (cdr cell))
+                            )
+                          (setq r (cdr r))
+                          ))
+                      )
+                     ((stringp (cdr b))
+                      (if (string-match (cdr b) f)
                           (throw 'tag (cdr cell))
-                        )
-                      (setq r (cdr r))
-                      ))
-                  )
-                 ((stringp (cdr b))
-                  (if (string-match (cdr b) f)
-                      (throw 'tag (cdr cell))
-                    ))
-                 ))
-       (setq r (cdr r))
-       ))
-    signature-file-name))
+                        ))
+                     ))
+           (setq r (cdr r))
+           ))
+       signature-file-name))))
 
 (defun signature/insert-signature-at-point (&optional arg)
   "Insert the file named by signature-file-name at the current point."
@@ -63,7 +104,8 @@
                              nil)
            (signature/get-signature-file-name)))))
     (insert-file-contents signature)
-    (set-buffer-modified-p (buffer-modified-p)))) ; force mode line update
+    (set-buffer-modified-p (buffer-modified-p)) ; force mode line update
+    signature))
 
 (defun signature/insert-signature-at-eof (&optional arg)
   "Insert the file named by signature-file-name at the end of file."
@@ -76,16 +118,17 @@
                              signature-file-name
                              nil)
            (signature/get-signature-file-name)))))
-    (save-excursion
-      (if (file-readable-p signature)
-         (progn
-           (goto-char (point-max))
-           (if (not (bolp))
-               (insert "\n"))
-           (delete-blank-lines)
-           (insert-file-contents signature)
-           (set-buffer-modified-p (buffer-modified-p)) ; force mode line update
-           )))))
+    (if (file-readable-p signature)
+       (progn
+         (goto-char (point-max))
+         (if (not (bolp))
+             (insert "\n"))
+         (if signature-delete-blank-lines-at-eof (delete-blank-lines))
+         (insert-file-contents signature)
+         (set-buffer-modified-p (buffer-modified-p))
+                                       ; force mode line update
+         ))
+    signature))
 
 (defun insert-signature (&optional arg)
   "Insert the file named by signature-file-name.  It is inserted at the
@@ -96,3 +139,9 @@ named <signature-file-name>-DISTRIBUTION interactively."
   (if signature-insert-at-eof
        (call-interactively 'signature/insert-signature-at-eof)
     (call-interactively 'signature/insert-signature-at-point)))
+
+
+;;; @ end
+;;;
+
+(provide 'signature)