X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=elisp.git;a=blobdiff_plain;f=vm;h=71e6629cc6364efb11df5915d0cc317c8dbb5177;hp=f2019a459837f738fdce921ac4562044b54c7bf1;hb=1221a3ab7adfb338de4cd301dcdffec81986ec90;hpb=2d1ba5da3dee7cadaf9e736a8c476a9562a1d67a diff --git a/vm b/vm index f2019a4..71e6629 100644 --- a/vm +++ b/vm @@ -34,67 +34,60 @@ )) -(setq vm-startup-message-displayed t ;; Yes, we already saw it, no need to insist - vm-use-menus nil - vm-skip-deleted-messages nil - vm-skip-read-messages nil - vm-use-toolbar nil +(setq + ;; browse-url-mozilla-program "iceweasel" + ;; mail-complete-style nil + ;; mail-from-style nil + ;; vm-coding-system-priorities '(utf-8) + ;; vm-highlighted-header-regexp "From:\\|Subject:\\|Cc:\\|To:\\|Bcc:\\|Reply-To:" + ;; vm-included-text-attribution-format "\nOn %w, %m %d, at %H, you wrote:\n\n" ;; vm-jump-to-new-messages nil - vm-startup-with-summary t + ;; vm-mime-7bit-composition-charset "latin-1" + ;; vm-mime-8bit-composition-charset "utf-8" ;; vm-preview-read-messages t - vm-preview-lines nil - vm-auto-get-new-mail t - vm-circular-folders nil - vm-confirm-new-folders t - vm-mutable-windows t - vm-mutable-frames nil - vm-summary-thread-indent-level 1 + ;; vm-summary-format " %*%A %-3.3m %2d %5US %I%UA %s\n" ;; vm-summary-uninteresting-senders-arrow "->" ;; vm-summary-uninteresting-senders-arrow "►" - vm-summary-uninteresting-senders-arrow ">" ;; vm-summary-uninteresting-senders-arrow "➔" ;; vm-summary-uninteresting-senders-arrow "➤" - vm-summary-arrow "> " - vm-included-text-prefix " > " + bbdb-send-mail-style 'vm + bbdb/mail-auto-create-p nil + mail-signature t + mail-specify-envelope-from t + vm-auto-folder-case-fold-search t + vm-auto-get-new-mail t + vm-circular-folders nil + vm-confirm-new-folders t + vm-delete-after-archiving t + vm-delete-after-saving t vm-forwarding-digest-type "mime" - vm-mime-attachment-save-directory "~/misc/attachments" - vm-use-toolbar nil + vm-forwarding-subject-format "(forwarded from %F) %s" vm-frame-per-folder nil vm-frame-per-summary nil - vm-mime-yank-attachments nil - - ;; vm-mime-7bit-composition-charset "latin-1" - vm-mime-8bit-composition-charset "iso-8859-1" - ;; vm-mime-8bit-composition-charset "utf-8" - ;; browse-url-mozilla-program "iceweasel" - vm-netscape-program browse-url-mozilla-program - ;; vm-coding-system-priorities '(utf-8) - ;; mail-from-style nil - ;; mail-complete-style nil - - ;; vm-summary-format " %*%A %-3.3m %2d %5US %I%UA %s\n" - vm-summary-format " %*%a %-3.3m %2d %5US %I%UA %s\n" - ;; vm-highlighted-header-regexp "From:\\|Subject:\\|Cc:\\|To:\\|Bcc:\\|Reply-To:" vm-highlighted-header-regexp "From:\\|Subject:\\|Reply-To:" - - vm-auto-folder-case-fold-search t - - vm-keep-sent-messages nil - vm-delete-after-saving t - vm-delete-after-archiving t - - vm-forwarding-subject-format "(forwarded from %F) %s" vm-in-reply-to-format nil vm-included-text-attribution-format "\nOn %w, %m %d, %y (%h), %F wrote:\n\n" - ;; vm-included-text-attribution-format "\nOn %w, %m %d, at %H, you wrote:\n\n" + vm-included-text-prefix " > " + vm-keep-sent-messages nil + vm-mime-8bit-composition-charset "iso-8859-1" + vm-mime-attachment-save-directory "~/misc/attachments" + vm-mime-yank-attachments nil + vm-mutable-frames nil + vm-mutable-windows t + vm-netscape-program browse-url-mozilla-program + vm-preview-lines nil vm-reply-subject-prefix "Re: " - - mail-signature t - mail-specify-envelope-from t - - bbdb/mail-auto-create-p nil - bbdb-send-mail-style 'vm - + vm-skip-deleted-messages nil + vm-skip-read-messages nil + vm-startup-message-displayed t + vm-startup-with-summary t + vm-summary-arrow "> " + vm-summary-format " %*%a %-3.3m %2d %5US %I%UA %s\n" + vm-summary-thread-indent-level 1 + vm-summary-uninteresting-senders-arrow ">" + vm-use-menus nil + vm-use-toolbar nil + vm-use-toolbar nil ) ;; (add-to-list 'vm-visible-headers "From " t) @@ -108,10 +101,6 @@ (setq - ;; vm-auto-displayed-mime-content-types '("text/plain" "text" "image" "multipart") - ;; vm-display-using-mime t - ;; vm-coding-system-priorities '(iso-8859-1 iso-8859-15 utf-8) - vm-infer-mime-types t vm-mime-use-image-strips nil vm-mime-base64-decoder-program "base64" @@ -119,15 +108,6 @@ vm-mime-base64-encoder-program "base64" vm-mime-base64-encoder-switches '() - ;; vm-auto-displayed-mime-content-types '( - ;; ;; "plain text" - ;; "text" - ;; "multipart" - ;; "image/xpm" - ;; ) - - ;; vm-auto-displayed-mime-content-type-exceptions '("text/html") - vm-mime-internal-content-types '( "multipart" "text" @@ -143,20 +123,30 @@ ("application/x-dvi" "xdvi") ("image/postscript" "gv") ("application/pdf" "xpdf") - ;; ("application/pdf" "epdfview") ("application/postscript" "gv") - ;;("image" "feh") + ("image" "pho") ("video" "mplayer") - ;; ("text/html" "iceweasel") + ;; ("text/html" "firefox") + ;; ("application/pdf" "epdfview") ) ) (require 'vm-rfaddons) +;; The two following lines deal with windows-1252 buggy encoding + +;;**;; ;; First, don't display iso-8859-1 as-is in default face +;;**;; (delete "iso-8859-1" vm-mime-default-face-charsets) +;;**;; ;; Then substitute windows-1252 for iso-8859-1 +;;**;; (add-to-list 'vm-mime-mule-charset-to-coding-alist '("iso-8859-1" windows-1252)) + +;; (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) @@ -542,6 +532,7 @@ an attachment") (add-hook 'vm-mail-send-hook 'flyspell-mode-off) ;; Append so that it happens after the mime encoding ;; (add-hook 'vm-mail-send-hook 'ff/check-badly-encoded-address t) + ;; Append this hook so that it runs after all other checks (add-hook 'vm-mail-send-hook 'ff/dissociate-file-from-vm-mail-buffer t) @@ -552,10 +543,11 @@ an attachment") (add-hook 'vm-summary-mode-hook 'mc-install-read-mode) (add-hook 'vm-virtual-mode-hook 'mc-install-read-mode) (add-hook 'vm-mail-mode-hook 'mc-install-write-mode) +(add-hook 'vm-presentation-mode-hook 'mc-install-read-mode) ;; (defun ff/encrypt-mail-if-possible () (interactive) -;; (condition-case nil (mc-encrypt) -;; (error nil))) + ;; (condition-case nil (mc-encrypt-message) + ;; (error nil))) ;; (add-hook 'vm-mail-send-hook 'ff/encrypt-mail-if-possible t) @@ -568,7 +560,8 @@ an attachment") (defun ff/goto-next-mail-field () (interactive) (let ((field (save-excursion (end-of-line) - (re-search-backward (concat "\\(^[a-zA-Z\-]*: \\|^" mail-header-separator "$\\)") nil t) + (re-search-backward + (concat "\\(^[a-zA-Z\-]*: \\|^" mail-header-separator "$\\)") nil t) (match-string 1)))) (cond ((string= field "To: ") @@ -603,6 +596,7 @@ an attachment") t) (substitute-key-definition 'next-line 'mail-abbrev-next-line vm-mail-mode-map global-map) + (substitute-key-definition 'end-of-buffer 'mail-abbrev-end-of-buffer vm-mail-mode-map global-map) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -637,9 +631,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 @@ -650,7 +641,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))))