imap.el (imap-mailbox-get): Revert last change for this function.

2 files changed, 5 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ec7ca6b476..740d40309a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,7 @@
         (imap-mailbox-map): Ditto.
         (imap-mailbox-put): Ditto.
         (imap-mailbox-get): Ditto.
+        (imap-mailbox-get): Revert last change for this function.
 
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index 5c30a5788d8..e286a14a0e4 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -1315,9 +1315,10 @@ If BUFFER is nil, the current buffer is assumed."
   (get (intern-soft (or mailbox imap-current-mailbox) imap-mailbox-data)
        propname))
 
-(defun imap-mailbox-get (propname &optional mailbox)
-  (imap-mailbox-get-1 propname (or (imap-utf7-encode mailbox)
-                                   imap-current-mailbox)))
+(defun imap-mailbox-get (propname &optional mailbox buffer)
+  (with-current-buffer (or buffer (current-buffer))
+    (imap-mailbox-get-1 propname (or (imap-utf7-encode mailbox)
+                                     imap-current-mailbox))))
 
 (defun imap-mailbox-map-1 (func &optional mailbox-decoder)
   (let (result)