projects
/
elisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cosmetics in the comments and strings.
[elisp.git]
/
vm
diff --git
a/vm
b/vm
index
f700c99
..
fac1ae7
100644
(file)
--- a/
vm
+++ b/
vm
@@
-14,7
+14,7
@@
;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;
;; ;;
;; Written by and Copyright (C) Francois Fleuret ;;
;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;
;; ;;
;; Written by and Copyright (C) Francois Fleuret ;;
-;; Contact <
francois@fleuret.org
> for comments & bug reports ;;
+;; Contact <
francois@fleuret.org
> for comments & bug reports ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(setq-default vm-summary-show-threads t)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(setq-default vm-summary-show-threads t)
@@
-27,8
+27,8
@@
(setq vm-auto-displayed-mime-content-types '(
"text"
(setq vm-auto-displayed-mime-content-types '(
"text"
- "image/jpeg"
- "image/png"
+
;;
"image/jpeg"
+
;;
"image/png"
"multipart"
"message/rfc822"
))
"multipart"
"message/rfc822"
))
@@
-50,7
+50,8
@@
vm-mutable-frames nil
vm-summary-thread-indent-level 1
;; vm-summary-uninteresting-senders-arrow "->"
vm-mutable-frames nil
vm-summary-thread-indent-level 1
;; 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-uninteresting-senders-arrow "➤"
vm-summary-arrow "> "
;; vm-summary-uninteresting-senders-arrow "➔"
;; vm-summary-uninteresting-senders-arrow "➤"
vm-summary-arrow "> "
@@
-74,7
+75,7
@@
;; 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-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:"
+ vm-highlighted-header-regexp "From:\\|Subject:
\\|Reply-To:
"
vm-auto-folder-case-fold-search t
vm-auto-folder-case-fold-search t
@@
-97,7
+98,7
@@
)
;; (add-to-list 'vm-visible-headers "From " t)
)
;; (add-to-list 'vm-visible-headers "From " t)
-
;;
(add-to-list 'vm-visible-headers "Reply-To:" t)
+(add-to-list 'vm-visible-headers "Reply-To:" t)
;; (add-to-list 'vm-visible-headers "X-Mailer:" t)
;; (add-to-list 'vm-visible-headers "X-from-in-bbdb:" t)
;; (add-to-list 'vm-visible-headers "Return-Path:")
;; (add-to-list 'vm-visible-headers "X-Mailer:" t)
;; (add-to-list 'vm-visible-headers "X-from-in-bbdb:" t)
;; (add-to-list 'vm-visible-headers "Return-Path:")
@@
-136,7
+137,7
@@
)
;; To force it to be converted to plain text
)
;; To force it to be converted to plain text
- vm-mime-internal-content-type-exceptions '("text/html")
+
;;
vm-mime-internal-content-type-exceptions '("text/html")
vm-mime-external-content-types-alist '(
("application/x-dvi" "xdvi")
vm-mime-external-content-types-alist '(
("application/x-dvi" "xdvi")
@@
-153,9
+154,11
@@
(require 'vm-rfaddons)
(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 "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)
;; (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)
@@
-176,10
+179,10
@@
;; "html2text -style pretty -nobs"
;; ))
;; "html2text -style pretty -nobs"
;; ))
-(add-to-list 'vm-mime-type-converter-alist
- '("text/html" "text/plain"
- "html2text.sh"
- ))
+
;;
(add-to-list 'vm-mime-type-converter-alist
+
;;
'("text/html" "text/plain"
+
;;
"html2text.sh"
+
;;
))
(add-to-list 'vm-mime-type-converter-alist
'("image" "image/xpm"
(add-to-list 'vm-mime-type-converter-alist
'("image" "image/xpm"
@@
-275,7
+278,9
@@
attachement from mail."
(defun vm-summary-function-S (&optional message)
(let ((s (string-to-int (vm-su-byte-count message))))
(if (> s 32768)
(defun vm-summary-function-S (&optional message)
(let ((s (string-to-int (vm-su-byte-count message))))
(if (> s 32768)
- (propertize (concat (int-to-string (/ s 1024)) "k") 'face 'bold)
+ (propertize (concat (int-to-string (/ s 1024)) "k")
+ 'face 'italic
+ )
"")))
(defun ff/vm-delete-and-go-down () (interactive)
"")))
(defun ff/vm-delete-and-go-down () (interactive)
@@
-283,7
+288,10
@@
attachement from mail."
(vm-delete-message 1)
(condition-case nil (vm-next-message-no-skip 1) (error nil)))
(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)
(add-hook 'vm-quit-hook 'bbdb-save-db)
(add-hook 'vm-retrieved-spooled-mail-hook 'display-time-update)
@@
-325,7
+333,8
@@
attachement from mail."
;; To have a slightly darker background for headers
(ff/configure-faces
;; To have a slightly darker background for headers
(ff/configure-faces
- '((ff/mail-header-face :background "#c8c8ff"))
+ ;; '((ff/mail-header-face :background "#c8c8ff"))
+ '((ff/mail-header-face :foreground "blue4"))
)
(defun ff/colorize-headers () (interactive)
)
(defun ff/colorize-headers () (interactive)
@@
-541,6
+550,11
@@
an attachment")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; If we can, encrypt!
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; If we can, encrypt!
+(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)
+(add-hook 'vm-mail-mode-hook 'mc-install-write-mode)
+
;; (defun ff/encrypt-mail-if-possible () (interactive)
;; (condition-case nil (mc-encrypt)
;; (error nil)))
;; (defun ff/encrypt-mail-if-possible () (interactive)
;; (condition-case nil (mc-encrypt)
;; (error nil)))
@@
-625,9
+639,6
@@
is t."
(when (load "bbdb-vm" 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
(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
@@
-638,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)))
(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))))
(if (and (> (length alias) 1)
;; Do not overwrite an existing alias
(not (and mail-abbrevs (intern-soft alias mail-abbrevs))))