From 0600e35543a1f991515a6c42a6bf1cdb4e8eaf4e Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Mon, 6 May 2013 18:16:28 +0200 Subject: [PATCH] Cosmetics. --- emacs.el | 34 ++++++++-------- vm | 118 +++++++++++++++++++++++++------------------------------ 2 files changed, 69 insertions(+), 83 deletions(-) diff --git a/emacs.el b/emacs.el index 03b2bb9..aa22459 100644 --- a/emacs.el +++ b/emacs.el @@ -2267,30 +2267,26 @@ next one. With universal argument, kill all killable buffers." (load "recentf") -(setq recentf-exclude - (append recentf-exclude - '("enotes$" "secure-notes$" "media-playlists$" - "bbdb$" - "svn-commit.tmp$" ".git/COMMIT_EDITMSG$" - "\.bbl$" "\.aux$" "\.toc$")) +;; If we just check for file-symlink-p, everytime we start emacs it +;; will check all the remote files listed in recentf-list, so we check +;; that they are not remote first +(defun ff/file-not-remote-but-symlink (filename) + (and (not (file-remote-p filename)) (file-symlink-p filename))) + +(setq recentf-exclude (append recentf-exclude + '( + ff/file-not-remote-but-symlink + "enotes$" "secure-notes$" "media-playlists$" + "bbdb$" + "svn-commit.tmp$" ".git/COMMIT_EDITMSG$" + "\.bbl$" "\.aux$" "\.toc$" + )) recentf-max-saved-items 1000 recentf-save-file "~/private/emacs/recentf" ) (when (boundp 'recentf-keep) (add-to-list 'recentf-keep 'file-remote-p)) -;; Removes the link if we add the file itself (I am fed up with -;; duplicates because of vc-follow-symlinks) - -(defadvice recentf-add-file (before ff/remove-links (filename) activate) - ;; If we are adding a filename corresponding to the last link we - ;; have added, remove the latter - (when (and recentf-list - (file-symlink-p (car recentf-list)) - (string= filename (file-chase-links filename))) - (setq recentf-list (cdr recentf-list)) - )) - (recentf-mode 1) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -2477,6 +2473,8 @@ with a time tag, and save this file" (setq ff/map (make-sparse-keymap)) (define-key global-map [(control \`)] ff/map) +;;(define-key global-map [(control @)] ff/map) + (define-key esc-map "`" ff/map) (defun ff/git-status (&optional dir) (interactive) diff --git a/vm b/vm index fac1ae7..8e25489 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,18 +123,26 @@ ("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) -(setq vm-mime-default-face-charsets t) +;; 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") -- 2.20.1