--- a/lisp/vm/vm-autoload.el	Mon Aug 13 09:12:43 2007 +0200
+++ b/lisp/vm/vm-autoload.el	Mon Aug 13 09:13:56 2007 +0200
@@ -6,7 +6,7 @@
 time the current folder is expunged.
 
 With a prefix argument COUNT, the current message and the next
-COUNT - 1 messages are deleted.  A negative argument means the
+COUNT - 1 messages are deleted.  A negative argument means
 the current message and the previous |COUNT| - 1 messages are
 deleted.
 
@@ -18,7 +18,7 @@
 (autoload (quote vm-undelete-message) "vm-delete" "Remove the `deleted' attribute from the current message.
 
 With a prefix argument COUNT, the current message and the next
-COUNT - 1 messages are undeleted.  A negative argument means the
+COUNT - 1 messages are undeleted.  A negative argument means
 the current message and the previous |COUNT| - 1 messages are
 deleted.
 
@@ -27,7 +27,13 @@
 
 (autoload (quote vm-kill-subject) "vm-delete" "Delete all messages with the same subject as the current message.
 Message subjects are compared after ignoring parts matched by
-the variables vm-subject-ignored-prefix and vm-subject-ignored-suffix." t nil)
+the variables vm-subject-ignored-prefix and vm-subject-ignored-suffix.
+
+The optional prefix argument ARG specifies the direction to move
+if vm-move-after-killing is non-nil.  The default direction is
+forward.  A positive prefix argument means move forward, a
+negative arugment means move backward, a zero argument means
+don't move at all." t nil)
 
 (autoload (quote vm-expunge-folder) "vm-delete" "Expunge messages with the `deleted' attribute.
 For normal folders this means that the deleted messages are
@@ -56,6 +62,28 @@
 to be forwarded.  See the docs for vm-reorder-message-headers
 to find out how KEEP-LIST and DISCARD-REGEXP are used." nil nil)
 
+(autoload (quote vm-mime-encapsulate-messages) "vm-digest" "Encapsulate the messages in MESSAGE-LIST as per the MIME spec.
+The resulting digest is inserted at point in the current buffer.
+Point is not moved.
+
+MESSAGE-LIST should be a list of message structs (real or virtual).
+These are the messages that will be encapsulated.
+KEEP-LIST should be a list of regexps matching headers to keep.
+DISCARD-REGEXP should be a regexp that matches headers to be discarded.
+KEEP-LIST and DISCARD-REGEXP are used to order and trim the headers
+to be forwarded.  See the docs for vm-reorder-message-headers
+to find out how KEEP-LIST and DISCARD-REGEXP are used.
+
+Returns the multipart boundary parameter (string) that should be used
+in the Content-Type header." nil nil)
+
+(autoload (quote vm-mime-burst-message) "vm-digest" "Burst messages from the digest message M.
+M should be a message struct for a real message.
+MIME encoding is expected.  The message content type
+must be either message/* or multipart/digest." nil nil)
+
+(autoload (quote vm-mime-burst-layout) "vm-digest" nil nil nil)
+
 (autoload (quote vm-rfc934-char-stuff-region) "vm-digest" "Quote RFC 934 message separators between START and END.
 START and END are buffer positions in the current buffer.
 Lines beginning with `-' in the region have `- ' prepended to them." nil nil)
@@ -126,9 +154,11 @@
 
 (autoload (quote vm-burst-rfc1153-digest) "vm-digest" "Burst an RFC 1153 style digest" t nil)
 
+(autoload (quote vm-burst-mime-digest) "vm-digest" "Burst a MIME digest" t nil)
+
 (autoload (quote vm-guess-digest-type) "vm-digest" "Guess the digest type of the message M.
 M should be the message struct of a real message.
-Returns either \"rfc934\" or \"rfc1153\"." nil nil)
+Returns either \"rfc934\", \"rfc1153\" or \"mime\"." nil nil)
 
 (autoload (quote vm-easy-menu-define) "vm-easymenu" "Define a menu bar submenu in maps MAPS, according to MENU.
 The menu keymap is stored in symbol SYMBOL, both as its value
@@ -295,8 +325,8 @@
 START-POINT should be a cons in vm-message-list or just t.
  (t means start from the beginning of vm-message-list.)
 If START-POINT is closer to the head of vm-message-list than
-vm-numbering-redo-start-point or is equal to t, then
-vm-numbering-redo-start-point is set to match it." nil nil)
+vm-summary-redo-start-point or is equal to t, then
+vm-summary-redo-start-point is set to match it." nil nil)
 
 (autoload (quote vm-mark-for-summary-update) "vm-folder" "Mark message M for a summary update.
 Also mark M's buffer as needing a display update. Any virtual
@@ -316,11 +346,14 @@
 (autoload (quote vm-do-needed-mode-line-update) "vm-folder" "Do a modeline update for the current folder buffer.
 This means setting up all the various vm-ml attribute variables
 in the folder buffer and copying necessary variables to the
-folder buffer's summary buffer, and then forcing Emacs to update
-all modelines.
-
-Also if a virtual folder being updated has no messages,
-erase-buffer is called on its buffer." nil nil)
+folder buffer's summary and presentation buffers, and then
+forcing Emacs to update all modelines.
+
+If a virtual folder being updated has no messages, then
+erase-buffer is called on its buffer.
+
+If any type of folder is empty, erase-buffer is called
+on its presentation buffer, if any." nil nil)
 
 (autoload (quote vm-update-summary-and-mode-line) "vm-folder" "Update summary and mode line for all VM folder and summary buffers.
 Really this updates all the visible status indicators.
@@ -385,7 +418,7 @@
 This function works by examining the beginning of a folder.
 If optional arg FILE is present the type of FILE is returned instead.
 If optional second and third arg START and END are provided,
-vm-get-folder-type will examine the the text between those buffer
+vm-get-folder-type will examine the text between those buffer
 positions.  START and END default to 1 and (buffer-size) + 1.
 
 Returns
@@ -514,6 +547,8 @@
 
 (autoload (quote vm-stuff-attributes) "vm-folder" nil nil nil)
 
+(autoload (quote vm-stuff-folder-attributes) "vm-folder" nil nil nil)
+
 (autoload (quote vm-stuff-babyl-attributes) "vm-folder" nil nil nil)
 
 (autoload (quote vm-babyl-attributes-string) "vm-folder" nil nil nil)
@@ -645,6 +680,10 @@
 
 Interactively TYPE will be read from the minibuffer." t nil)
 
+(autoload (quote vm-garbage-collect-folder) "vm-folder" nil nil nil)
+
+(autoload (quote vm-garbage-collect-message) "vm-folder" nil nil nil)
+
 (autoload (quote vm-show-copying-restrictions) "vm-license" nil t nil)
 
 (autoload (quote vm-show-no-warranty) "vm-license" "Display \"NO WARRANTY\" section of the GNU General Public License." t nil)
@@ -663,6 +702,12 @@
 N-1 messages.  A negative N means unmark the current message and the
 previous N-1 messages." t nil)
 
+(autoload (quote vm-mark-summary-region) "vm-mark" "Mark all messages with summary lines contained in the region." t nil)
+
+(autoload (quote vm-unmark-summary-region) "vm-mark" "Remove marks from messages with summary lines contained in the region." t nil)
+
+(autoload (quote vm-mark-or-unmark-summary-region) "vm-mark" nil nil nil)
+
 (autoload (quote vm-mark-or-unmark-messages-with-selector) "vm-mark" nil nil nil)
 
 (autoload (quote vm-mark-matching-messages) "vm-mark" "Mark messages matching some criterion.
@@ -720,6 +765,8 @@
 
 (autoload (quote vm-menu-can-undo-p) "vm-menu" nil nil nil)
 
+(autoload (quote vm-menu-can-decode-mime-p) "vm-menu" nil nil nil)
+
 (autoload (quote vm-menu-yank-original) "vm-menu" nil t nil)
 
 (autoload (quote vm-menu-can-send-mail-p) "vm-menu" nil nil nil)
@@ -742,6 +789,8 @@
 
 (autoload (quote vm-menu-popup-url-browser-menu) "vm-menu" nil t nil)
 
+(autoload (quote vm-menu-popup-mime-dispose-menu) "vm-menu" nil t nil)
+
 (autoload (quote vm-menu-popup-fsfemacs-menu) "vm-menu" nil t nil)
 
 (autoload (quote vm-menu-mode-menu) "vm-menu" nil nil nil)
@@ -846,6 +895,10 @@
 
 (autoload (quote vm-virtual-summary-of) "vm-message" nil nil t)
 
+(autoload (quote vm-mime-layout-of) "vm-message" nil nil t)
+
+(autoload (quote vm-mime-encoded-header-flag-of) "vm-message" nil nil t)
+
 (autoload (quote vm-attributes-of) "vm-message" nil nil t)
 
 (autoload (quote vm-new-flag) "vm-message" nil nil t)
@@ -970,6 +1023,10 @@
 
 (autoload (quote vm-set-virtual-summary-of) "vm-message" nil nil t)
 
+(autoload (quote vm-set-mime-layout-of) "vm-message" nil nil t)
+
+(autoload (quote vm-set-mime-encoded-header-flag-of) "vm-message" nil nil t)
+
 (autoload (quote vm-set-attributes-of) "vm-message" nil nil t)
 
 (autoload (quote vm-set-edited-flag-of) "vm-message" nil nil nil)
@@ -1036,6 +1093,280 @@
 
 (autoload (quote vm-virtual-message-p) "vm-message" nil nil nil)
 
+(autoload (quote vm-mime-error) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mm-layout-type) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mm-layout-encoding) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mm-layout-id) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mm-layout-description) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mm-layout-disposition) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mm-layout-header-start) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mm-layout-body-start) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mm-layout-body-end) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mm-layout-parts) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mm-layout-cache) "vm-mime" nil nil nil)
+
+(autoload (quote vm-set-mm-layout-cache) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mm-layout) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mm-encoded-header) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-Q-decode-region) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-Q-encode-region) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-Q-decode-string) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-B-decode-string) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-Q-encode-string) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-B-encode-string) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-crlf-to-lf-region) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-lf-to-crlf-region) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-charset-decode-region) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-transfer-decode-region) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-base64-decode-region) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-base64-encode-region) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-qp-decode-region) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-qp-encode-region) "vm-mime" nil nil nil)
+
+(autoload (quote vm-decode-mime-message-headers) "vm-mime" nil nil nil)
+
+(autoload (quote vm-decode-mime-encoded-words) "vm-mime" nil nil nil)
+
+(autoload (quote vm-decode-mime-encoded-words-maybe) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-parse-content-header) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-get-header-contents) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-parse-entity) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-parse-entity-safe) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-get-xxx-parameter) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-get-parameter) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-get-disposition-parameter) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-insert-mime-body) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-insert-mime-headers) "vm-mime" nil nil nil)
+
+(autoload (quote vm-make-presentation-copy) "vm-mime" nil nil nil)
+
+(autoload (quote vm-determine-proper-charset) "vm-mime" nil nil nil)
+
+(autoload (quote vm-determine-proper-content-transfer-encoding) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-types-match) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-can-display-internal) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-can-convert) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-convert-undisplayable-layout) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-should-display-button) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-should-display-internal) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-find-external-viewer) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-delete-button-maybe) "vm-mime" nil nil nil)
+
+(autoload (quote vm-decode-mime-message) "vm-mime" "Decode the MIME objects in the current message.
+
+The first time this command is run on a message, decoding is done.
+The second time, buttons for all the objects are displayed instead.
+The third time, the raw, undecoded data is displayed.
+
+If decoding, the decoded objects might be displayed immediately, or
+buttons might be displayed that you need to activate to view the
+object.  See the documentation for the variables
+
+    vm-auto-displayed-mime-content-types
+    vm-mime-internal-content-types
+    vm-mime-external-content-types-alist
+
+to see how to control whether you see buttons or objects.
+
+If the variable vm-mime-display-function is set, then its value
+is called as a function with no arguments, and none of the
+actions mentioned in the preceding paragraphs are done.  At the
+time of the call, the current buffer will be the presentation
+buffer for the folder and a copy of the current message will be
+in the buffer.  The function is expected to make the message
+`MIME presentable' to the user in whatever manner it sees fit." t nil)
+
+(autoload (quote vm-decode-mime-layout) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-button-text) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-text/html) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-text/plain) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-text/enriched) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-external-generic) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-application/octet-stream) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-button-image) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-button-audio) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-button-video) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-button-message) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-button-multipart) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-multipart/mixed) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-multipart/alternative) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-button-multipart/parallel) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-multipart/digest) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-message/rfc822) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-message/partial) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-image-xxxx) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-image/gif) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-image/jpeg) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-image/png) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-image/tiff) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-internal-audio/basic) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-display-button-xxxx) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-run-display-function-at-point) "vm-mime" nil t nil)
+
+(autoload (quote vm-mime-insert-button) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-send-body-to-file) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-pipe-body-to-command) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-pipe-body-to-command-discard-output) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-scrub-description) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-layout-description) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-layout-contains-type) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-plain-message-p) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-text-type-p) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-charset-internally-displayable-p) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-find-message/partials) "vm-mime" nil nil nil)
+
+(autoload (quote vm-message-at-point) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-make-multipart-boundary) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-attach-file) "vm-mime" "Attach a file to a VM composition buffer to be sent along with the message.
+The file is not inserted into the buffer and MIME encoded until
+you execute vm-mail-send or vm-mail-send-and-exit.  A visible tag
+indicating the existence of the attachment is placed in the
+composition buffer.  You can move the attachment around or remove
+it entirely with normal text editing commands.  If you remove the
+attachment tag, the attachment will not be sent.
+
+First argument, FILE, is the name of the file to attach.  Second
+argument, TYPE, is the MIME Content-Type of the file.  Optional
+third argument CHARSET is the character set of the attached
+document.  This argument is only used for text types, and it
+is ignored for other types.
+
+When called interactively all arguments are read from the
+minibuffer.
+
+This command is for attaching files that do not have a MIME
+header section at the top.  For files with MIME headers, you
+should use vm-mime-attach-mime-file to attach such a file.  VM
+will extract the content type information from the headers in
+this case and not prompt you for it in the minibuffer." t nil)
+
+(autoload (quote vm-mime-attach-mime-file) "vm-mime" "Attach a MIME encoded file to a VM composition buffer to be sent
+along with the message.
+
+The file is not inserted into the buffer until you execute
+vm-mail-send or vm-mail-send-and-exit.  A visible tag indicating
+the existence of the attachment is placed in the composition
+buffer.  You can move the attachment around or remove it entirely
+with normal text editing commands.  If you remove the attachment
+tag, the attachment will not be sent.
+
+The sole argument, FILE, is the name of the file to attach.
+When called interactively the FILE argument is read from the
+minibuffer.
+
+This command is for attaching files that have a MIME
+header section at the top.  For files without MIME headers, you
+should use vm-mime-attach-file to attach such a file.  VM
+will interactively query you for the file type information." t nil)
+
+(autoload (quote vm-mime-attach-object) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-default-type-from-filename) "vm-mime" nil nil nil)
+
+(autoload (quote vm-remove-mail-mode-header-separator) "vm-mime" nil nil nil)
+
+(autoload (quote vm-add-mail-mode-header-separator) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-transfer-encode-region) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-transfer-encode-layout) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-encode-composition) "vm-mime" "MIME encode the current buffer.
+Attachment tags added to the buffer with vm-mime-attach-file are expanded
+and the approriate content-type and boundary markup information is added." t nil)
+
+(autoload (quote vm-mime-fragment-composition) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-preview-composition) "vm-mime" "Show how the current composition buffer might be displayed
+in a MIME-aware mail reader.  VM copies and encodes the current
+mail composition buffer and displays it as a mail folder.
+Type `q' to quit this temp folder and return to composing your
+message." t nil)
+
+(autoload (quote vm-mime-composite-type-p) "vm-mime" nil nil nil)
+
+(autoload (quote vm-mime-map-atomic-layouts) "vm-mime" nil nil nil)
+
 (autoload (quote vm-minibuffer-complete-word) "vm-minibuf" nil t nil)
 
 (autoload (quote vm-minibuffer-complete-word-and-exit) "vm-minibuf" nil t nil)
@@ -1111,6 +1442,8 @@
 
 (autoload (quote vm-check-for-killed-summary) "vm-misc" nil nil nil)
 
+(autoload (quote vm-check-for-killed-presentation) "vm-misc" nil nil nil)
+
 (autoload (quote vm-check-for-killed-folder) "vm-misc" nil nil nil)
 
 (autoload (quote vm-error-if-folder-read-only) "vm-misc" nil nil t)
@@ -1139,6 +1472,12 @@
 
 (autoload (quote vm-delete) "vm-misc" nil nil nil)
 
+(autoload (quote vm-delete-directory-file-names) "vm-misc" nil nil nil)
+
+(autoload (quote vm-delete-backup-file-names) "vm-misc" nil nil nil)
+
+(autoload (quote vm-delete-auto-save-file-names) "vm-misc" nil nil nil)
+
 (autoload (quote vm-delete-duplicates) "vm-misc" "Delete duplicate equivalent strings from the list.
 If ALL is t, then if there is more than one occurrence of a string in the list,
  then all occurrences of it are removed instead of just the subsequent ones.
@@ -1158,6 +1497,8 @@
 
 (autoload (quote vm-xemacs-p) "vm-misc" nil nil nil)
 
+(autoload (quote vm-xemacs-mule-p) "vm-misc" nil nil nil)
+
 (autoload (quote vm-fsfemacs-19-p) "vm-misc" nil nil nil)
 
 (autoload (quote vm-multiple-frames-possible-p) "vm-misc" nil nil nil)
@@ -1192,6 +1533,20 @@
 
 (autoload (quote vm-buffer-string-no-properties) "vm-misc" nil nil nil)
 
+(autoload (quote vm-insert-region-from-buffer) "vm-misc" nil nil nil)
+
+(autoload (quote vm-copy-extent) "vm-misc" nil nil nil)
+
+(autoload (quote vm-make-tempfile-name) "vm-misc" nil nil nil)
+
+(autoload (quote vm-insert-char) "vm-misc" nil nil nil)
+
+(autoload (quote vm-xemacs-compatible-insert-char) "vm-misc" nil nil nil)
+
+(autoload (quote vm-symbol-lists-intersect-p) "vm-misc" nil nil nil)
+
+(autoload (quote vm-set-buffer-variable) "vm-misc" nil nil nil)
+
 (autoload (quote vm-mouse-fsfemacs-mouse-p) "vm-mouse" nil nil nil)
 
 (autoload (quote vm-mouse-xemacs-mouse-p) "vm-mouse" nil nil nil)
@@ -1202,7 +1557,7 @@
 
 (autoload (quote vm-mouse-button-3) "vm-mouse" nil t nil)
 
-(autoload (quote vm-mouse-3-help) "vm-mouse" "Use mouse button 3 to see a menu of options." nil nil)
+(autoload (quote vm-mouse-3-help) "vm-mouse" nil nil nil)
 
 (autoload (quote vm-mouse-get-mouse-track-string) "vm-mouse" nil nil nil)
 
@@ -1224,6 +1579,8 @@
 
 (autoload (quote vm-run-command) "vm-mouse" nil nil nil)
 
+(autoload (quote vm-run-command-on-region) "vm-mouse" nil nil nil)
+
 (autoload (quote vm-mouse-read-file-name) "vm-mouse" "Like read-file-name, except uses a mouse driven interface.
 HISTORY argument is ignored." nil nil)
 
@@ -1320,6 +1677,14 @@
 
 (autoload (quote vm-url-help) "vm-page" nil nil nil)
 
+(autoload (quote vm-energize-urls-in-message-region) "vm-page" nil nil nil)
+
+(autoload (quote vm-highlight-headers-maybe) "vm-page" nil nil nil)
+
+(autoload (quote vm-energize-headers-and-xfaces) "vm-page" nil nil nil)
+
+(autoload (quote vm-narrow-for-preview) "vm-page" nil nil nil)
+
 (autoload (quote vm-preview-current-message) "vm-page" nil nil nil)
 
 (autoload (quote vm-show-current-message) "vm-page" nil nil nil)
@@ -1397,6 +1762,8 @@
 (autoload (quote vm-mail-send) "vm-reply" "Just like mail-send except that VM flags the appropriate message(s)
 as replied to, forwarded, etc, if appropriate." t nil)
 
+(autoload (quote vm-mail-mode-get-header-contents) "vm-reply" nil nil nil)
+
 (autoload (quote vm-rename-current-mail-buffer) "vm-reply" nil nil nil)
 
 (autoload (quote vm-mail-mark-replied) "vm-reply" nil nil nil)
@@ -1471,6 +1838,8 @@
 
 (autoload (quote vm-send-rfc1153-digest) "vm-reply" "Like vm-send-digest but always sends an RFC 1153 digest." t nil)
 
+(autoload (quote vm-send-mime-digest) "vm-reply" "Like vm-send-digest but always sends an MIME (multipart/digest) digest." t nil)
+
 (autoload (quote vm-continue-composing-message) "vm-reply" "Find and select the most recently used mail composition buffer.
 If the selected buffer is already a Mail mode buffer then it is
 buried before beginning the search.  Non Mail mode buffers and
@@ -1478,6 +1847,8 @@
 Mail mode buffers are not skipped.  If no suitable buffer is
 found, the current buffer remains selected." t nil)
 
+(autoload (quote vm-mail-to-mailto-url) "vm-reply" nil nil nil)
+
 (autoload (quote vm-mail-internal) "vm-reply" nil nil nil)
 
 (autoload (quote vm-reply-other-frame) "vm-reply" "Like vm-reply, but run in a newly created frame." t nil)
@@ -1502,6 +1873,8 @@
 
 (autoload (quote vm-send-rfc1153-digest-other-frame) "vm-reply" "Like vm-send-rfc1153-digest, but run in a newly created frame." t nil)
 
+(autoload (quote vm-send-mime-digest-other-frame) "vm-reply" "Like vm-send-mime-digest, but run in a newly created frame." t nil)
+
 (autoload (quote vm-match-data) "vm-save" nil nil nil)
 
 (autoload (quote vm-auto-select-folder) "vm-save" nil nil nil)
@@ -1695,7 +2068,7 @@
 
 (autoload (quote vm-mode) "vm-startup" "Major mode for reading mail.
 
-This is VM 5.96 (beta).
+This is VM 6.13.
 
 Commands:
    h - summarize folder contents
@@ -1735,7 +2108,7 @@
 
    @ - digestify and mail entire folder contents (the folder is not modified)
    * - burst a digest into individual messages, and append and assimilate these
-       message into the current folder.
+       messages into the current folder.
 
    G - sort messages by various keys
 
@@ -1764,14 +2137,16 @@
        M U - unmark the current message
        M m - mark all messages
        M u - unmark all messages
-       M C - mark messages matches by a virtual folder selector
-       M c - unmark messages matches by a virtual folder selector
+       M C - mark messages matched by a virtual folder selector
+       M c - unmark messages matched by a virtual folder selector
        M T - mark thread tree rooted at the current message
        M t - unmark thread tree rooted at the current message
        M S - mark messages with the same subject as the current message
        M s - unmark messages with the same subject as the current message
        M A - mark messages with the same author as the current message
        M a - unmark messages with the same author as the current message
+       M R - mark messages within the point/mark region in the summary
+       M r - unmark messages within the point/mark region in the summary
 
        M ? - partial help for mark commands
 
@@ -1818,17 +2193,21 @@
    vm-arrived-message-hook
    vm-arrived-messages-hook
    vm-auto-center-summary
+   vm-auto-decode-mime-messages
+   vm-auto-displayed-mime-content-types
    vm-auto-folder-alist
    vm-auto-folder-case-fold-search
    vm-auto-get-new-mail
    vm-auto-next-message
    vm-berkeley-mail-compatibility
+   vm-burst-digest-messages-inherit-labels
    vm-check-folder-types
-   vm-convert-folder-types
    vm-circular-folders
    vm-confirm-new-folders
    vm-confirm-quit
+   vm-convert-folder-types
    vm-crash-box
+   vm-crash-box-suffix
    vm-default-folder-type
    vm-delete-after-archiving
    vm-delete-after-bursting
@@ -1839,6 +2218,7 @@
    vm-digest-preamble-format
    vm-digest-send-type
    vm-display-buffer-hook
+   vm-display-using-mime
    vm-edit-message-hook
    vm-folder-directory
    vm-folder-read-only
@@ -1848,8 +2228,11 @@
    vm-forwarding-digest-type
    vm-forwarding-subject-format
    vm-frame-parameter-alist
+   vm-frame-per-completion
    vm-frame-per-composition
+   vm-frame-per-edit
    vm-frame-per-folder
+   vm-frame-per-summary
    vm-highlighted-header-face
    vm-highlighted-header-regexp
    vm-honor-page-delimiters
@@ -1858,32 +2241,52 @@
    vm-included-text-discard-header-regexp
    vm-included-text-headers
    vm-included-text-prefix
-   vm-inhibit-startup-message
    vm-invisible-header-regexp
    vm-jump-to-new-messages
    vm-jump-to-unread-messages
+   vm-keep-crash-boxes
    vm-keep-sent-messages
-   vm-keep-crash-boxes
    vm-mail-header-from
    vm-mail-mode-hook
+   vm-make-crash-box-name
+   vm-make-spool-file-name
+   vm-mime-8bit-composition-charset
+   vm-mime-8bit-text-transfer-encoding
+   vm-mime-alternative-select-method
+   vm-mime-attachment-auto-type-alist
+   vm-mime-attachment-save-directory
+   vm-mime-avoid-folding-content-type
+   vm-mime-base64-decoder-program
+   vm-mime-base64-decoder-switches
+   vm-mime-base64-encoder-program
+   vm-mime-base64-encoder-switches
+   vm-mime-button-face
+   vm-mime-digest-discard-header-regexp
+   vm-mime-digest-headers
+   vm-mime-display-function
+   vm-mime-external-content-types-alist
+   vm-mime-internal-content-types
+   vm-mime-max-message-size
    vm-mode-hook
    vm-mosaic-program
    vm-move-after-deleting
+   vm-move-after-killing
    vm-move-after-undeleting
    vm-move-messages-physically
+   vm-mutable-frames
    vm-mutable-windows
-   vm-mutable-frames
    vm-netscape-program
-   vm-options-file
    vm-pop-md5-program
+   vm-popup-menu-on-mouse-3
+   vm-preferences-file
    vm-preview-lines
    vm-preview-read-messages
    vm-primary-inbox
    vm-quit-hook
    vm-recognize-pop-maildrops
    vm-reply-hook
+   vm-reply-ignored-addresses
    vm-reply-ignored-reply-tos
-   vm-reply-ignored-addresses
    vm-reply-subject-prefix
    vm-resend-bounced-discard-header-regexp
    vm-resend-bounced-headers
@@ -1901,9 +2304,11 @@
    vm-select-new-message-hook
    vm-select-unread-message-hook
    vm-send-digest-hook
+   vm-send-using-mime
    vm-skip-deleted-messages
    vm-skip-read-messages
    vm-spool-files
+   vm-spool-file-suffixes
    vm-startup-with-summary
    vm-strip-reply-headers
    vm-summary-arrow
@@ -1912,14 +2317,16 @@
    vm-summary-mode-hook
    vm-summary-redo-hook
    vm-summary-show-threads
-   vm-summary-subject-no-newlines
    vm-summary-thread-indent-level
+   vm-temp-file-directory
+   vm-tale-is-an-idiot
    vm-trust-From_-with-Content-Length
    vm-undisplay-buffer-hook
    vm-unforwarded-header-regexp
    vm-url-browser
    vm-url-search-limit
    vm-use-menus
+   vm-use-toolbar
    vm-virtual-folder-alist
    vm-virtual-mirror
    vm-visible-headers
@@ -1971,6 +2378,8 @@
 
 (autoload (quote vm-load-init-file) "vm-startup" nil t nil)
 
+(autoload (quote vm-check-emacs-version) "vm-startup" nil nil nil)
+
 (autoload (quote vm-session-initialization) "vm-startup" nil nil nil)
 
 (autoload (quote vm-summary-mode-internal) "vm-summary" nil nil nil)
@@ -2109,6 +2518,10 @@
 
 (autoload (quote vm-toolbar-can-recover-p) "vm-toolbar" nil nil nil)
 
+(autoload (quote vm-toolbar-can-decode-mime-p) "vm-toolbar" nil nil nil)
+
+(autoload (quote vm-toolbar-can-quit-p) "vm-toolbar" nil nil nil)
+
 (autoload (quote vm-toolbar-update-toolbar) "vm-toolbar" nil nil nil)
 
 (autoload (quote vm-toolbar-install-toolbar) "vm-toolbar" nil nil nil)
@@ -2243,12 +2656,6 @@
 
 (autoload (quote vm-virtual-help) "vm-virtual" nil t nil)
 
-(autoload (quote vm-delete-directory-file-names) "vm-virtual" nil nil nil)
-
-(autoload (quote vm-delete-backup-file-names) "vm-virtual" nil nil nil)
-
-(autoload (quote vm-delete-auto-save-file-names) "vm-virtual" nil nil nil)
-
 (autoload (quote vm-vs-or) "vm-virtual" nil nil nil)
 
 (autoload (quote vm-vs-and) "vm-virtual" nil nil nil)
@@ -2380,10 +2787,18 @@
 
 (autoload (quote vm-set-hooks-for-frame-deletion) "vm-window" nil nil nil)
 
+(autoload (quote vm-created-this-frame-p) "vm-window" nil nil nil)
+
 (autoload (quote vm-delete-buffer-frame) "vm-window" nil nil nil)
 
+(autoload (quote vm-register-frame) "vm-window" nil nil nil)
+
 (autoload (quote vm-goto-new-frame) "vm-window" nil nil nil)
 
+(autoload (quote vm-goto-new-summary-frame-maybe) "vm-window" nil nil nil)
+
+(autoload (quote vm-goto-new-folder-frame-maybe) "vm-window" nil nil nil)
+
 (autoload (quote vm-warp-mouse-to-frame-maybe) "vm-window" nil nil nil)
 
 (autoload (quote vm-iconify-frame-xxx) "vm-window" nil nil nil)