X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=vm;h=fac1ae7cbe4ba2331defafe77f25aa9b23caa4ee;hb=0785fb27e9d9eeb8d19dd8e1bfad8e520b04bb4c;hp=f863e60eca85a43de1c98e5ef231ddc9d0deb294;hpb=dc6529fdef55c5332ce01ba80abe421236a23f02;p=elisp.git

diff --git a/vm b/vm
index f863e60..fac1ae7 100644
--- a/vm
+++ b/vm
@@ -154,9 +154,11 @@
 
 (require 'vm-rfaddons)
 
+(setq vm-mime-default-face-charsets t)
 ;; (add-to-list 'vm-mime-default-face-charsets  "utf-8")
 
-(add-to-list 'vm-mime-default-face-charsets  "iso-8859-1")
+;; (add-to-list 'vm-mime-default-face-charsets "iso-8859-1")
+;; (add-to-list 'vm-mime-default-face-charsets "Windows-1251")
 ;; (add-hook 'vm-mail-send-hook 'ff/vm-remove-non-7bits-in-headers)
 (add-hook 'vm-mail-send-hook 'vm-mime-encode-headers)
 (add-hook 'vm-mail-send-hook 'vm-mail-check-recipients)
@@ -286,7 +288,10 @@ attachement from mail."
   (vm-delete-message 1)
   (condition-case nil (vm-next-message-no-skip 1) (error nil)))
 
-(add-hook 'vm-quit-hook 'vm-expunge-folder)
+(defun ff/vm-expunge-folder ()
+  (unless vm-folder-read-only (vm-expunge-folder)))
+
+(add-hook 'vm-quit-hook 'ff/vm-expunge-folder)
 (add-hook 'vm-quit-hook 'bbdb-save-db)
 (add-hook 'vm-retrieved-spooled-mail-hook 'display-time-update)
 
@@ -634,9 +639,6 @@ is t."
 
 (when (load "bbdb-vm" t)
 
-  ;; (defadvice define-mail-abbrev (before ff/remove-explicit-name (name definition &optional from-mailrc-file) activate)
-  ;; (message "%s -> %s" name definition))
-
   (defun ff/mail-aliases-from-bbdb ()
     "Creates automatically mail aliases from the bbdb records. For
 instance, someone in bbdb named \"Paul Smith\" would generate an alias
@@ -647,7 +649,8 @@ instance, someone in bbdb named \"Paul Smith\" would generate an alias
         (let* ((record (car records))
                (name (concat (elt record 0) " " (elt record 1)))
                (email (car (elt record 6)))
-               (alias (downcase (replace-regexp-in-string "\\([a-zA-Z]?\\)[^- ]*[- ]*" "\\1" name))))
+               (alias (downcase (replace-regexp-in-string
+                                 "\\([a-zA-Z]?\\)[^- ]*[- ]*" "\\1" name))))
           (if (and (> (length alias) 1)
                    ;; Do not overwrite an existing alias
                    (not (and mail-abbrevs (intern-soft alias mail-abbrevs))))