Cosmetics.

diff --git a/emacs.el b/emacs.el
index 525a118..03b2bb9 100644 (file)
--- a/emacs.el
+++ b/emacs.el
@@ -130,8 +130,14 @@ load-warning buffer in case of failure."
 
 ;; make emacs use the clipboard so that copy/paste works for other
 ;; x-programs. I have no clue how all that clipboard thing works.
+
 ;; (setq x-select-enable-clipboard t)
 ;; (setq interprogram-paste-function 'x-cut-buffer-or-selection-value)
+;; (setq x-select-enable-primary t)
+;; (setq x-select-enable-clipboard t)
+;; (global-set-key "\C-y" 'clipboard-yank)
+
+
 
 (setq
 

diff --git a/vm b/vm
index f2019a4..fac1ae7 100644 (file)
--- 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)
@@ -637,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
@@ -650,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))))