; Merge from origin/emacs-25

[gnu-emacs] / lisp / mh-e / mh-identity.el

diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index 98683d9d2e6222f156b977d7bd13e07efb3ad6f8..955b48761761ced171c0f3ef8d8386046e8d3519 100644 (file)
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -1,7 +1,6 @@
 ;;; mh-identity.el --- multiple identify support for MH-E
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2002-2016 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -181,9 +180,9 @@ See `mh-identity-list'."
 ;;;###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 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."
+VALUE when action `add' is selected."
   (cond
    ((or (equal action 'remove)
         (not value)
@@ -195,7 +194,7 @@ VALUE when action 'add is selected."
 ;;;###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
+The ACTION is one of `remove' or `add'. If `add', the VALUE is
 added."
   (cond
    ((equal action 'remove)
@@ -226,7 +225,7 @@ added."
 ;;;###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
+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))
@@ -284,7 +283,7 @@ bottom of the header. If action is 'add, the VALUE is added."
 ;;;###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
+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))
@@ -292,7 +291,7 @@ header."
 ;;;###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
+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))