Update.

[elisp.git] / vm

diff --git a/vm b/vm
index 6393b45..85a9bdc 100644 (file)
--- a/vm
+++ b/vm
@@ -351,7 +351,8 @@ attachement from mail."
 
 (ff/configure-faces
  ;; '((ff/mail-header-face :background "#c8c8ff"))
- '((ff/mail-header-face :background "#f0f0f0"))
+ '((ff/mail-header-face :background "#eaf0ff"))
+ ;; '((ff/mail-header-face :background "#fff0a0"))
  ;; '((ff/mail-header-face :foreground "blue4"))
  )
 
@@ -588,6 +589,9 @@ an attachment")
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; If we can, encrypt!
 
+(autoload 'mc-install-write-mode "mailcrypt" nil t)
+(autoload 'mc-install-read-mode "mailcrypt" nil t)
+
 (add-hook 'vm-mode-hook 'mc-install-read-mode)
 (add-hook 'vm-summary-mode-hook 'mc-install-read-mode)
 (add-hook 'vm-virtual-mode-hook 'mc-install-read-mode)
@@ -713,9 +717,23 @@ instance, someone in bbdb named \"Paul Smith\" would generate an alias
     (let ((link "/tmp/at")
           (dir (format-time-string "/tmp/at-%Y%m%d-%H%M%S" (current-time))))
       (mkdir dir)
-      (when (file-symlink-p link) (delete-file link))
-      (unless (file-exists-p link) (make-symbolic-link dir link 1))
+
+      (when (file-symlink-p (concat link "~~"))
+        (delete-file (concat link "~~")))
+
+      (when (and (file-symlink-p (concat link "~"))
+                 (not (file-exists-p (concat link "~~"))))
+        (rename-file (concat link "~") (concat link "~~")))
+
+      (when (and (file-symlink-p link)
+                 (not (file-exists-p (concat link "~"))))
+        (file-symlink-p link) (rename-file link (concat link "~")))
+
+      (unless (file-exists-p link)
+        (make-symbolic-link dir link 1))
+
       ;; (vm-pipe-message-to-command (concat "munpack -C " dir))
+
       (vm-pipe-message-to-command (concat "munpack -t -C " dir))
       (message "Wrote files to %s" dir)
       )