[Emacs-diffs] /srv/bzr/emacs/trunk r101367: imap.el (imap-mailbox-get): Revert last change for this function.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101367
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-09-06 00:10:55 +0000
message:
  imap.el (imap-mailbox-get): Revert last change for this function.
modified:
  lisp/ChangeLog
  lisp/net/imap.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-06 00:06:55 +0000
+++ b/lisp/ChangeLog    2010-09-06 00:10:55 +0000
@@ -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  <address@hidden>
 

=== modified file 'lisp/net/imap.el'
--- a/lisp/net/imap.el  2010-09-06 00:06:55 +0000
+++ b/lisp/net/imap.el  2010-09-06 00:10:55 +0000
@@ -1315,9 +1315,10 @@
   (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)