Stop using bbdb, use eweouz instead; luxevop is no more, use qurzaw

git-svn-id: file:///svn/tfheen/trunk/dotfiles@1291 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/emacs b/emacs
index ddccdec4d485fba1116542fab9908311a56684ce..dd194e5758bb6b59b5b0becb7bd454e4a0f6aca6 100644 (file)
--- a/emacs
+++ b/emacs
@@ -41,21 +41,26 @@
 (add-to-list 'load-path (expand-file-name "~/data/emacs/lisp"))
 (add-to-list 'load-path (expand-file-name "~/svn/elisp"))
 
-(cw/requiring-package (bbdb)
-  (cw/not-for-host ".*ntnu.no"
-                   (bbdb-initialize 'gnus 'message 'w3))
-  (setq bbdb-use-pop-up nil
-        bbdb-quiet-about-name-mismatches t
-        bbdb-default-area-code nil
-        bbdb-north-american-phone-numbers-p nil
-        bbdb-user-mail-names "\(tollef|tfheen\)"
-        bbdb-offer-save 1
-        bbdb-use-pop-up nil
-        mail-setup-hook 'bbdb-insinuate-sendmail
-       bbdb-dwim-net-address-allow-redundancy t
-       bbdb-complete-name-allow-cycling t)
-  (add-hook 'gnus-startup-hook 'bbdb-insinuate-gnus)
-  (add-hook mail-setup-hook 'bbdb-define-all-aliases))
+(cw/requiring-package (eweouz)
+  (add-hook 'gnus-startup-hook 'eweouz-insinuate-gnus)
+  (add-hook 'mail-setup-hook 'eweouz-insinuate-sendmail)
+  (add-hook 'message-setup-hook 'eweouz-insinuate-message))
+
+;;;(cw/requiring-package (bbdb)
+;;;   (cw/not-for-host ".*ntnu.no"
+;;;                    (bbdb-initialize 'gnus 'message 'w3))
+;;;   (setq bbdb-use-pop-up nil
+;;;         bbdb-quiet-about-name-mismatches t
+;;;         bbdb-default-area-code nil
+;;;         bbdb-north-american-phone-numbers-p nil
+;;;         bbdb-user-mail-names "\(tollef|tfheen\)"
+;;;         bbdb-offer-save 1
+;;;         bbdb-use-pop-up nil
+;;;         mail-setup-hook 'bbdb-insinuate-sendmail
+;;;    bbdb-dwim-net-address-allow-redundancy t
+;;;    bbdb-complete-name-allow-cycling t)
+;;;   (add-hook 'gnus-startup-hook 'bbdb-insinuate-gnus)
+;;;   (add-hook mail-setup-hook 'bbdb-define-all-aliases))
 
 (setq default-major-mode 'text-mode
       mail-user-agent 'gnus-user-agent
@@ -350,7 +355,7 @@
             (lambda (frame) (setq org-tags-column (* -1 (- (frame-width) 10))
                                   org-agenda-align-tags-to-column (- (frame-width) 10))))
 
-(cw/for-host "luxevop\\|thosu"
+(cw/for-host "qurzaw\\|thosu"
   (setq gnus-home-directory "~/.emacs.d/gnus"
        gnus-init-file "~/.gnus"
        message-directory (concat gnus-home-directory "/Mail")))
@@ -358,8 +363,6 @@
 
 (cw/for-emacs-23-and-later
  (setq tfheen-base-size 8)
- (cw/for-host "luxevop"
-   (setq tfheen-base-size 12))
 
  (setq tfheen-base-font "Bitstream Vera Sans Mono"
        tfheen-current-size tfheen-base-size)

diff --git a/gnus b/gnus
index ac7a250ac0a092f77057b0ad5caac9df4231ea37..349b70309558fed6c66fa3b239d2ecbb0503cb26 100644 (file)
--- a/gnus
+++ b/gnus
@@ -61,7 +61,7 @@
   (add-to-list 'gnus-secondary-select-methods '(nntp "news.hardware.no"))
   )
 
-(cw/for-host "luxevop"
+(cw/for-host "qurzaw"
   (setq gnus-select-method '(nnimap "linpro"
                                    (nnimap-address "imap.linpro.no")
                                    (nnimap-server-port 993)
@@ -101,8 +101,8 @@
 (add-hook 'nntp-server-opened-hook 'nntp-send-authinfo)
 (add-hook 'nntp-server-opened-hook 'nntp-send-mode-reader)
 
-(setq mail-open-quote "\81«")
-(setq mail-close-quote "\81»")
+(setq mail-open-quote "«"
+      mail-close-quote "»")
 
 (defun mail-insert-quote (arg)
   "Insert the appropriate quote marks for Norwegian mail.
@@ -322,7 +322,6 @@ inserts \" characters."
   (goto-char (point-min))
   (replace-regexp gnus-button-url-regexp "<URL:\\&>")))
 
-(add-hook 'message-mode-hook '(lambda()(local-set-key "\M-c" 'bbdb-complete-name)))
 (add-hook 'message-mode-hook '(lambda()(local-set-key "\M-\S-F" 'tfheen-insert-footnote)))
 (add-hook 'message-mode-hook '(lambda()(local-set-key "\"" 'mail-insert-quote)))
 
@@ -391,10 +390,10 @@ inserts \" characters."
   '(
     ; Default-verdier
     (".*" 
-     (address (if (string-match "luxevop" system-name) "tfheen@linpro.no" "tfheen@err.no"))
+     (address (if (string-match "qurzaw" system-name) "tfheen@linpro.no" "tfheen@err.no"))
 
 ;     (Organization "Private")
-     (Bcc (if (string-match "luxevop" system-name)
+     (Bcc (if (string-match "qurzaw" system-name)
         (concat "tfheen+outgoing" (char-to-string 64)  "linpro.no")
         (concat "tfheen+outgoing" (char-to-string 64)  "err.no")))
 
@@ -657,7 +656,7 @@ on multiple mail-followup-to headers"
 (setq mm-text-html-renderer 'lynx)
 
 (setq tfheen-spam-folder (format-time-string "spam.%Y-%m"))
-(cw/for-host "luxevop"
+(cw/for-host "qurzaw"
   (setq tfheen-spam-folder (lambda () (if (string-match "nnimap\\+mail\\.err\\.no" gnus-newsgroup-name)
                                          (format-time-string "nnimap+mail.err.no:spam.%Y-%m")
                                        (format-time-string "INBOX/spam.%Y")))))
@@ -688,7 +687,7 @@ on multiple mail-followup-to headers"
     (kill-new (tfheen-fetch-cacheid))
     (widen))
 
-(cw/for-host "yiwaz\\|thosu\\|golem\\|xoog\\|luxevop\\|vuizook"
+(cw/for-host "yiwaz\\|thosu\\|golem\\|xoog\\|qurzaw\\|vuizook"
   (define-key gnus-summary-backend-map "s" 'tfheen-mark-as-spam)
   (define-key gnus-summary-mode-map "z" 'tfheen-mark-as-spam)
   (define-key gnus-summary-mode-map "v" 'tfheen-kill-ring-cacheid)
@@ -813,6 +812,6 @@ Argument REVERSE means reverse order."
       message-sendmail-envelope-from 'header)
 (setq gnus-permanently-visible-groups "^in.2008.*")
 
-(setq bbdb/send-auto-create-p 'prompt)
-(setq bbdb/send-prompt-for-create-p t)
+;;; (setq bbdb/send-auto-create-p 'prompt)
+;;; (setq bbdb/send-prompt-for-create-p t)
 (setq imap-store-password t)