vm, setup: Install movemail-hack, which explicitly nobbles LD_PRELOAD.

Otherwise the linker produces diagnostics, which confuse VM.

diff --git a/setup b/setup
index 54055d0e7a5648164df19dd8c4416270abee3b5b..a25d8f9411cf99ef01368fd1aeaa382faf17319e 100755 (executable)
--- a/setup
+++ b/setup
@@ -68,7 +68,7 @@ fi
 echo "Installing useful scripts..."
 
 scripts="
 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
 [ "$xstuff" ] && scripts="$scripts
   xrun"
 for script in $scripts; do

diff --git a/vm b/vm
index d3824cc2e94aed9d0cdda025e6685131b459cf4b..17d7209ce7574f09e34f858b2f77641848d2749b 100644 (file)
--- a/vm
+++ b/vm
@@ -2,6 +2,13 @@
 ;;;
 ;;; Configuration for VM
 
 ;;;
 ;;; 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"
 (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-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)
       vm-delete-after-saving t
       vm-move-after-deleting t
       vm-delete-empty-folders)