ikazuhiro

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index fa77d78f..bdc31d47 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -74,6 +74,7 @@
 (defvar wl-sent-message-queued nil)
 (defvar wl-draft-fcc-list nil)
 (defvar wl-draft-reedit nil)
+(defvar wl-draft-forward-buffer nil)
 (defvar wl-draft-reply-buffer nil)

ikazuhiro

From 442eebedb9800b7140f154235af573bc0ef95249 Mon Sep 17 00:00:00 2001
From: Kazuhiro Ito <[email protected]>
Date: Tue, 27 Jul 2021 19:36:37 +0900
Subject: [PATCH 1/4] Use unsigned integers to calculate hash

Overflow of signed integers is undefined bahavior.
---
 cabin.c | 39 +++++++++++++++++-----------------
 depot.c | 66 ++++++++++++++++++++++++++++-----------------------------
 2 files changed, 52 insertions(+), 53 deletions(-)

ikazuhiro

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index 74279cfb..21f621fc 100644
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -367,15 +367,26 @@ FOLDER is the folder structure."
     (elmo-folder-delete-messages
      folder
      ;; messages are deleted only if message-id is not changed.
-     (mapcar 'car
-	     (elmo-delete-if

ikazuhiro

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 4f2e5cfd..ed9247be 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -103,10 +103,11 @@ with FILENAME which defaults to `buffer-file-name'."
 	  (car (find-operation-coding-system 'insert-file-contents
 					     filename)))
     (let (auto-coding-alist)
-      (condition-case nil
+      (condition-case error

ikazuhiro

diff --git a/eword-decode.el b/eword-decode.el
index 59d72e3..f75b87e 100644
--- a/eword-decode.el
+++ b/eword-decode.el
@@ -739,9 +739,17 @@ be the result.")
       (setq match (and (string-match regexp string next)
 		       (= next (match-beginning 0)))))
     (when words
-      (cons (cons 'atom (eword-decode-encoded-words (nreverse words)
-						    must-unfold))

ikazuhiro

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index d860c8c..78f7b84 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -126,6 +126,11 @@ This list is used in `elmo-imap4-search-generate-vector' to
 differentiate between IMAP4 search keys and searches for message
 header values.")
 
+(defvar elmo-imap4-capability-search-keys-alist
+  '((x-gm-ext-1 "x-gm-raw" "x-gm-msgid" "x-gm-thrid" "x-gm-lables"))