- nil t)))
- (save-excursion
- ;;First remove old settings, if any.
- (when mh-identity-local
- (let ((pers-list (cadr (assoc mh-identity-local mh-identity-list))))
- (while pers-list
- (let ((field (concat (caar pers-list) ":")))
- (cond
- ((string-equal "signature:" field)
- (when (and (boundp 'mh-identity-signature-start)
- (markerp mh-identity-signature-start))
- (goto-char mh-identity-signature-start)
- (forward-char -1)
- (delete-region (point) mh-identity-signature-end)))
- ((mh-header-field-delete field nil))))
- (setq pers-list (cdr pers-list)))))
- ;; Then insert the replacement
- (when (not (equal "none" identity))
- (let ((pers-list (cadr (assoc identity mh-identity-list))))
- (while pers-list
- (let ((field (concat (caar pers-list) ":"))
- (value (cdar pers-list)))
- (cond
- ;; No value, remove field
- ((or (not value)
- (string= value ""))
- (mh-header-field-delete field nil))
- ;; Existing field, replace
- ((mh-header-field-delete field t)
- (insert value))
- ;; Handle "signature" special case. Insert file or call function.
- ((and (string-equal "signature:" field)
- (or (and (stringp value)
- (file-readable-p value))
- (fboundp value)))
- (goto-char (point-max))
- (if (not (looking-at "^$"))
- (insert "\n"))
- (insert "\n")
- (save-restriction
- (narrow-to-region (point) (point))
- (set (make-local-variable 'mh-identity-signature-start)
- (make-marker))
- (set-marker mh-identity-signature-start (point))
- (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")))
- (if (stringp value)
- (insert-file-contents value)
- (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))
- (set-marker mh-identity-signature-end (point-max))))
- ;; Handle "From" field differently, adding it at the beginning.
- ((string-equal "From:" field)
- (goto-char (point-min))
- (insert "From: " value "\n"))
- ;; Skip empty signature (Can't remove what we don't know)
- ((string-equal "signature:" field))
- ;; Other field, add at end
- (t ;Otherwise, add the end.
- (goto-char (point-min))
- (mh-goto-header-end 0)
- (mh-insert-fields field value))))
- (setq pers-list (cdr pers-list))))))
- ;; Remember what is in use in this buffer
- (if (equal "none" identity)
- (setq mh-identity-local nil)
- (setq mh-identity-local identity)))
+ nil t)
+ nil))
+
+ (when (or (not maybe-insert)
+ (and (boundp 'mh-identity-default)
+ mh-identity-default
+ (not mh-identity-local)))
+ (save-excursion
+ ;;First remove old settings, if any.
+ (when mh-identity-local
+ (let ((pers-list (cadr (assoc mh-identity-local mh-identity-list))))
+ (while pers-list
+ (let* ((field (caar pers-list))
+ (handler (mh-identity-field-handler field)))
+ (funcall handler field 'remove))
+ (setq pers-list (cdr pers-list)))))
+ ;; Then insert the replacement
+ (when (not (equal "None" identity))
+ (let ((pers-list (cadr (assoc identity mh-identity-list))))
+ (while pers-list
+ (let* ((field (caar pers-list))
+ (value (cdar pers-list))
+ (handler (mh-identity-field-handler field)))
+ (funcall handler field 'add value))
+ (setq pers-list (cdr pers-list))))))
+ ;; Remember what is in use in this buffer
+ (if (equal "None" identity)
+ (setq mh-identity-local nil)
+ (setq mh-identity-local identity))))
+
+;;;###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
+ ((or (equal action 'remove)
+ (not value)
+ (string= value ""))
+ (setq mh-identity-pgg-default-user-id nil))
+ ((equal action 'add)
+ (setq mh-identity-pgg-default-user-id value))))
+
+;;;###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)
+ (markerp mh-identity-signature-end))
+ (delete-region mh-identity-signature-start
+ mh-identity-signature-end)))
+ (t
+ ;; Insert "signature". Nil value means to use `mh-signature-file-name'.
+ (when (not (mh-signature-separator-p)) ;...unless already present
+ (goto-char (point-max))
+ (save-restriction
+ (narrow-to-region (point) (point))
+ (if (null value)
+ (mh-insert-signature)
+ (mh-insert-signature value))
+ (set (make-local-variable 'mh-identity-signature-start)
+ (point-min-marker))
+ (set-marker-insertion-type mh-identity-signature-start t)
+ (set (make-local-variable 'mh-identity-signature-end)
+ (point-max-marker)))))))
+
+(defvar mh-identity-attribution-verb-start nil
+ "Marker for the beginning of the attribution verb.")
+(defvar mh-identity-attribution-verb-end nil
+ "Marker for the end of the attribution verb.")
+
+;;;###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
+ mh-identity-attribution-verb-end)
+ (goto-char mh-identity-attribution-verb-start)
+ (cond
+ ((equal action 'remove) ; Replace with default
+ (mh-identity-insert-attribution-verb nil))
+ (t ; Insert attribution verb.
+ (mh-identity-insert-attribution-verb value)))))
+
+;;;###mh-autoload
+(defun mh-identity-insert-attribution-verb (value)
+ "Insert VALUE as attribution verb, setting up delimiting markers.
+If VALUE is nil, use `mh-extract-from-attribution-verb'."
+ (save-restriction
+ (narrow-to-region (point) (point))
+ (if (null value)
+ (insert mh-extract-from-attribution-verb)
+ (insert value))
+ (set (make-local-variable 'mh-identity-attribution-verb-start)
+ (point-min-marker))
+ (set-marker-insertion-type mh-identity-attribution-verb-start t)
+ (set (make-local-variable 'mh-identity-attribution-verb-end)
+ (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 ":"))))
+ (cond
+ ((equal action 'remove)
+ (mh-header-field-delete field-colon nil))
+ (t
+ (cond
+ ;; No value, remove field
+ ((or (not value)
+ (string= value ""))
+ (mh-header-field-delete field-colon nil))
+ ;; Existing field, replace
+ ((mh-header-field-delete field-colon t)
+ (insert value))
+ ;; Other field, add at end or top
+ (t
+ (goto-char (point-min))
+ (if (not top)
+ (mh-goto-header-end 0))
+ (insert field-colon " " value "\n")))))))
+
+;;;###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))