* bbdb-wl.el (bbdb-wl-get-addresses-1): New function.

[elisp/wanderlust.git] / wl / wl-mule.el

diff --git a/wl/wl-mule.el b/wl/wl-mule.el
index 7b14bd1..8a2b8da 100644 (file)
--- a/wl/wl-mule.el
+++ b/wl/wl-mule.el
@@ -1,5 +1,4 @@
-;;; wl-mule.el -- Wanderlust modules for Mule compatible Emacsen.
-;;                (Mule2.3@19.28, Mule2.3@19.34, Emacs 20.x)
+;;; wl-mule.el --- Wanderlust modules for Mule compatible Emacsen.
 
 ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
 
@@ -25,7 +24,7 @@
 ;;
 
 ;;; Commentary:
-;;
+;; For Mule2.3@19.34, Emacs 20.x
 
 ;;; Code:
 ;;
@@ -99,17 +98,17 @@ Special commands:
 (defun wl-plugged-set-folder-icon (folder string)
   string)
 
-(defun wl-message-overload-functions ()
-  (local-set-key "l" 'wl-message-toggle-disp-summary)
-  (local-set-key [mouse-2] 'wl-message-refer-article-or-url)
-  (local-set-key [mouse-4] 'wl-message-wheel-down)
-  (local-set-key [mouse-5] 'wl-message-wheel-up)
-  (local-set-key [S-mouse-4] 'wl-message-wheel-down)
-  (local-set-key [S-mouse-5] 'wl-message-wheel-up)
-  (if (fboundp 'set-keymap-parent)
-      (set-keymap-parent wl-message-button-map (current-local-map)))
-  (define-key wl-message-button-map [mouse-2]
-    'wl-message-button-dispatcher))
+(defun wl-message-define-keymap ()
+  (let ((keymap (make-sparse-keymap)))
+    (define-key keymap "l" 'wl-message-toggle-disp-summary)
+    (define-key keymap [mouse-4] 'wl-message-wheel-down)
+    (define-key keymap [mouse-5] 'wl-message-wheel-up)
+    (define-key keymap [S-mouse-4] 'wl-message-wheel-down)
+    (define-key keymap [S-mouse-5] 'wl-message-wheel-up)
+    (set-keymap-parent wl-message-button-map keymap)
+    (define-key wl-message-button-map [mouse-2]
+      'wl-message-button-dispatcher)
+    keymap))
 
 (defun wl-message-wheel-up (event)
   (interactive "e")
@@ -157,9 +156,10 @@ Special commands:
   (define-key wl-draft-mode-map "\C-c\C-e" 'wl-draft-config-exec)
   (define-key wl-draft-mode-map "\C-c\C-j" 'wl-template-select)
   (define-key wl-draft-mode-map "\C-c\C-p" 'wl-draft-preview-message)
-  (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save)
+;;   (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save)
   (define-key wl-draft-mode-map "\C-c\C-a" 'wl-addrmgr)
-  (define-key wl-draft-mode-map "\C-xk" 'wl-draft-mimic-kill-buffer))
+  (define-key wl-draft-mode-map "\C-xk" 'wl-draft-mimic-kill-buffer)
+  (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region))
 
 (defun wl-draft-overload-menubar ()
   (local-set-key [menu-bar mail send]
@@ -276,8 +276,8 @@ If FRAME is nil, the current FRAME is used."
                            ((eq req 'background)
                             (memq background options))
                            (t
-                            (message (format "\
-Warning: Unknown req `%S' with options `%S'" req options))
+                            (message "\
+Warning: Unknown req `%S' with options `%S'" req options)
                             nil))))
        match)))))