From a4ea772d7194101f0f333acbbe6fc4785d64beba Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 20 Jun 2000 21:58:28 +0000 Subject: [PATCH] Sync. --- lisp/ChangeLog | 8 ++++++++ lisp/imap.el | 9 +++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a4b72d4..7e55684 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2000-06-20 Simon Josefsson + + * imap.el (imap-mailbox-examine-1): New function. + (imap-message-copyuid-1): + (imap-message-appenduid-1): Use it, instead of + `imap-mailbox-examine' which would utf-7 encode mailbox name + twice. + 2000-06-19 Dave Love * mm-uu.el Don't require message. Require cl when compiling. diff --git a/lisp/imap.el b/lisp/imap.el index a690f34..f8fe6a3 100644 --- a/lisp/imap.el +++ b/lisp/imap.el @@ -941,6 +941,10 @@ If EXAMINE is non-nil, do a read-only select." (imap-utf7-decode (imap-mailbox-select-1 (imap-utf7-encode mailbox) examine)))) +(defun imap-mailbox-examine-1 (mailbox &optional buffer) + (with-current-buffer (or buffer (current-buffer)) + (imap-mailbox-select-1 mailbox 'exmine))) + (defun imap-mailbox-examine (mailbox &optional buffer) "Examine MAILBOX on server in BUFFER." (imap-mailbox-select mailbox 'exmine buffer)) @@ -1279,7 +1283,7 @@ is non-nil return theese properties." (let ((old-mailbox imap-current-mailbox) (state imap-state) (imap-message-data (make-vector 2 0))) - (when (imap-mailbox-examine mailbox) + (when (imap-mailbox-examine-1 mailbox) (prog1 (and (imap-fetch "*" "UID") (list (imap-mailbox-get-1 'uidvalidity mailbox) @@ -1320,7 +1324,7 @@ first element, rest of list contain the saved articles' UIDs." (let ((old-mailbox imap-current-mailbox) (state imap-state) (imap-message-data (make-vector 2 0))) - (when (imap-mailbox-examine mailbox) + (when (imap-mailbox-examine-1 mailbox) (prog1 (and (imap-fetch "*" "UID") (list (imap-mailbox-get-1 'uidvalidity mailbox) @@ -2360,6 +2364,7 @@ Return nil if no complete line has arrived." imap-current-mailbox-p imap-mailbox-select-1 imap-mailbox-select + imap-mailbox-examine-1 imap-mailbox-examine imap-mailbox-unselect imap-mailbox-expunge -- 1.7.10.4