From 370d4c8dc38812c0ac323b1eb88b8997b4c12b51 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 18 Jun 2006 10:33:12 +0100
Subject: [PATCH] vm, setup: Install movemail-hack, which explicitly nobbles
 LD_PRELOAD.

Otherwise the linker produces diagnostics, which confuse VM.
---
 setup | 2 +-
 vm    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/setup b/setup
index 54055d0..a25d8f9 100755
--- a/setup
+++ b/setup
@@ -68,7 +68,7 @@ fi
 echo "Installing useful scripts..."
 
 scripts="
-  lesspipe.sh start-ssh-agent svnwrap"
+  lesspipe.sh start-ssh-agent svnwrap movemail-hack"
 [ "$xstuff" ] && scripts="$scripts
   xrun"
 for script in $scripts; do
diff --git a/vm b/vm
index d3824cc..17d7209 100644
--- a/vm
+++ b/vm
@@ -2,6 +2,13 @@
 ;;;
 ;;; Configuration for VM
 
+(let ((path exec-path))
+  (while path
+    (let ((try (expand-file-name "movemail" (car path))))
+      (if (file-executable-p try)
+	  (setenv "REAL_MOVEMAIL" try))
+      (setq path (cdr path)))))
+
 (setq vm-reply-subject-prefix "Re: "
       vm-included-text-prefix "> "
       vm-included-text-attribution-format "%F <%f> wrote:\n\n"
@@ -11,6 +18,7 @@
       vm-circular-folders nil
       vm-preview-lines nil
       vm-highlighted-header-regexp "^From\\|^Subject"
+      vm-movemail-program "movemail-hack"
       vm-delete-after-saving t
       vm-move-after-deleting t
       vm-delete-empty-folders)
-- 
2.11.0