[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.11 emacs/lisp/mh-e/mh-identity.el:1.12
*** emacs/lisp/mh-e/mh-identity.el:1.11 Wed May 18 11:01:20 2005
--- emacs/lisp/mh-e/mh-identity.el      Sat May 28 22:04:54 2005
***************
*** 1,6 ****
  ;;; mh-identity.el --- Multiple identify support for MH-E.
  
! ;; Copyright (C) 2005 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, 2004 Free Software Foundation, Inc.
  
  ;; Author: Peter S. Galbraith <address@hidden>
  ;; Maintainer: Bill Wohler <address@hidden>
***************
*** 87,104 ****
  ;;;###mh-autoload
  (defun mh-identity-list-set (symbol value)
    "Update the `mh-identity-list' variable, and rebuild the menu.
! Sets the default for SYMBOL (e.g. `mh-identity-list') to VALUE (as set in
! customization).  This is called after 'customize is used to alter
  `mh-identity-list'."
    (set-default symbol value)
    (mh-identity-make-menu))
  
  (defvar mh-identity-local nil
!   "Buffer-local variable holding the identity currently in use.")
  (make-variable-buffer-local 'mh-identity-local)
  
  (defun mh-header-field-delete (field value-only)
!   "Delete FIELD in the mail header, or only its value if VALUE-ONLY is t.
  Return t if anything is deleted."
    (let ((field-colon (if (string-match "^.*:$" field)
                           field
--- 87,104 ----
  ;;;###mh-autoload
  (defun mh-identity-list-set (symbol value)
    "Update the `mh-identity-list' variable, and rebuild the menu.
! Sets the default for SYMBOL (for example, `mh-identity-list') to VALUE (as set
! in customization). This is called after 'customize is used to alter
  `mh-identity-list'."
    (set-default symbol value)
    (mh-identity-make-menu))
  
  (defvar mh-identity-local nil
!   "Buffer-local variable that holds the identity currently in use.")
  (make-variable-buffer-local 'mh-identity-local)
  
  (defun mh-header-field-delete (field value-only)
!   "Delete header FIELD, or only its value if VALUE-ONLY is t.
  Return t if anything is deleted."
    (let ((field-colon (if (string-match "^.*:$" field)
                           field
***************
*** 119,129 ****
    "Marker for the end of a signature inserted by `mh-insert-identity'.")
  
  (defun mh-identity-field-handler (field)
!   "Return the handler for a FIELD or nil if none set.
  The field name is downcased. If the FIELD begins with the character
  `:', then it must have a special handler defined in
  `mh-identity-handlers', else return an error since it is not a valid
! message header."
    (or (cdr (assoc (downcase field) mh-identity-handlers))
        (and (eq (aref field 0) ?:)
             (error (format "Field %s - unknown mh-identity-handler" field)))
--- 119,129 ----
    "Marker for the end of a signature inserted by `mh-insert-identity'.")
  
  (defun mh-identity-field-handler (field)
!   "Return the handler for header FIELD or nil if none set.
  The field name is downcased. If the FIELD begins with the character
  `:', then it must have a special handler defined in
  `mh-identity-handlers', else return an error since it is not a valid
! header field."
    (or (cdr (assoc (downcase field) mh-identity-handlers))
        (and (eq (aref field 0) ?:)
             (error (format "Field %s - unknown mh-identity-handler" field)))
***************
*** 132,139 ****
  
  ;;;###mh-autoload
  (defun mh-insert-identity (identity)
!   "Insert proper fields for given IDENTITY.
! Edit the `mh-identity-list' variable to define identity."
    (interactive
     (list (completing-read
            "Identity: "
--- 132,139 ----
  
  ;;;###mh-autoload
  (defun mh-insert-identity (identity)
!   "Insert fields specified by given IDENTITY.
! See `mh-identity-list'."
    (interactive
     (list (completing-read
            "Identity: "
***************
*** 167,173 ****
  
  ;;;###mh-autoload
  (defun mh-identity-handler-gpg-identity (field action &optional value)
!   "For FIELD \"pgg-default-user-id\", process for ACTION 'remove or 'add.
  The buffer-local variable `mh-identity-pgg-default-user-id' is set to VALUE
  when action 'add is selected."
    (cond
--- 167,174 ----
  
  ;;;###mh-autoload
  (defun mh-identity-handler-gpg-identity (field action &optional value)
!   "Process header FIELD \":pgg-default-user-id\".
! The ACTION is one of 'remove or 'add. If 'add, the VALUE is added.
  The buffer-local variable `mh-identity-pgg-default-user-id' is set to VALUE
  when action 'add is selected."
    (cond
***************
*** 180,187 ****
  
  ;;;###mh-autoload
  (defun mh-identity-handler-signature (field action &optional value)
!   "For FIELD \"signature\", process headers for ACTION 'remove or 'add.
! The VALUE is added."
    (cond
     ((equal action 'remove)
      (when (and (markerp mh-identity-signature-start)
--- 181,188 ----
  
  ;;;###mh-autoload
  (defun mh-identity-handler-signature (field action &optional value)
!   "Process header FIELD \":signature\".
! The ACTION is one of 'remove or 'add. If 'add, the VALUE is added."
    (cond
     ((equal action 'remove)
      (when (and (markerp mh-identity-signature-start)
***************
*** 210,217 ****
  
  ;;;###mh-autoload
  (defun mh-identity-handler-attribution-verb (field action &optional value)
!   "For FIELD \"attribution_verb\", process headers for ACTION 'remove or 'add.
! The VALUE is added."
    (when (and (markerp mh-identity-attribution-verb-start)
               (markerp mh-identity-attribution-verb-end))
      (delete-region mh-identity-attribution-verb-start
--- 211,218 ----
  
  ;;;###mh-autoload
  (defun mh-identity-handler-attribution-verb (field action &optional value)
!   "Process header FIELD \":attribution-verb\".
! The ACTION is one of 'remove or 'add. If 'add, the VALUE is added."
    (when (and (markerp mh-identity-attribution-verb-start)
               (markerp mh-identity-attribution-verb-end))
      (delete-region mh-identity-attribution-verb-start
***************
*** 239,247 ****
           (point-max-marker))))
  
  (defun mh-identity-handler-default (field action top &optional value)
!   "For FIELD, process mh-identity headers for ACTION 'remove or 'add.
! if TOP is non-nil, add the field and it's VALUE at the top of the header, else
! add it at the bottom of the header."
    (let ((field-colon (if (string-match "^.*:$" field)
                           field
                         (concat field ":"))))
--- 240,249 ----
           (point-max-marker))))
  
  (defun mh-identity-handler-default (field action top &optional value)
!   "Process header FIELD.
! The ACTION is one of 'remove or 'add. If TOP is non-nil, add the field and its
! VALUE at the top of the header, else add it at the bottom of the header. If
! action is 'add, the VALUE is added."
    (let ((field-colon (if (string-match "^.*:$" field)
                           field
                         (concat field ":"))))
***************
*** 266,279 ****
  
  ;;;###mh-autoload
  (defun mh-identity-handler-top (field action &optional value)
!   "For FIELD, process mh-identity headers for ACTION 'remove or 'add.
! If the field wasn't present, the VALUE is added at the top of the header."
    (mh-identity-handler-default field action t value))
  
  ;;;###mh-autoload
  (defun mh-identity-handler-bottom (field action &optional value)
!   "For FIELD, process mh-identity headers for ACTION 'remove or 'add.
! If the field wasn't present, the VALUE is added at the bottom of the header."
    (mh-identity-handler-default field action nil value))
  
  (provide 'mh-identity)
--- 268,283 ----
  
  ;;;###mh-autoload
  (defun mh-identity-handler-top (field action &optional value)
!   "Process header FIELD.
! The ACTION is one of 'remove or 'add. If 'add, the VALUE is added.
! If the field wasn't present, it is added to the top of the header."
    (mh-identity-handler-default field action t value))
  
  ;;;###mh-autoload
  (defun mh-identity-handler-bottom (field action &optional value)
!   "Process header FIELD.
! The ACTION is one of 'remove or 'add. If 'add, the VALUE is added.
! If the field wasn't present, it is added to the bottom of the header."
    (mh-identity-handler-default field action nil value))
  
  (provide 'mh-identity)