Update to version 6.93. Changes:

* New variables:
  + vm-folder-file-precious-flag
* added CRAM-MD5 as an authentication method for IMAP.
* vm-su-do-date: interpret 2-digit years in the RFC-822 matching
  case as 20XX if year starts with 0-6.
* vm-rfc1153-or-rfc934-burst-message: skip spaces in addition to
  newlines that occur after a separator line.  A digest has been
  observed with that kind of deformity.
* treat enable-local-eval as we do enable-local-variables--- always
  bind it to nil.
* vm: don't bind vm-auto-decode-mime-messages non-nil during
  initial message preview if it is nil.
* vm-mime-display-internal-text/html: dropped (sleep-for 2).  No one cares
  enough about the "Need W3 to inline HTML" message to wait 2
  seconds afterward.
* added menu entry to allow MIME objects to be converted to
  another type and displayed.  The new type is determined by
  vm-mime-type-converter-alist.
* added koi8-r to vm-mime-mule-charset-to-coding-alist (XEmacs only).
* vm-pop-read-list-response: check for nil return of
  vm-pop-read-response before using return value.
* vm-pop-read-stat-response: check for nil return of
  vm-pop-read-response before using return value.
* vm-encode-coding-region: use unwind-protect to make sure (well
  more likely) that the work buffer always gets killed if it has
  been created.
* vm-decode-coding-region: use unwind-protect to make sure (well
  more likely) that the work buffer always gets killed if it has
  been created.
* vm-mime-convert-undisplayable-layout: put object buffer on
  garbage list sooner to make rarer the situation where the
  buffer never gets deleted.
* Makefile: remove function definition of vm-its-such-a-cruel-world
  after it is run.
* vm-md5-region: if vm-pop-md5-program exits non-zero, signal an
  error.  Also if the work buffer is not at least 32 bytes long,
  signal an error.  This prevents naive callers from assumption all is well
  and using a possibly empty string as an MD5 hash.
* vm-md5-region: check the MD5 digest returned for non-hex-digit
  characters and signal an error if any are found.
* vm-get-file-buffer: use find-buffer-visiting if it is fbound.
* vm-build-threads: fixed loop that removed child messages from a
  parent when better information about a child's parent is found.
  Previously the loop attempted to remove the same message from
  the parent over and over.
* vm-build-threads: gather thread data using References and
  In-Reply-To for all messages before using the Subject header.
  This helps prevent the case where References says A is the
  parent of B but because of clock skew B is older than A, which
  can lead to B being considered the parent of A if A and B have
  the same subject and vm-thread-using-subject is non-nil.

3 files changed, 25 insertions, 16 deletions

diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index 8490d7579bb..f67a93ba830 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2001/05/03 21:46:31 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/27 19:45:29 jtb Exp $
 
-DISTNAME=	vm-6.92
+DISTNAME=	vm-6.93
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.uni-mainz.de/pub/gnu/vm/ \
 		ftp://tug.org/vm/ \
@@ -17,18 +17,18 @@ COMMENT=	VM (View Mail) is an advanced mail user agent for Emacs
 .if defined(USE_XEMACS)
 DEPENDS+=	xemacs>=19.14:../../editors/xemacs
 MAKE_ENV+=	EMACS=xemacs
-MAKE_ENV+=	LISPDIR="${PREFIX}/lib/xemacs/xemacs-packages/lisp/vm"
-MAKE_ENV+=	INFODIR="${PREFIX}/lib/xemacs/xemacs-packages/info"
-MAKE_ENV+=	PIXMAPDIR="${PREFIX}/lib/xemacs/xemacs-packages/etc/vm"
-MAKE_ENV+=	BINDIR="${PREFIX}/bin"
+MAKE_ENV+=	LISPDIR=${PREFIX}/lib/xemacs/xemacs-packages/lisp/vm
+MAKE_ENV+=	INFODIR="${PREFIX}/lib/xemacs/xemacs-packages/info
+MAKE_ENV+=	PIXMAPDIR=${PREFIX}/lib/xemacs/xemacs-packages/etc/vm
+MAKE_ENV+=	BINDIR=${PREFIX}/bin
 PLIST_SRC=	${PKGDIR}/PLIST.xemacs
 .else
 DEPENDS+=	emacs>=19.34:../../editors/emacs
 MAKE_ENV+=	EMACS=emacs
-MAKE_ENV+=	LISPDIR="${PREFIX}/share/emacs/site-lisp/vm"
-MAKE_ENV+=	INFODIR="${PREFIX}/info"
-MAKE_ENV+=	PIXMAPDIR="${PREFIX}/share/emacs/site-lisp/vm/pixmaps"
-MAKE_ENV+=	BINDIR="${PREFIX}/bin"
+MAKE_ENV+=	LISPDIR=${PREFIX}/share/emacs/site-lisp/vm
+MAKE_ENV+=	INFODIR=${PREFIX}/info
+MAKE_ENV+=	PIXMAPDIR=${PREFIX}/share/emacs/site-lisp/vm/pixmaps
+MAKE_ENV+=	BINDIR=${PREFIX}/bin
 INFO_FILES=	vm.info
 PLIST_SRC=	${PKGDIR}/PLIST.emacs
 .endif
diff --git a/mail/vm/distinfo b/mail/vm/distinfo
index 4377f7ae5e3..3a06c835c38 100644
--- a/mail/vm/distinfo
+++ b/mail/vm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:10:06 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/06/27 19:45:29 jtb Exp $
 
-SHA1 (vm-6.92.tar.gz) = eabee0f81f970a254eb1d3354da9532c0d170ed1
-Size (vm-6.92.tar.gz) = 341717 bytes
+SHA1 (vm-6.93.tar.gz) = 92caf329427db184d00dfeffa151999a55afc0fb
+Size (vm-6.93.tar.gz) = 343689 bytes
 SHA1 (patch-aa) = 91e0d6f87091138d0f0922653706dddfa44c5ba6
-SHA1 (patch-ab) = 2aa327dc047b2660149c4aba29d0efa1a1850084
+SHA1 (patch-ab) = 9b1bff45f8e5aa23fb9b7e41d94b5a7ef447635d
diff --git a/mail/vm/patches/patch-ab b/mail/vm/patches/patch-ab
index 374bb276b5c..5ebce50793f 100644
--- a/mail/vm/patches/patch-ab
+++ b/mail/vm/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/01 04:18:22 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2001/06/27 19:45:30 jtb Exp $
 
---- vm.texinfo.orig	Sun Aug 22 19:48:28 1999
+--- vm.texinfo.orig	Fri May  4 17:54:47 2001
 +++ vm.texinfo
 @@ -1,9 +1,10 @@
  \input texinfo  @comment -*-Text-*-
@@ -16,3 +16,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/01 04:18:22 jtb Exp $
  @iftex
  @finalout
  @end iftex
+@@ -161,7 +162,7 @@
+ @vindex vm-folder-file-precious-flag
+ When a folder is first visited, the value of the variable
+ @code{vm-folder-file-precious-flag} is used to initialize a
+-buffer-local instance of #code{file-precious-flag}, which
++buffer-local instance of @code{file-precious-flag}, which
+ determines how folders are saved.  A non-nil value causes
+ folders to be saved by writing to a temporary file and then
+ replacing the folder with that file.  A nil value causes