[Emacs-diffs] Changes to emacs/lisp/mh-e/mh-identity.el

[Bill Wohler]

Index: emacs/lisp/mh-e/mh-identity.el
diff -c emacs/lisp/mh-e/mh-identity.el:1.3 emacs/lisp/mh-e/mh-identity.el:1.4
*** emacs/lisp/mh-e/mh-identity.el:1.3  Tue Feb  4 08:15:32 2003
--- emacs/lisp/mh-e/mh-identity.el      Fri Apr 25 01:52:00 2003
***************
*** 1,6 ****
! ;;; mh-identity.el --- Multiple Identify support for MH-E.
  
! ;; Copyright (C) 2002 Free Software Foundation, Inc.
  
  ;; Author: Peter S. Galbraith <address@hidden>
  ;; Maintainer: Bill Wohler <address@hidden>
--- 1,6 ----
! ;;; mh-identity.el --- Multiple identify support for MH-E.
  
! ;; Copyright (C) 2002, 2003 Free Software Foundation, Inc.
  
  ;; Author: Peter S. Galbraith <address@hidden>
  ;; Maintainer: Bill Wohler <address@hidden>
***************
*** 37,44 ****
  
  ;;; Change Log:
  
- ;; $Id: mh-identity.el,v 1.3 2003/02/04 13:15:32 lektu Exp $
- 
  ;;; Code:
  
  
--- 37,42 ----
***************
*** 169,179 ****
                  (cond
                   ;; If MIME composition done, insert signature at the end as
                   ;; an inline MIME part.
!                  ((and (boundp 'mh-mhn-compose-insert-flag)
!                        mh-mhn-compose-insert-flag)
                    (insert "#\n" "Content-Description: Signature\n"))
!                  ((and (boundp 'mh-mml-compose-insert-flag)
!                        mh-mml-compose-insert-flag)
                    (mml-insert-tag 'part 'type "text/plain"
                                    'disposition "inline"
                                    'description "Signature")))
--- 167,175 ----
                  (cond
                   ;; If MIME composition done, insert signature at the end as
                   ;; an inline MIME part.
!                  ((mh-mhn-directive-present-p)
                    (insert "#\n" "Content-Description: Signature\n"))
!                  ((mh-mml-directive-present-p)
                    (mml-insert-tag 'part 'type "text/plain"
                                    'disposition "inline"
                                    'description "Signature")))
***************
*** 182,193 ****
                    (funcall value))
                  (goto-char (point-min))
                  (when (not (re-search-forward "^--" nil t))
!                   (if (and (boundp 'mh-mhn-compose-insert-flag)
!                            mh-mhn-compose-insert-flag)
!                       (forward-line 2))
!                   (if (and (boundp 'mh-mml-compose-insert-flag)
!                            mh-mml-compose-insert-flag)
!                       (forward-line 1))
                    (insert "-- \n"))
                  (set (make-local-variable 'mh-identity-signature-end)
                       (make-marker))
--- 178,187 ----
                    (funcall value))
                  (goto-char (point-min))
                  (when (not (re-search-forward "^--" nil t))
!                   (cond ((mh-mhn-directive-present-p)
!                          (forward-line 2))
!                         ((mh-mml-directive-present-p)
!                          (forward-line 1)))
                    (insert "-- \n"))
                  (set (make-local-variable 'mh-identity-signature-end)
                       (make-marker))