Merge branch 'master' of git+ssh://git.err.no/srv/git.err.no/www/eweouz

diff --combined README
index 5fc2968aebf6a1068f8b4fd2bb03ab5203ba111b,20151b28d288de3c9e473531a44a6bece239a845..6005b57ad7519c4400b09a7a6414b76caa49ed25
--- 1/README
--- 2/README
+++ b/README
@@@ -12,12 -12,6 +12,12 @@@ To use this, put something like
  
  in your .emacs file.
  
 +If you use Wanderlust, use 
 +
 +  (add-hook 'gnus-startup-hook 'eweouz-insinuate-wl)
 +
 +instead.
 +
  - C-tab gets mapped to completing email addresses in sendmail-mode and
    message mode
  
@@@ -25,6 -19,8 +25,8 @@@
    address book
  
  Feature suggestions, patches and general feedback is of course
- welcome.
+ welcome.  Patches in the form of a git branch against any of the ones
+ found on git://git.err.no/eweouz is preferred, but others are of
+ course also accepted.
  
   -- Tollef Fog Heen <tfheen@err.no>

diff --combined lisp/eweouz.el
index 8ae3f8746d801b65177fb8ca81b33e840d5aec49,a8901c61d82b92e30f3adcbc048e27dea5d5eaa2..91e24cd363e0a27f442bb7e8626981403e4580c1
--- 1/lisp/eweouz.el
--- 2/lisp/eweouz.el
+++ b/lisp/eweouz.el
@@@ -143,47 -143,32 +143,44 @@@
  (defun eweouz-add-sender ()
    "Add sender of current message"
    (interactive)
- 
    (save-excursion
      (set-buffer gnus-article-buffer)
-     (let* ((from (mail-header-parse-address (gnus-fetch-field "From")))
-          (record (list (cons 'email (car from))
-                        (cons 'name (cdr from)))))
-       (eweouz-do-add record))))
+     (eweouz-do-add (mail-header-parse-address (gnus-fetch-field "From")))))
  
  (defun eweouz-do-add (record)
    (interactive)
-   (let* ((name (cdr (assoc 'name record)))
-        (email (cdr (assoc 'email record))))
+   (let* ((email (car record))
+        (name (cdr record)))
+     (message (format "%s" record))
      (call-process eweouz-write-path nil nil nil "--id" "new" "--full-name" name
                  "--emails" email)))
  
 -;;;###autoload
  (defun eweouz-insinuate-gnus ()
    "Call this function to hook EWEOUZ into Gnus."
    (define-key gnus-summary-mode-map ":" 'eweouz-add-sender))
  
 -;;;###autoload
  (defun eweouz-insinuate-sendmail ()
    "Call this function to hook EWEOUZ into sendmail (M-x mail)."
    (define-key mail-mode-map [C-tab] 'eweouz-complete))
  
 -;;;###autoload
  (defun eweouz-insinuate-message ()
    "Call this function to hook EWEOUZ into message-mode."
    (define-key message-mode-map [C-tab] 'eweouz-complete))
  
 +(defun eweouz-insinuate-wl ()
 +  (define-key wl-draft-mode-map [C-tab] 'eweouz-complete)
 +  (define-key wl-summary-mode-map ":" 'eweouz-add-sender-wl))
 +
 +(defun eweouz-add-sender-wl ()
 +  "Add sender of current message"
 +  (interactive)
 +  (save-excursion
 +    (set-buffer wl-message-buffer)
 +    (let* ((from (std11-extract-address-components (std11-field-body "From")))
 +         (record (list (cons 'email (cadr from))
 +                       (cons 'name (car from)))))
 +      (eweouz-do-add record))))
 +
  (require 'vcard)
  (provide 'eweouz)
 +