Synch up with main trunk.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 924b06a..b4461c6 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,9 @@
 2005-02-19  Yuuichi Teranishi  <teranisi@gohome.org>
 
+       * 2.12.1 is released.
+
+       * modb-standard.el (elmo-msgdb-unset-flag): Bind inhibit-quit.
+
        * elmo-maildir.el (elmo-folder-append-messages): Fix the problem
        that only the first flag is used.
 
@@ -71,6 +75,8 @@
        (elmo-maildir-delete-mark): Ditto.
        (These changes are based on Hiroya Murata's patch [wl: 13437])
 
+       * elmo-version.el (elmo-version): Up to 2.12.1.
+
 2005-02-06  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-nntp.el (elmo-nntp-server-command-index): Add entry `xhdr'.

diff --git a/elmo/elmo-cache.el b/elmo/elmo-cache.el
index 7a81949..278633c 100644 (file)
--- a/elmo/elmo-cache.el
+++ b/elmo/elmo-cache.el
@@ -140,7 +140,7 @@
 
 (luna-define-method elmo-message-fetch
   ((folder elmo-cache-folder) number strategy &optional unseen section)
-  ;; disbable cache process
+  ;; disable cache process
   (erase-buffer)
   (when (elmo-message-fetch-internal folder number strategy section unseen)
     (when (and (not unseen)

diff --git a/elmo/modb-standard.el b/elmo/modb-standard.el
index 30fc9a2..73d883f 100644 (file)
--- a/elmo/modb-standard.el
+++ b/elmo/modb-standard.el
@@ -350,6 +350,7 @@ When non-nil, redundunt message-id string are not saved."
                          (modb-standard-flag-map msgdb)))
     (t
      (let ((cur-flags (modb-standard-message-flags msgdb number))
+          (inhibit-quit t)
           new-flags diff)
        (when (memq flag cur-flags)
         (setq new-flags (delq flag (copy-sequence cur-flags)))