[nongnu] elpa/vm 9f9eb4ab23 06/20: Improve markup in docstrings according to compiler warnings

[ELPA Syncer]

branch: elpa/vm
commit 9f9eb4ab23bcf1d118897e2c48359f54918e9d30
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    Improve markup in docstrings according to compiler warnings
---
 contrib/org-html-mail.el                        |   4 +-
 contrib/vm-bogofilter.el                        |   4 +-
 contrib/vm-mime-display-internal-application.el |   4 +-
 lisp/u-vm-color.el                              |   2 +-
 lisp/vcard.el                                   |   8 +-
 lisp/vm-avirtual.el                             |   4 +-
 lisp/vm-delete.el                               |   4 +-
 lisp/vm-folder.el                               |   4 +-
 lisp/vm-imap.el                                 |  16 +-
 lisp/vm-mime.el                                 |  28 +--
 lisp/vm-misc.el                                 |   6 +-
 lisp/vm-motion.el                               |   4 +-
 lisp/vm-pcrisis.el                              |  24 +--
 lisp/vm-pgg.el                                  |   4 +-
 lisp/vm-pine.el                                 |   8 +-
 lisp/vm-pop.el                                  |   6 +-
 lisp/vm-ps-print.el                             |   4 +-
 lisp/vm-rfaddons.el                             |  32 ++--
 lisp/vm-save.el                                 |   8 +-
 lisp/vm-smime.el                                |   2 +-
 lisp/vm-thread.el                               |   2 +-
 lisp/vm-undo.el                                 |   4 +-
 lisp/vm-vars.el                                 | 215 +++++++++++-------------
 23 files changed, 194 insertions(+), 203 deletions(-)

diff --git a/contrib/org-html-mail.el b/contrib/org-html-mail.el
index d026a9523d..b87f96b658 100644
--- a/contrib/org-html-mail.el
+++ b/contrib/org-html-mail.el
@@ -29,8 +29,8 @@
 (defun orgstruct-hijacker-command-21 (arg)
   "In Structure, run `org-ctrl-c-ctrl-c'. Outside of Structure
 check for a prefix argument and if buffer name contains `mail',
-and run orgstruct-send-as-html, or run the binding of
-`\C-c\C-c'."
+and run `orgstruct-send-as-html', or run the binding of
+`C-c C-c'."
   (interactive "p")
   (vm-inform 6 "calling html send mail")
   (save-excursion
diff --git a/contrib/vm-bogofilter.el b/contrib/vm-bogofilter.el
index 12d9a84e1d..e3aa31d01d 100644
--- a/contrib/vm-bogofilter.el
+++ b/contrib/vm-bogofilter.el
@@ -240,8 +240,8 @@ message as spam.
   :type 'string)
 
 (defcustom vm-bogofilter-formail-program-options "-s"
-  "*Options for the 'vm-bogofilter-formail-program'. After this
-arguments, the name of the bogofilter program will be passed."
+  "Options for the `vm-bogofilter-formail-program'.
+After this arguments, the name of the bogofilter program will be passed."
   :group 'vm-bogofilter
   :type 'string)
 
diff --git a/contrib/vm-mime-display-internal-application.el 
b/contrib/vm-mime-display-internal-application.el
index 69e8b2f9af..f65e11581c 100644
--- a/contrib/vm-mime-display-internal-application.el
+++ b/contrib/vm-mime-display-internal-application.el
@@ -72,7 +72,9 @@ If MODE is t, SUBTYPE-mode is used to display 
\"application/SUBTYPE\"
 attachments.")
 
 (defvar vm-mime-internal-application-x-subtypes nil
-  "*If non-nil, display application/x-SUBTYPE attachments the same as 
application/SUBTYPE attachments.
+  "If non-nil, ignore the `x-' in application/x-SUBTYPE.
+This requests to display application/x-SUBTYPE attachments
+the same as application/SUBTYPE attachments.
 See `vm-mime-internal-application-subtypes'.")
 
 (advice-add 'vm-mime-can-display-internal :around
diff --git a/lisp/u-vm-color.el b/lisp/u-vm-color.el
index 9f88872c8d..d931f400ba 100644
--- a/lisp/u-vm-color.el
+++ b/lisp/u-vm-color.el
@@ -632,7 +632,7 @@ subexpressions."
   "Search the buffer for an expression and fontify it.
 Search starts at START and ends at END.  If REGEXP is found, it
 is fontified according to the argument HOW, which is a list of
-the form '((index face)...)."
+the form ((INDEX FACE)...)."
 ;;(message "Searching from %d to %d for %s" start end regexp)
   (let ((inhibit-read-only t))
     (save-excursion
diff --git a/lisp/vcard.el b/lisp/vcard.el
index 2152c6f681..75e84aa279 100644
--- a/lisp/vcard.el
+++ b/lisp/vcard.el
@@ -191,12 +191,12 @@ Vcard data is normally in the form
     prop3a;prop3b:                value3a;value3b;value3c
     end:                          vcard
 
-\(Whitespace around the `:' separating properties and values is optional.\)
+\(Whitespace around the `:' separating properties and values is optional.)
 If supplied to this function an alist of the form
 
-    \(\(\(\"prop1a\"\) \"value1a\"\)
-     \(\(\"prop2a\" \"prop2b\" \(\"prop2c\" . \"param2c\"\)\) \"value2a\"\)
-     \(\(\"prop3a\" \"prop3b\"\) \"value3a\" \"value3b\" \"value3c\"\)\)
+    (((\"prop1a\") \"value1a\")
+     ((\"prop2a\" \"prop2b\" (\"prop2c\" . \"param2c\")) \"value2a\")
+     ((\"prop3a\" \"prop3b\") \"value3a\" \"value3b\" \"value3c\"))
 
 would be returned."
   (let ((vcard nil)
diff --git a/lisp/vm-avirtual.el b/lisp/vm-avirtual.el
index d17647ae1e..694cb97333 100644
--- a/lisp/vm-avirtual.el
+++ b/lisp/vm-avirtual.el
@@ -924,7 +924,7 @@ Add this to `vm-arrived-messages-hook'.
 
 See the function `vm-virtual-auto-delete-message' for details.
 
- (add-hook 'vm-arrived-messages-hook 'vm-virtual-auto-delete-messages)
+ (add-hook \\='vm-arrived-messages-hook #\\='vm-virtual-auto-delete-messages)
 "
   (interactive)
 
@@ -949,7 +949,7 @@ folder name and `mp' (a vm-message-pointer) to access the 
message.
 
 Example:
  (setq vm-virtual-auto-folder-alist
-       '((\"spam\" (concat folder \"-\"
+       \\='((\"spam\" (concat folder \"-\"
                            (format-time-string \"%y%m\" (current-time))))))
 
 This will return \"spam-0008\" as a folder name for messages matching the
diff --git a/lisp/vm-delete.el b/lisp/vm-delete.el
index 751a4b7ad0..e88df4230a 100644
--- a/lisp/vm-delete.el
+++ b/lisp/vm-delete.el
@@ -285,7 +285,7 @@ don't move at all."
   "Delete duplicate messages in the current folder.
 This command works by comparing the message ID's.  Messages that
 are already deleted are not considered, so VM will never delete the last
-copy of a message in a folder.  'Deleting' means flagging for
+copy of a message in a folder.  `Deleting' means flagging for
 deletion; you will have to expunge the messages with
 `vm-expunge-folder' to really get rid of them, as usual.
 
@@ -336,7 +336,7 @@ This command works by computing an MD5 hash for the body of 
each
 non-deleted message in the folder and deleting messages that have
 a hash that has already been seen.  Messages that are already deleted
 are never hashed, so VM will never delete the last copy of a
-message in a folder.  'Deleting' means flagging for deletion; you
+message in a folder.  `Deleting' means flagging for deletion; you
 will have to expunge the messages with `vm-expunge-folder' to
 really get rid of them, as usual.
 
diff --git a/lisp/vm-folder.el b/lisp/vm-folder.el
index 5d887daac8..d1abd94d68 100644
--- a/lisp/vm-folder.el
+++ b/lisp/vm-folder.el
@@ -4408,7 +4408,7 @@ Same as \\[vm-recover-folder]."
   "Get new mail for the current folder from its spool file.
 The optional argument INTERACTIVE says whether the function can make
 interactive queries to the user.  The possible values are t,
-'password-only and nil."
+`password-only', and nil."
   (if vm-block-new-mail
       (error "Can't get new mail until you save this folder."))
   (cond ((eq vm-folder-access-method 'pop)
@@ -4944,7 +4944,7 @@ current changes of the folder before making it read-only."
 ;; this does the real major mode scutwork.
 (defun vm-mode-internal (&optional access-method reload)
   "Turn on vm-mode in the current buffer.
-ACCESS-METHOD is either 'pop or 'imap for server folders.
+ACCESS-METHOD is either `pop' or `imap' for server folders.
 If RELOAD is non-Nil, then the folder is being recovered.  So,
 folder-access-data should be preserved."
   (widen)
diff --git a/lisp/vm-imap.el b/lisp/vm-imap.el
index de1d053392..2cc21a52c2 100644
--- a/lisp/vm-imap.el
+++ b/lisp/vm-imap.el
@@ -1168,7 +1168,7 @@ of the current folder, or nil if none has been recorded."
   "Create a new IMAP session for the IMAP mail box SOURCE, attached to
 the current folder.
 INTERACTIVE says the operation has been invoked interactively.  The
-possible values are t, 'password-only and nil.
+possible values are t, `password-only', and nil.
 and the optional argument PURPOSE is inserted in the process
 buffer for tracing purposes.  Optional argument RETRY says
 whether this call is a retry.
@@ -2492,7 +2492,7 @@ May throw exceptions."
   "Checks if a REPSONSE from the IMAP server matches the pattern
 EXPR.  The syntax of patterns is:
 
-  expr ::= quoted-symbol | 'atom | 'string | ('vector expr*) | ('list expr*)
+  EXPR ::= QUOTED-SYMBOL | atom | string | (vector EXPR*) | (list EXPR*)
 
 Numbers are included among atoms."
   (let ((case-fold-search t) e r)
@@ -3305,7 +3305,7 @@ LOCAL-EXPUNGE-LIST: A list of message descriptors for 
messages in the
   to expunged locally.
 STALE-LIST: A list of message descriptors for messages in the
   local cache whose UIDVALIDITY values are stale.
-If the argument DO-RETRIEVES is 'full, then all the messages that
+If the argument DO-RETRIEVES is `full', then all the messages that
 are not presently in cache are retrieved.  Otherwise, the
 messages previously retrieved are ignored."
 
@@ -3384,18 +3384,18 @@ messages previously retrieved are ignored."
   "Synchronize IMAP folder with the server.
    INTERACTIVE says whether the function was invoked interactively,
    e.g., as vm-get-spooled-mail.  The possible values are t,
-   'password-only and nil.
+   `password-only', and nil.
    DO-REMOTE-EXPUNGES indicates whether the server mail box should be
-   expunged.  If it is 'all, then all messages not present in the cache folder
+   expunged.  If it is `all', then all messages not present in the cache folder
    are expunged.
    DO-LOCAL-EXPUNGES indicates whether the cache buffer should be
    expunged.
    DO-RETRIEVES indicates if new messages that are not already in the
-   cache should be retrieved from the server.  If this flag is 'full
+   cache should be retrieved from the server.  If this flag is `full'
    then messages previously retrieved but not in cache are retrieved
    as well.
    SAVE-ATTRIBUTES indicates if the message attributes should be updated on
-   the server.  If it is 'all, then the attributes of all messages are
+   the server.  If it is `all', then the attributes of all messages are
    updated irrespective of whether they were modified or not.
    RETRIEVE-ATTRIBTUES indicates if the message attributes on the server
    should be retrieved, updating the cache.
@@ -3514,7 +3514,7 @@ messages previously retrieved are ignored."
 RETRIEVE-LIST and return the list of the retrieved messages.  The
 RETRIEVE-LIST is a list of cons-pairs (uid . n) of the UID's and
 message sequence numbers of messages on the IMAP server.  If
-`vm-enable-external-messages' includes 'imap, then messages
+`vm-enable-external-messages' includes `imap', then messages
 larger than `vm-imap-max-message-size' are retrieved in
 headers-only form."
   (let* ((folder-buffer (current-buffer))
diff --git a/lisp/vm-mime.el b/lisp/vm-mime.el
index d0387c40c5..905b5df107 100644
--- a/lisp/vm-mime.el
+++ b/lisp/vm-mime.el
@@ -1842,19 +1842,20 @@ etc.  Only when displaying it the actual message is 
fetched based
 on the storage handler.
 
 The information about the actual message is stored in the
-\"^X-VM-Storage:\" header and should be a lisp list of the
+\"^X-VM-Storage:\" header and should be a Lisp list of the
 following format.
 
-    \(HANDLER ARGS...\)
+    (HANDLER ARGS...)
 
 HANDLER should correspond to a `vm-fetch-HANDLER-message'
 function, e.g., the handler `file' corresponds to the function
 `vm-fetch-file-message' which gets two arguments, the message
 descriptor and the filename containing the message, and inserts the
-message body from the file into the current buffer. 
+message body from the file into the current buffer.  For example,
 
-For example, 'X-VM-Storage: (file \"message-11\")' will fetch 
-the actual message from the file \"message-11\"."
+    X-VM-Storage: (file \"message-11\")
+
+will fetch the actual message from the file \"message-11\"."
   (goto-char (match-end 0))
   (with-current-buffer (marker-buffer (vm-text-of mm))
     (let ((buffer-read-only nil)
@@ -2541,7 +2542,7 @@ The second time, buttons for all the objects are 
displayed instead.
 The third time, the raw, undecoded data is displayed.
 
 The optional argument STATE can specify which decode state to display:
-'decoded, 'button or 'undecoded.
+`decoded', `button', or `undecoded'.
 
 If decoding, the decoded objects might be displayed immediately, or
 buttons might be displayed that you need to activate to view the
@@ -2676,7 +2677,7 @@ If DONT-HONOR-C-D non-Nil, then don't honor the 
Content-Disposition
 declarations in the attachments and make a decision independently.
 
 LAYOUT can be a mime layout vector.  It can also be a button
-extent in the current buffer, in which case the 'vm-mime-layout
+extent in the current buffer, in which case the `vm-mime-layout'
 property of the overlay will be extracted.  The button may be
 deleted. 
 
@@ -4449,7 +4450,7 @@ The return value does not seem to be meaningful.     USR, 
2011-03-25"
 
 (defun vm-mark-image-tempfile-as-message-garbage-once (layout tempfile)
   "Register image TEMPFILE used for MIME LAYOUT as a message garbage
-file, and set the 'vm-message-garbage property of LAYOUT.  This
+file, and set the `vm-message-garbage' property of LAYOUT.  This
 feature is currently not in use.                        USR, 2012-11-17"
   (if (get (vm-mm-layout-cache layout) 'vm-message-garbage)
       nil
@@ -4660,7 +4661,7 @@ expanded to display the mime object."
 
 ;;;###autoload
 (defun vm-mime-run-display-function-at-point (&optional function)
-  "Run the 'vm-mime-function for the MIME button at point.
+  "Run the `vm-mime-function' for the MIME button at point.
 If optional argument FUNCTION is given, run it instead.
                                                  USR, 2011-03-07"
   (interactive)
@@ -6576,7 +6577,7 @@ extents are created for the purpose of this function.  
USR, 2011-03-27"
 (defun vm-mime-fake-attachment-overlays (start end &optional prop)
   "For all attachment buttons in the region, i.e., pieces of text
 with the given text property PROP, create \"fake\" attachment
-overlays with the 'vm-mime-object property.  The list of these
+overlays with the `vm-mime-object' property.  The list of these
 overlays is returned.
 
 This function is only used with GNU Emacs, not XEmacs.  USR, 2011-02-19"
@@ -6887,9 +6888,10 @@ describes what was deleted."
               (vm-set-mm-layout-display-error layout nil)))))))
 
 (defun vm-mime-encode-words (&optional encoding)
-  "MIME encode all words in the current buffer.  The optional argument
-ENCODING can be 'Q or 'B (for quoted-printable and base64
-respectively).  If none is specified, quoted-printbale is used."
+  "MIME encode all words in the current buffer.
+The optional argument ENCODING can be the symbol `Q' or `B' (for
+quoted-printable and base64 respectively).
+If none is specified, quoted-printable is used."
   (goto-char (point-min))
 
   ;; find right encoding 
diff --git a/lisp/vm-misc.el b/lisp/vm-misc.el
index 2f2a62ba15..307d24902f 100644
--- a/lisp/vm-misc.el
+++ b/lisp/vm-misc.el
@@ -615,8 +615,8 @@ LIST2 satisfying PRED and return the position"
 
 (defun vm-fsfemacs-device-type (&optional _device)
   "An FSF Emacs emulation for XEmacs `device-type' function.  Returns
-the type of the current screen device: one of 'x, 'gtk, 'w32, 'ns and
-'pc.  The optional argument DEVICE is ignored."
+the type of the current screen device: one of `x', `gtk', `w32', `ns', and
+`pc'.  The optional argument DEVICE is ignored."
   (if (eq window-system 'x)
       (if (featurep 'gtk) 'gtk)
     window-system))
@@ -1491,7 +1491,7 @@ Returns t if there was a line longer than `fill-column'."
 
 (defun vm-fill-paragraphs-containing-long-lines (width start end)
   "Fill paragraphs spanning more than WIDTH columns in region
-START to END.  If WIDTH is 'window-width, the current width of
+START to END.  If WIDTH is `window-width', the current width of
 the Emacs window is used.  If vm-word-wrap-paragraphs is set
 non-nil, then the longlines package is used to word-wrap long
 lines without removing any existing line breaks.
diff --git a/lisp/vm-motion.el b/lisp/vm-motion.el
index 95db09c254..f9fa380463 100644
--- a/lisp/vm-motion.el
+++ b/lisp/vm-motion.el
@@ -142,7 +142,7 @@ given."
 
 (defun vm-move-message-pointer (direction)
   "Move vm-message-pointer along DIRECTION by one position.  DIRECTION
-is one of 'forward and 'backward.                     USR, 2011-01-18"
+is one of `forward' and `backward'.                     USR, 2011-01-18"
   (let ((mp vm-message-pointer))
     (if (eq direction 'forward)
        (progn
@@ -200,7 +200,7 @@ value of COUNT is greater than 1, then the values of the 
variables
 vm-skip-deleted-messages and vm-skip-read-messages are ignored.
 
 When invoked on marked messages (via `vm-next-command-uses-marks')
-this command 'sees' marked messages as it moves."
+this command \"sees\" marked messages as it moves."
   ;; second arg RETRY non-nil means retry a failed move, giving
   ;; not nil-or-t values of the vm-skip variables a chance to
   ;; work.
diff --git a/lisp/vm-pcrisis.el b/lisp/vm-pcrisis.el
index 7ed9075655..c1bbf1ca78 100644
--- a/lisp/vm-pcrisis.el
+++ b/lisp/vm-pcrisis.el
@@ -168,7 +168,7 @@ specific variables such as `vmpc-reply-rules'."
 
 (defvaralias 'vmpc-automorph-alist 'vmpc-automorph-rules)
 (defcustom vmpc-automorph-rules ()
-  "An alist associating conditions with actions from `vmpc-actions' when 
automorphing."
+  "Alist associating conditions with actions from `vmpc-actions' when 
automorphing."
   :type (vmpc-defcustom-rules-type)
 ;  :set 'vmpc-rules-set
   :group 'vmpc)
@@ -203,8 +203,8 @@ when composing."
   :group 'vmpc)
 
 (defcustom vmpc-auto-profiles-file "~/.vmpc-auto-profiles"
-  "*File in which to save information used by `vmpc-prompt-for-profile'.
-When set to the symbol 'BBDB, profiles will be stored there."
+  "File in which to save information used by `vmpc-prompt-for-profile'.
+When set to the symbol `BBDB', profiles will be stored there."
   :type '(choice (file)
                  (const BBDB))
   :group 'vmpc)
@@ -220,12 +220,12 @@ right for you will depend on how often you send email to 
new addresses using
 
 (defvar vmpc-current-state nil
   "The current state of pcrisis.
-It is one of 'reply, 'forward, 'resend, 'automorph, 'mail or 'newmail.
+It is one of `reply', `forward', `resend', `automorph', `mail', or `newmail'.
 It controls which actions/functions can/will be run.") 
 
 (defvar vmpc-current-buffer nil
-  "The current buffer, i.e. 'none or 'composition.
-It is 'none before running an adviced VM function and 'composition afterward,
+  "The current buffer, i.e. `none' or `composition'.
+It is `none' before running an adviced VM function and `composition' afterward,
 i.e. when within the composition buffer.")
 
 (defvar vmpc-saved-headers-alist nil
@@ -276,7 +276,7 @@ i.e. when within the composition buffer.")
   "Whether to forbid the cursor from entering the signature.")
 
 (defvar vmpc-expect-default-signature 'nil
-  "*Set this to 't if you have a signature-inserting function.
+  "Set this to `t' if you have a signature-inserting function.
 It will ensure that pcrisis correctly handles the signature .")
 
 
@@ -380,7 +380,7 @@ Overlays suck.  Extents rule.  XEmacs got this right."
 (defun vmpc-set-extent-insertion-types (extent start end)
   "Set the insertion types of EXTENT from START to END.
 START and END should be either nil or t, indicating the desired value
-of the 'start-open and 'end-closed properties of the extent
+of the `start-open' and `end-closed' properties of the extent
 respectively.
 This is the XEmacs version of `vmpc-set-overlay-insertion-types'."
   ;; pretty simple huh?
@@ -421,14 +421,14 @@ start and end of the overlay/extent."
 
 
 (defun vmpc-set-exerlay-detachable-property (exerlay newval)
-  "Set the 'detachable or 'evaporate property for EXERLAY to NEWVAL."
+  "Set the `detachable' or `evaporate' property for EXERLAY to NEWVAL."
   (if (featurep 'xemacs)
       (vm-set-extent-property exerlay 'detachable newval)
     (overlay-put exerlay 'evaporate newval)))
 
 
 (defun vmpc-set-exerlay-intangible-property (exerlay newval)
-  "Set the 'intangible or 'atomic property for EXERLAY to NEWVAL."
+  "Set the `intangible' or `atomic' property for EXERLAY to NEWVAL."
   (if (featurep 'xemacs)
       (progn
        (require 'atomic-extents)
@@ -1156,7 +1156,7 @@ without an action.
 The association is stored in `vmpc-auto-profiles-file' and in the future the
 stored actions will automatically run for messages to that address.
 
-REMEMBER can be set to t or 'prompt.  When set to 'prompt you will be asked if
+REMEMBER can be set to t or `prompt'.  When set to `prompt' you will be asked 
if
 you want to store the association.  When set to t a new profile will be stored
 without asking.
 
@@ -1641,7 +1641,7 @@ current composition, then call this function."
 ;;;###autoload
 (defun vmpc-automorph ()
   "*Change contents of the current mail message based on its own headers.
-Unless `vmpc-current-state' is 'no-automorph, headers and signatures can be
+Unless `vmpc-current-state' is `no-automorph', headers and signatures can be
 changed; pre-signatures added; functions called.
 
 Call `vmpc-no-automorph' to disable it for the current buffer."
diff --git a/lisp/vm-pgg.el b/lisp/vm-pgg.el
index 4676e12775..0dad9dd7e1 100644
--- a/lisp/vm-pgg.el
+++ b/lisp/vm-pgg.el
@@ -1272,7 +1272,7 @@ The transfer encoding done by `vm-pgg-sign' can be 
controlled by the variable
 
 ;;; ###autoload
 (defun vm-pgg-ask-hook ()
-  "Hook to automatically ask for signing or encrypting outgoing messages with 
PGP/MIME.
+  "Function to ask to sign or encrypt outgoing messages with PGP/MIME.
 
 Put this function into `vm-mail-send-hook' to be asked each time you
 send a message whether or not you want to sign or encrypt the
@@ -1284,7 +1284,7 @@ other functions there.  Signing crucially relies on the 
fact that the
 message is not altered afterwards. To put it into `vm-mail-send-hook'
 put something like
 
-       (add-hook 'vm-mail-send-hook 'vm-pgg-ask-hook t)
+       (add-hook \\='vm-mail-send-hook #\\='vm-pgg-ask-hook t)
 
 into your VM init file."
   (interactive)
diff --git a/lisp/vm-pine.el b/lisp/vm-pine.el
index be44165e5f..36601b1b67 100644
--- a/lisp/vm-pine.el
+++ b/lisp/vm-pine.el
@@ -833,8 +833,8 @@ configuration."
 (defcustom vm-save-killed-message
   'ask
   "How `vm-save-killed-message-hook' handles saving of a mail as a draft.
-If set to 'ask it will ask whether to save the mail as draft or not.
-If set to 'always it will save without asking.
+If set to `ask' it will ask whether to save the mail as draft or not.
+If set to `always' it will save without asking.
 If set to nil it will never save them nor it will ask."
   :type '(choice (const ask)
                  (const always)
@@ -1004,8 +1004,8 @@ Called with prefix ARG it just removes the FCC-header."
 (defun vm-mail-auto-fcc ()
   "Add a new FCC field, with file name guessed by `vm-mail-folder-alist'.
 You likely want to add it to `vm-reply-hook' by
-   (add-hook 'vm-reply-hook 'vm-mail-auto-fcc)
-or if sure about what you are doing you can add it to mail-send-hook."
+   (add-hook \\='vm-reply-hook #\\='vm-mail-auto-fcc)
+or if sure about what you are doing you can add it to `mail-send-hook'."
   (interactive "")
   (expand-abbrev)
   (save-excursion
diff --git a/lisp/vm-pop.el b/lisp/vm-pop.el
index f6dd546214..741f558873 100644
--- a/lisp/vm-pop.el
+++ b/lisp/vm-pop.el
@@ -435,7 +435,7 @@ relevant POP servers to remove the messages."
 (defun vm-pop-make-session (source interactive &optional retry)
   "Create a new POP session for the POP mail box SOURCE.
 The argument INTERACTIVE says the operation has been invoked
-interactively.  The possible values are t, 'password-only and nil.
+interactively.  The possible values are t, `password-only', and nil.
 Optional argument RETRY says whether this call is for a
 retry.
 
@@ -1134,13 +1134,13 @@ LOCAL-EXPUNGE-LIST: A list of message descriptors for 
messages in the
                                   (do-retrieves nil))
   "Synchronize POP folder with the server.
    INTERACTIVE says the operation has been invoked interactively.  The
-   possible values are t, 'password-only and nil.
+   possible values are t, `password-only', and nil.
    DO-REMOTE-EXPUNGES indicates whether the server mail box should be
    expunged.
    DO-LOCAL-EXPUNGES indicates whether the cache buffer should be
    expunged.
    DO-RETRIEVES indicates if new messages that are not already in the
-   cache should be retrieved from the server.  If this flag is 'full
+   cache should be retrieved from the server.  If this flag is `full'
    then messages previously retrieved but not in cache are retrieved
    as well.
 "
diff --git a/lisp/vm-ps-print.el b/lisp/vm-ps-print.el
index c782687560..0f78d37677 100644
--- a/lisp/vm-ps-print.el
+++ b/lisp/vm-ps-print.el
@@ -385,7 +385,7 @@ for customization of the output."
 (defun vm-ps-print-message-fix-menu (menu each)
   "Fix VM-menu MENU.
 If EACH it t, then replace `vm-print-message' by
-'vm-ps-print-each-message', otherwise by `vm-ps-print-message'."
+`vm-ps-print-each-message', otherwise by `vm-ps-print-message'."
   (let ((tmpbuf (get-buffer-create "*vm-ps-print*")))
     (with-current-buffer tmpbuf
       (erase-buffer)
@@ -421,7 +421,7 @@ t) instead of `vm-print-message'."
 print just the current message.
 Optionally write postscript output to FILENAME (default is to spool
 to printer). 
-Optionally force SEPERATE printing of each message by setting to 't'. 
+Optionally force SEPERATE printing of each message by setting to `t'. 
 Optionally also print NUP pages per sheet.
 Optionally also print in COLOR by setting to non-nil.
 
diff --git a/lisp/vm-rfaddons.el b/lisp/vm-rfaddons.el
index b8338e63f0..e2456b02d2 100644
--- a/lisp/vm-rfaddons.el
+++ b/lisp/vm-rfaddons.el
@@ -179,8 +179,8 @@ Other EXPERIMENTAL options:
 
 If you want to use only a subset of the options then call
 `vm-rfaddons-infect-vm' like this:
-        (vm-rfaddons-infect-vm 2 '(general vm-mail-mode shrunken-headers)
-                                 '(fake-date))
+        (vm-rfaddons-infect-vm 2 \\='(general vm-mail-mode shrunken-headers)
+                                 \\='(fake-date))
 This will enable all `general' and `vm-mail-mode' options plus the
 `shrunken-headers' option, but it will exclude the `fake-date' option of the
 `vm-mail-mode' options.
@@ -626,13 +626,13 @@ buffer. (Rob F)"
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defun bbdb/vm-set-virtual-folder-alist ()
   "Create a `vm-virtual-folder-alist' according to the records in the bbdb.
-For each record that has a 'vm-virtual' attribute, add or modify the
+For each record that has a `vm-virtual' attribute, add or modify the
 corresponding BBDB-VM-VIRTUAL element of the `vm-virtual-folder-alist'.
 
   (BBDB-VM-VIRTUAL ((vm-primary-inbox)
                     (author-or-recipient BBDB-RECORD-NET-REGEXP)))
 
-The element gets added to the 'element-name' sublist of the
+The element gets added to the `element-name' sublist of the
 `vm-virtual-folder-alist'. (Rob F)"
   (interactive)
   (let (notes-field  email-regexp folder selector)
@@ -690,7 +690,7 @@ add/modify the corresponding VM-VIRTUAL element of the
   (BBDB-VM-VIRTUAL ((vm-primary-inbox)
                     (author-or-recipient BBDB-RECORD-NET-REGEXP)))
 
-The element gets added to the 'element-name' sublist of the
+The element gets added to the `element-name' sublist of the
 `vm-virtual-folder-alist'. (Rob F)"
   (interactive)
   (let (notes-field email-regexp mail-aliases folder selector)
@@ -738,9 +738,9 @@ The element gets added to the 'element-name' sublist of the
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defcustom vm-handle-return-receipt-mode 'edit
-  "*Tells `vm-handle-return-receipt' how to handle return receipts.
-One can choose between 'ask, 'auto, 'edit or an expression which is evaluated
-and which should return t if the return receipts should be sent. (Rob F)"
+  "Tells `vm-handle-return-receipt' how to handle return receipts.
+One can choose between `ask', `auto', `edit', or an expression which should
+return t if the return receipts should be sent. (Rob F)"
   :group 'vm-rfaddons
   :type '(choice (const :tag "Edit" edit)
                  (const :tag "Ask" ask)
@@ -845,7 +845,7 @@ For guessing mime-types we use 
`vm-mime-attachment-auto-type-alist'. (Rob F)"
 (defcustom vm-attach-files-in-directory-default-charset 'guess
   "*The default charset used for attached files of type `text'.
 If set to nil you will be asked for the charset.
-If set to 'guess it will be determined by `vm-determine-proper-charset', but
+If set to `guess' it will be determined by `vm-determine-proper-charset', but
 this may take some time, since the file needs to be visited. (Rob F)"
   :group 'vm-rfaddons
   :type '(choice (const :tag "Ask" nil)
@@ -978,7 +978,8 @@ date header as subdir for the attachments. (Rob F)"
 
 (defun vm-mime-auto-save-all-attachments-subdir (msg)
   "Return a subdir for the attachments of MSG.
-This will be done according to `vm-mime-auto-save-all-attachments-subdir'. 
(Rob F)"
+This will be done according to `vm-mime-auto-save-all-attachments-subdir'.
+(Rob F)"
   (setq msg (vm-real-message-of msg))
   (when (not (string-match 
              (regexp-quote (vm-reencode-mime-encoded-words-in-string
@@ -1046,7 +1047,7 @@ Root directory for saving is 
`vm-mime-attachment-save-directory'.
 You might add this to `vm-select-new-message-hook' in order to automatically
 save attachments.
 
-    (add-hook 'vm-select-new-message-hook 'vm-mime-auto-save-all-attachments)
+    (add-hook \\='vm-select-new-message-hook 
#\\='vm-mime-auto-save-all-attachments)
  (Rob F)"
   (interactive "P")
 
@@ -1581,7 +1582,8 @@ of empty lines which have been quoted. (Rob F)"
 ;;;###autoload
 (defun vm-mail-mode-elide-reply-region (b e)
   "Replace marked region or current line with `vm-mail-elide-reply-region'.
-B and E are the beginning and end of the marked region or the current line. 
(Rob F)"
+B and E are the beginning and end of the marked region or the current line.
+(Rob F)"
   (interactive (if (mark)
                    (if (< (mark) (point))
                        (list (mark) (point))
@@ -1626,7 +1628,8 @@ B and E are the beginning and end of the marked region or 
the current line. (Rob
 ;;;###autoload
 (defun vm-save-message-preview (file)
   "Save preview of a message in FILE.
-It saves the decoded message and not the raw message like `vm-save-message' 
(Rob F)"
+It saves the decoded message and not the raw message like `vm-save-message'
+(Rob F)"
   (interactive
    ;; protect value of last-command
    (let ((last-command last-command)
@@ -1827,7 +1830,8 @@ not end the comment.  Blank lines do not get comments. 
(Rob F)"
 ;; Sometimes it's handy to fake a date.
 ;; I overwrite the standard function by a slightly different version.
 (defcustom vm-mail-mode-fake-date-p t
-  "*Non-nil means `vm-mail-mode-insert-date-maybe' will not overwrite a 
existing date header. (Rob F)"
+  "Non-nil means `vm-mail-mode-insert-date-maybe' keeps an existing date 
header.
+Otherwise, overwrite existing date headers (Rob F)"
   :group 'vm-rfaddons
   :type '(boolean))
 
diff --git a/lisp/vm-save.el b/lisp/vm-save.el
index bb0a7a690e..3366bc4f93 100644
--- a/lisp/vm-save.el
+++ b/lisp/vm-save.el
@@ -721,15 +721,15 @@ If non-nil call EXIT-HANDLER with the two arguments 
COMMAND and OUTPUT-BUFFER."
       (funcall exit-handler process-command buffer))))
 
 (defvar vm-pipe-messages-to-command-start t
-  "*The string to be used as the leading message separator by
+  "The string to be used as the leading message separator by
 `vm-pipe-messages-to-command' at the beginning of each message.
-If set to 't', then use the leading message separator stored in the VM
+If set to `t', then use the leading message separator stored in the VM
 folder.  If set to nil, then no leading separator is included.")
 
 (defvar vm-pipe-messages-to-command-end t
-  "*The string to be used as the trailing message separator by
+  "The string to be used as the trailing message separator by
 `vm-pipe-messages-to-command' at the end of each message.
-If set to 't', then use the trailing message separator stored in the VM
+If set to `t', then use the trailing message separator stored in the VM
 folder.  If set to nil, no trailing separator is included.")
 
 ;;;###autoload
diff --git a/lisp/vm-smime.el b/lisp/vm-smime.el
index 37c43497d2..16d25b9bb8 100644
--- a/lisp/vm-smime.el
+++ b/lisp/vm-smime.el
@@ -294,7 +294,7 @@ certificate files."
 (defun vm-get-sender ()
   "Determine the sender of the message, used for determining
 which mapping of `smime-keys' to use in S/MIME signing a
-composition. If there is no 'From' header in the message,
+composition. If there is no `From' header in the message,
 `user-mail-address' will be used"
   (or (save-excursion
        (goto-char (point-min))
diff --git a/lisp/vm-thread.el b/lisp/vm-thread.el
index 8d258c6dbc..42251f14e4 100644
--- a/lisp/vm-thread.el
+++ b/lisp/vm-thread.el
@@ -168,7 +168,7 @@
 (defsubst vm-th-thread-date-of (id-sym criterion)
   "For the message with the interned symbol ID-SYM, return the
 youngest or oldest date in its thread.  CRITERION must be one of
-'youngest-date and 'oldest-date"
+`youngest-date' and `oldest-date'."
   (get id-sym criterion))
 
 (defsubst vm-th-message-of (id-sym)
diff --git a/lisp/vm-undo.el b/lisp/vm-undo.el
index 5b7f901819..dc98ad37bb 100644
--- a/lisp/vm-undo.el
+++ b/lisp/vm-undo.el
@@ -426,8 +426,8 @@ M-LIST.  STRING is a MIME-decoded string with text 
properties.
 The third parameter ADD is one of:
 
 nil           delete the label
-'all           add the label in all cases
-'existing-only add the label only if it is already existing in the folder
+`all'           add the label in all cases
+`existing-only' add the label only if it is already existing in the folder
                                                        USR, 2010-12-20
 "
   (vm-display nil nil '(vm-add-message-labels vm-delete-message-labels)
diff --git a/lisp/vm-vars.el b/lisp/vm-vars.el
index fa595a0fbb..5017c2067d 100644
--- a/lisp/vm-vars.el
+++ b/lisp/vm-vars.el
@@ -286,7 +286,7 @@ folders (context name `imap').  Messages larger than
                        'vm-enable-external-messages "8.2.0")
 
 (defcustom vm-spool-files nil
-  "*If non-nil this variable's value should be a list of strings
+  "If non-nil this variable's value should be a list of strings
 or a list of lists.
 
 If the value is a list of strings, the strings should name files
@@ -302,7 +302,7 @@ If the value is a list of lists, each sublist should be of 
the form
 INBOX, SPOOLNAME and CRASHBOX are all strings.
 
 INBOX is the folder where you want your new mail to be moved when
-you type 'g' (running `vm-get-new-mail') in VM.  It is where you
+you type `g' (running `vm-get-new-mail') in VM.  It is where you
 will read the mail.
 
 SPOOLNAME is where the mail system leaves your incoming mail,
@@ -464,7 +464,7 @@ has been specified."
   "*List of suffixes to be used to create possible spool file names
 for folders.  Example:
 
-  (setq vm-spool-file-suffixes '(\".spool\" \"-\"))
+  (setq vm-spool-file-suffixes \\='(\".spool\" \"-\"))
 
 If you visit a folder ~/mail/beekeeping, when VM attempts to
 retrieve new mail for that folder it will look for mail in
@@ -518,9 +518,9 @@ A nil value for `vm-pop-max-message-size' means no size 
limit."
 
 (defcustom vm-pop-messages-per-session nil
   "*Non-nil value should be an integer specifying how many messages to
-retrieve per POP session.  When you type 'g' to get new mail, VM
+retrieve per POP session.  When you type `g' to get new mail, VM
 will only retrieve that many messages from any particular POP maildrop.
-To retrieve more messages, type 'g' again.
+To retrieve more messages, type `g' again.
 
 A nil value means there's no limit."
   :group 'vm-folders
@@ -529,9 +529,9 @@ A nil value means there's no limit."
 
 (defcustom vm-pop-bytes-per-session nil
   "*Non-nil value should be an integer specifying how many bytes to
-retrieve per POP session.  When you type 'g' to get new mail, VM
+retrieve per POP session.  When you type `g' to get new mail, VM
 will only retrieve messages until the byte limit is reached on
-any particular POP maildrop.  To retrieve more messages, type 'g'
+any particular POP maildrop.  To retrieve more messages, type `g'
 again.
 
 A nil value means there's no limit."
@@ -640,7 +640,7 @@ If VM encounters an IMAP message larger than this size, the 
action
 is as follows:
 
 - In IMAP folders, the message is treated as an external message if
-`vm-enable-external-messages' includes 'imap.  Otherwise it is
+`vm-enable-external-messages' includes `imap'.  Otherwise it is
 retrieved.
 
 - In local folders, the message is skipped if it is part of
@@ -654,9 +654,9 @@ A nil value for `vm-imap-max-message-size' means no size 
limit."
 
 (defcustom vm-imap-messages-per-session nil
   "*Non-nil value should be an integer specifying how many messages to
-retrieve per IMAP session.  When you type 'g' to get new mail, VM
+retrieve per IMAP session.  When you type `g' to get new mail, VM
 will only retrieve that many messages from any particular IMAP maildrop.
-To retrieve more messages, type 'g' again.
+To retrieve more messages, type `g' again.
 
 A nil value means there's no limit."
   :group 'vm-folders
@@ -664,9 +664,9 @@ A nil value means there's no limit."
 
 (defcustom vm-imap-bytes-per-session nil
   "*Non-nil value should be an integer specifying how many bytes to
-retrieve per IMAP session.  When you type 'g' to get new mail, VM
+retrieve per IMAP session.  When you type `g' to get new mail, VM
 will only retrieve messages until the byte limit is reached on
-any particular IMAP maildrop.  To retrieve more messages, type 'g'
+any particular IMAP maildrop.  To retrieve more messages, type `g'
 again.
 
 A nil value means there's no limit."
@@ -718,7 +718,7 @@ folders.  It can be set to nil to prohibit the recognition 
of
 IMAP maildrops.")
 
 (defvar vm-imap-server-list nil
-  "*List of IMAP maildrop specifications that tell VM the IMAP servers
+  "List of IMAP maildrop specifications that tell VM the IMAP servers
 you have access to and how to log into them.  The IMAP maildrop
 specification in the same format used by `vm-spool-files' (which
 see).  The mailbox part of the specifiation is ignored and should
@@ -729,12 +729,8 @@ instead.
 
 Example:
  (setq vm-imap-server-list
-      '(
-         \"imap-ssl:mail.foocorp.com:993:inbox:login:becky:*\"
-         \"imap:crickle.lex.ky.us:143:inbox:login:becky:*\"
-       )
- )"
-)
+      \\='(\"imap-ssl:mail.foocorp.com:993:inbox:login:becky:*\"
+        \"imap:crickle.lex.ky.us:143:inbox:login:becky:*\"))")
 
 (make-obsolete-variable 'vm-imap-server-list
                        'vm-imap-account-alist "8.1.0")
@@ -753,12 +749,8 @@ will use to refer to this maildrop when using 
`vm-visit-imap-folder'.
 
 Example:
  (setq vm-imap-account-alist
-      '(
-         (\"imap-ssl:mail.foocorp.com:993:inbox:login:becky:*\" \"becky\")
-         (\"imap:crickle.lex.ky.us:143:inbox:login:becky:*\" \"crickle\")
-       )
- )
-"
+      \\='((\"imap-ssl:mail.foocorp.com:993:inbox:login:becky:*\" \"becky\")
+        (\"imap:crickle.lex.ky.us:143:inbox:login:becky:*\" \"crickle\")))"
   :group 'vm-imap
   :type '(repeat (list (string :tag "IMAP Folder Specification") 
                       (string :tag "Nickname"))))
@@ -831,13 +823,13 @@ timing out.  It can be set to nil to never time out."
 
 (defcustom vm-imap-connection-mode 'online
   "*The mode of connection to the IMAP server.  Possible values
-are: 'online, 'offline and 'autoconnect.  In the 'online mode,
+are: `online', `offline', and `autoconnect'.  In the `online' mode,
 synchronization works normally and message bodies of external
-messages are fetched when needed.  In 'offline mode, no
+messages are fetched when needed.  In `offline' mode, no
 connection is established to the IMAP server and message bodies
-are not fetched.  In the 'autoconnect mode, a connection is
+are not fetched.  In the `autoconnect' mode, a connection is
 established whenever a synchronization operation is performed and the
-connection mode is then turned into 'online."
+connection mode is then turned into `online'."
   :group 'vm-imap
   :type '(choice (const :tag "online" online)
                 (const :tag "offline" offline)
@@ -922,7 +914,7 @@ VM maintains this variable, you should not set it.")
         ((string-match "-sco" system-configuration)
          'mmdf)
         (t 'From_))
-  "*Default folder type for empty folders.
+  "Default folder type for empty folders.
 If VM has to add messages that have no specific folder type to an
 empty folder, the folder will become this default type.
 Allowed types are:
@@ -935,7 +927,7 @@ Allowed types are:
 
 Value must be a symbol, not a string. i.e. write
 
-  (setq vm-default-folder-type 'From_)
+  (setq vm-default-folder-type \\='From_)
 
 in your .emacs or .vm file.
 
@@ -1032,9 +1024,9 @@ must set this variable non-nil."
   :type 'boolean)
 
 (defvar vm-sync-thunderbird-status t
-  "* If set to t, VM synchronizes its headers with the headers of
+  "If set to t, VM synchronizes its headers with the headers of
 Thunderbird so that full interoperation with Thunderbird becomes
-possible.  If it is set to 'read-only then VM reads the Thunderbird
+possible.  If it is set to `read-only' then VM reads the Thunderbird
 status flags, but refrains from updating them.  If it is set to nil
 then VM makes no attempt to read or write the Thunderbird status
 flags.") 
@@ -1200,9 +1192,9 @@ effect."
 
 (defcustom vm-fill-paragraphs-containing-long-lines nil
   "*This variable can be set to nil, a numeric value N, the
-symbol 'window-width.  If it is numeric, it causes VM to fill
+symbol `window-width'.  If it is numeric, it causes VM to fill
 paragraphs that contain lines spanning that many columns or more.
-Setting it to 'window-width has the effect of using the width of
+Setting it to `window-width' has the effect of using the width of
 the Emacs window.
 
 Only plain text messages and text/plain MIME parts will be
@@ -1221,10 +1213,10 @@ wrapping."
                 (integer :tag "Fill width")))
 
 (defcustom vm-fill-paragraphs-containing-long-lines-in-reply nil
-  "*This variable can be set to nil, a numeric value N, the
-symbol 'window-width.  If it is numeric, it causes VM to fill
+  "This variable can be set to nil, a numeric value N, the
+symbol `window-width'.  If it is numeric, it causes VM to fill
 included text in replies provided it has lines spanning that many
-columns or more.  Setting it to 'window-width has the effect of
+columns or more.  Setting it to `window-width' has the effect of
 using the width of the Emacs window.
 
 This variable determines which paragraphs are filled,
@@ -1281,14 +1273,14 @@ set directly rather use the function 
`vm-smime-encrypt-message'
 or `vm-smime-sign-encrypt-message'")
 
 (defcustom vm-smime-get-recipient-certificate-method 'ask
-  "*The method by which VM should find the certificates to use in
+  "The method by which VM should find the certificates to use in
 encrypting this S/MIME encoded composition. Valid valus are as follows:
 
-   'ask - Ask the user to specify the files manually each time. The
+   `ask' - Ask the user to specify the files manually each time. The
           user will be prompted for a file name and whether they want
           to specify another thereafter and so on.
 
-   'links - This method assumes that there exist links under
+   `links' - This method assumes that there exist links under
             `smime-certificate-directory' given by the recipient address
             to the appropriate PEM encoded certificate, i.e.
              ~/CERTS/bob@somewhere.com -> ~/CERTS/bob_johnstons_certificate.pem
@@ -1378,9 +1370,9 @@ MIME messages."
 (defvaralias 'vm-honor-mime-content-disposition
   'vm-mime-honor-content-disposition)
 (defcustom vm-mime-honor-content-disposition nil
-  "*Non-nil value means use information from the Content-Disposition
+  "Non-nil value means use information from the Content-Disposition
 header to display MIME messages.  Possible values are `t', to mean that the
-Content-Disposition header should always be honored or 'internal-only,
+Content-Disposition header should always be honored or `internal-only',
 to mean that an \"inline\" disposition should be honored only for
 internally-displayable types. 
 
@@ -1422,7 +1414,7 @@ for showing the message, in addition to decoding for 
preview.")
   'vm-mime-auto-displayed-content-types)
 (defcustom vm-mime-auto-displayed-content-types 
   '("text" "image" "message/rfc822")
-  "*List of MIME content types that should be displayed immediately
+  "List of MIME content types that should be displayed immediately
 after decoding.  Other types will be displayed as a button that
 you must activate to display the object.
 
@@ -1432,7 +1424,7 @@ A nil value means never display MIME objects immediately; 
only use buttons.
 If the value is a list, it should be a list of strings, which
 should all be types or type/subtype pairs.  Example:
 
- (setq vm-mime-auto-displayed-content-types '(\"text\" \"image/jpeg\"))
+ (setq vm-mime-auto-displayed-content-types \\='(\"text\" \"image/jpeg\"))
 
 If a top-level type is listed without a subtype, all subtypes of
 that type are assumed to be included.
@@ -1469,7 +1461,7 @@ list.
 The value should be either nil or a list of strings.  The strings
 should all be types or type/subtype pairs.  Example:
 
- (setq vm-mime-auto-displayed-content-type-exceptions '(\"text/html\"))
+ (setq vm-mime-auto-displayed-content-type-exceptions \\='(\"text/html\"))
 
 If a top-level type is listed without a subtype, all subtypes of
 that type are assumed to be included."
@@ -1487,7 +1479,7 @@ means VM must run an external viewer to display MIME 
objects.
 
 If the value is a list, it should be a list of strings.  Example:
 
- (setq vm-mime-internal-content-types '(\"text\" \"message\" \"image/jpeg\"))
+ (setq vm-mime-internal-content-types \\='(\"text\" \"message\" 
\"image/jpeg\"))
 
 If a top-level type is listed without a subtype, all subtypes of
 that type are assumed to be included.
@@ -1507,7 +1499,7 @@ displayed internally except for those in the exception 
list.
 
 The value should be a list of strings.  Example:
 
- (setq vm-mime-internal-content-type-exceptions '(\"image/jpeg\"))
+ (setq vm-mime-internal-content-type-exceptions \\='(\"image/jpeg\"))
 
 If a top-level type is listed without a subtype, all subtypes of
 that type are assumed to be included."
@@ -1554,7 +1546,7 @@ filename was always added as the last argument; as of VM 
6.49 this
 is only done if %f does not appear in any of the ARG strings.
 The filename inserted by %f will be quoted by `shell-quote-argument'
 and thus no single quotes should be used, i.e. do not use the following 
-\"...'%f'...\".
+\"...\\='%f'...\".
 
 If the COMMAND-LINE form is used, the program and its arguments
 are specified as a single string and that string is passed to the
@@ -1575,14 +1567,11 @@ may have associated with the attachment.
 Example:
 
  (setq vm-mime-external-content-types-alist
-       '(
-        (\"text/html\"         browse-url-of-file)
+       \\='((\"text/html\"     browse-url-of-file)
         (\"image/gif\"         \"xv\")
         (\"image/jpeg\"        \"xv\")
         (\"video/mpeg\"        \"mpeg_play\")
-        (\"video\"             w32-shell-execute \"open\")
-       )
- )
+        (\"video\"             w32-shell-execute \"open\")))
 
 The first matching list element will be used.
 
@@ -1608,7 +1597,7 @@ unless you explicitly request it by menu or `$ e' from 
the keyboard.
 
 The value should be a list of strings.  Example:
 
- (setq vm-mime-external-content-type-exceptions '(\"text/html\"))
+ (setq vm-mime-external-content-type-exceptions \\='(\"text/html\"))
 
 If a top-level type is listed without a subtype, all subtypes of
 that type are assumed to be included."
@@ -1647,11 +1636,8 @@ the standard input of the shell command.
 Example:
 
  (setq vm-mime-type-converter-alist
-       '(
-        (\"image/jpeg\"        \"image/gif\"   \"jpeg2gif\")
-        (\"text/html\"         \"text/plain\"  \"striptags\")
-       )
- )
+       \\='((\"image/jpeg\"    \"image/gif\"   \"jpeg2gif\")
+        (\"text/html\"         \"text/plain\"  \"striptags\")))
 
 The first matching list element will be used."
   :group 'vm-mime
@@ -1691,10 +1677,7 @@ use pipelines, shell variables and redirections.
 Example:
 
  (setq vm-mime-charset-converter-alist
-       '(
-        (\"utf-8\" \"iso-2022-jp\" \"iconv -f utf-8 -t iso-2022-jp\")
-       )
- )
+       \\='((\"utf-8\" \"iso-2022-jp\" \"iconv -f utf-8 -t iso-2022-jp\")))
 
 The first matching list element will be used."
   :group 'vm-mime
@@ -1702,9 +1685,9 @@ The first matching list element will be used."
                  (repeat (list string string string))))
 
 (defcustom vm-mime-alternative-show-method 'best-internal
-  "*Value tells how to choose which alternative to display when
+  "Value tells how to choose which alternative to display when
 it displays a message with \"multipart/alternative\" content.
-Possible values are 'best, 'best-internal, 'all or a
+Possible values are `best', `best-internal', `all', or a
 favorite-methods list as described below.
 
   A MIME message of type multipart/alternative has multiple
@@ -1716,27 +1699,27 @@ display.
   (There is a separate variable `vm-mime-alternative-yank-method'
 for deciding the multipart/alternative to be used in replies.)
 
-  A value of 'best means choose the part that is the most
+  A value of `best' means choose the part that is the most
 faithful to the sender's original content that can be displayed.
 
-  A value of 'best-internal means choose the best part that can
+  A value of `best-internal' means choose the best part that can
 be displayed internally, (i.e. with the built-in capabilities of
 Emacs) and is allowed to be displayed internally (see
 `vm-mime-internal-content-types').  If none of the parts can be
-displayed internally, behavior reverts to that of 'best.
+displayed internally, behavior reverts to that of `best'.
 
-  A value of 'all means that all the alternatives are displayed.
+  A value of `all' means that all the alternatives are displayed.
 
   The value can also be a list of the form
 
   (favorite TYPE ...)
 
-with the first element of the list being the symbol 'favorite'.  The
+with the first element of the list being the symbol `favorite'.  The
 remaining elements of the list are strings specifying MIME types.
 VM will look for each TYPE in turn in the list of alternatives and
 choose the first matching alternative found that can be displayed.
 
-If the symbol 'favorite' is 'favorite-internal' instead, the first TYPE
+If the symbol `favorite' is `favorite-internal' instead, the first TYPE
 that matches an alternative that can be displayed internally will be
 chosen."
 
@@ -1752,30 +1735,30 @@ chosen."
 include, in replies, when it yanks a mesage with
 \"multipart/alternative\" content.  (It is similar to
 `vm-mime-alternative-show-method' used for displaying messages.)
-Possible values are 'best, 'best-internal, 'all or a
+Possible values are `best', `best-internal', `all', or a
 favorite-methods list as described below.
 
-  A value of 'best means choose the part that is the most faithful to
+  A value of `best' means choose the part that is the most faithful to
 the sender's original content that can be displayed.
 
-  A value of 'best-internal means choose the best part that can
+  A value of `best-internal' means choose the best part that can
 be displayed internally, (i.e. with the built-in capabilities of
 Emacs) and is allowed to be displayed internally (see
 `vm-mime-internal-content-types').  If none of the parts can be
-displayed internally, behavior reverts to that of 'best.
+displayed internally, behavior reverts to that of `best'.
 
-  A value of 'all means that all the alternatives are yanked.
+  A value of `all' means that all the alternatives are yanked.
 
   The value can also be a list of the form
 
   (favorite TYPE ...)
 
-with the first element of the list being the symbol 'favorite'.  The
+with the first element of the list being the symbol `favorite'.  The
 remaining elements of the list are strings specifying MIME types.
 VM will look for each TYPE in turn in the list of alternatives and
 choose the first matching alternative found that can be displayed.
 
-If the symbol 'favorite' is 'favorite-internal' instead, the first TYPE
+If the symbol `favorite' is `favorite-internal' instead, the first TYPE
 that matches an alternative that can be displayed internally will be
 chosen."
 
@@ -1789,18 +1772,18 @@ chosen."
 
 (defcustom vm-mime-multipart/related-show-method 'related
   "*Value tells how to handle \"multipart/related\" attachments in
-email messages.  The possible values are 'mixed and 'related.
+email messages.  The possible values are `mixed' and `related'.
 
-The value of 'mixed asks VM to treat \"multipart/related\"
+The value of `mixed' asks VM to treat \"multipart/related\"
 attachments the same way as \"multipart/mixed\" attachments, i.e., all
 of them will be displayed either as buttons or as content.
 
-The value of 'related asks VM to use them as related parts which means
+The value of `related' asks VM to use them as related parts which means
 that they will be embedded in rendered \"text/html\" parts.
 
 Some mail messages arrive with wrong placement of the
 \"multipart/related\" content, inhibiting the html viewers from
-accessing them.  In that case, setting this variable to 'mixed will
+accessing them.  In that case, setting this variable to `mixed' will
 allow you to view them separately."
   :group 'vm-mime
   :type '(choice (choice (const mixed)
@@ -1858,12 +1841,13 @@ and when you read an email."
   "*List of character sets that can be displayed using the `default' face.
 The default face is what you normally see when you edit text in Emacs.
 The font assigned to the default face can typically display one or two
-character sets.  For U.S. and Western European users, ``us-ascii'' and
+character sets.  For U.S. and Western European users, `us-ascii' and
 one of the ISO-8859 character sets usually can be displayed.  Whatever
 character sets that your default face can display should be listed as
 the value of `vm-mime-default-face-charsets'.  Example:
 
- (setq vm-mime-default-face-charsets '(\"us-ascii\" \"ansi_x3.4-1968\" 
\"iso-8859-1\"))
+ (setq vm-mime-default-face-charsets
+       \\='(\"us-ascii\" \"ansi_x3.4-1968\" \"iso-8859-1\"))
 
 Case is not significant in character set names.
 
@@ -1896,8 +1880,8 @@ Emacs treats a displayed image as a single large 
character and cannot
 scroll vertically within an image.  To work around this limitation VM
 can display an image as a series of contiguous horizontal strips that
 Emacs' scrolling routines can better handle.  To do this VM needs to
-have the ImageMagick programs 'convert' and 'identify' installed;
-`vm-imagemagick-convert-program' and `vm-imagemagick-identify-program
+have the ImageMagick programs `convert' and `identify' installed;
+`vm-imagemagick-convert-program' and `vm-imagemagick-identify-program'
 must point to them.
 
 A nil value means VM should display images without cutting them
@@ -1933,19 +1917,19 @@ them all at once.  See `vm-mime-use-image-strips'."
          nil))))
 
 (defcustom vm-imagemagick-convert-program (vm-locate-executable-file "convert")
-  "*Name of ImageMagick 'convert' program.
+  "*Name of ImageMagick `convert' program.
 VM uses this program to convert between image formats and to slice up
 images for display.  Set this to nil and VM will not use the
-'convert' program."
+`convert' program."
   :group 'vm-helpers
   :type '(choice (const :tag "None" nil)
                 file))
 
 (defcustom vm-imagemagick-identify-program
   (vm-locate-executable-file "identify")
-  "*Name of ImageMagick 'identify' program.
+  "*Name of ImageMagick `identify' program.
 VM uses this program to gather information about images.  Set this to nil
-and VM will not use the 'convert' program."
+and VM will not use the `convert' program."
   :group 'vm-helpers
   :type '(choice (const :tag "None" nil)
                 file))
@@ -2244,9 +2228,9 @@ if the recipient does not have a MIME-capable mail 
reader.  BASE64
 is unreadable without a MIME-capable mail reader, unless your name
 is U3BvY2s=.
 
-A value of 'quoted-printable, means to use quoted-printable encoding.
-A value of 'base64 means to use BASE64 encoding.
-A value of '8bit means to send the message as is.
+A value of `quoted-printable', means to use quoted-printable encoding.
+A value of `base64' means to use BASE64 encoding.
+A value of `8bit' means to send the message as is.
 
 Note that this variable usually only applies to textual MIME
 content types.  Images, audio, video, etc. typically will have
@@ -4211,7 +4195,7 @@ VM will use them."
   :type 'boolean)
 
 (defcustom vm-frame-per-folders-summary nil
-  "*Non-nil value causes VM to display the 'all folders' summary in its own 
frame.
+  "Non-nil value causes VM to display the \"all folders\" summary in its own 
frame.
 Nil means the `vm-folders-summarize' command will use the current frame.
 
 This variable has no meaning if you're not running under an Emacs
@@ -4675,7 +4659,7 @@ unread message appears before it in the folder, provided
   :type 'boolean)
 
 (defcustom vm-skip-deleted-messages t
-  "*Non-nil value causes VM's `n' and 'p' commands to skip over
+  "Non-nil value causes VM's `n' and `p' commands to skip over
 deleted messages.  A value of t causes deleted messages to always be skipped.
 A value that is not nil and not t causes deleted messages to be skipped only
 if there are other messages that are not flagged for deletion in the desired
@@ -4851,20 +4835,18 @@ headers."
   :type 'boolean)
 
 (defcustom vm-select-new-message-hook nil
-  "*List of hook functions called every time a message with the 'new'
-attribute is made to be the current message.  When the hooks are run, the
-current buffer will be the folder containing the message and the
-start and end of the message will be bracketed by (point-min) and
-(point-max)."
+  "Hook run every time a message with the `new'
+attribute is made to be the current message.  When the functions are run, the
+current buffer is the folder containing the message and it is narrowed
+to the start and end of the message."
   :group 'vm-hooks
   :type 'hook)
 
 (defcustom vm-select-unread-message-hook nil
-  "*List of hook functions called every time a message with the 'unread'
-attribute is made to be the current message.  When the hooks are run, the
-current buffer will be the folder containing the message and the
-start and end of the message will be bracketed by (point-min) and
-(point-max)."
+  "Hook run every time a message with the `unread'
+attribute is made to be the current message.  When the functions are called,
+the current buffer is the folder containing the message and it is narrowed to
+the start and end of the message."
   :group 'vm-hooks
   :type 'hook)
 
@@ -5480,8 +5462,8 @@ See `vm-mime-compile-format-1' for valid format 
specifiers."
   :type 'string)
 
 (defvar vm-mime-show-alternatives nil
-  "*This variable is deprecated.  You can set
-`vm-mime-alternative-show-method' to 'all to get the same effect as
+  "This variable is deprecated.  You can set
+`vm-mime-alternative-show-method' to `all' to get the same effect as
 setting this one to t.")
 
 (make-obsolete-variable 'vm-mime-show-alternatives 
@@ -6234,7 +6216,7 @@ threads will apply to all the messages in the threads.
 attributes, adding/deleting labels etc.
 
 If the variable is set to t then thread operations are always
-carried out.  If it is set to 'ask, then the user is asked for
+carried out.  If it is set to `ask', then the user is asked for
 confirmation whether the operation should apply to all the
 messages in the thread.  This can be overridden by invoking the
 operation with a prefix argument using `C-u' and no questions will be
@@ -6322,7 +6304,7 @@ Its parent keymap is mail-mode-map.")
 (defvar vm-folder-type nil)
 (make-variable-buffer-local 'vm-folder-type)
 (defvar vm-folder-access-method nil
-  "Indicates how a VM folder is accessed: 'pop for POP folders, 'imap
+  "Indicates how a VM folder is accessed: `pop' for POP folders, `imap'
 for IMAP folders and nil for local folders.")
 (make-variable-buffer-local 'vm-folder-access-method)
 
@@ -7131,10 +7113,10 @@ UIDVALIDITY for each message to be expunged.")
 (defvar vm-imap-session-type nil
   "This buffer-local variable holds the status of the IMAP session.
 Possible values are 
-'active - active session present
-'valid - message sequence numbers are valid 
+`active' - active session present
+`valid' - message sequence numbers are valid 
        validity is preserved by FETCH, STORE and SEARCH operations
-'inactive - session is inactive")
+`inactive' - session is inactive")
 (make-variable-buffer-local 'vm-imap-session-type)
 
 (eval-when-compile
@@ -7359,7 +7341,8 @@ actions to be taken to destroy them.")
                                   alist)))
             (setq coding-systems (cdr coding-systems)))
           (setq alist (append '(("us-ascii" raw-text)
-                                ("unknown" iso-8859-1)) alist))
+                                ("unknown" iso-8859-1))
+                              alist))
           alist))
         (t
         '(
@@ -7387,7 +7370,7 @@ actions to be taken to destroy them.")
          )
         ))
   "Alist that maps MIME character sets to MULE coding systems.  The
-information is generated from the 'mime-charset property of coding
+information is generated from the `mime-charset' property of coding
 systems, if it is defined in the Emacs version.  Otherwise, a
 default alist is used.")
          
@@ -7432,7 +7415,7 @@ default alist is used.")
           (iso-2022-7-mac      "iso-2022-jp")
          )))
   "Alist that maps MULE coding systems to MIME character sets.  The
-information is generated from the 'mime-charset property of coding
+information is generated from the `mime-charset' property of coding
 systems, if it is defined in the Emacs version.  Otherwise, a
 default alist is used.")