imap.el: Remove an optional buffer parameter from many functions.

* imap.el (imap-message-map): Removed optional buffer parameter, since
no callers use it.
(imap-message-get): Ditto.
(imap-message-put): Ditto.
(imap-mailbox-map): Ditto.
(imap-mailbox-put): Ditto.
(imap-mailbox-get): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a8d6bb..9a43cf0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * imap.el (imap-message-map): Removed optional buffer parameter, since
+       no callers use it.
+       (imap-message-get): Ditto.
+       (imap-message-put): Ditto.
+       (imap-mailbox-map): Ditto.
+       (imap-mailbox-put): Ditto.
+       (imap-mailbox-get): Ditto.
+
        * nnimap.el (nnimap-request-list): Servers may return \NoSelect
        case-insensitively.
        (nnimap-debug): Removed.

diff --git a/lisp/imap.el b/lisp/imap.el
index 2580635..5c30a57 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -1303,40 +1303,37 @@ If BUFFER is nil, the current buffer is assumed."
 \f
 ;; Mailbox functions:
 
-(defun imap-mailbox-put (propname value &optional mailbox buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (if imap-mailbox-data
-       (put (intern (or mailbox imap-current-mailbox) imap-mailbox-data)
-            propname value)
-      (error "Imap-mailbox-data is nil, prop %s value %s mailbox %s buffer %s"
-            propname value mailbox (current-buffer)))
-    t))
+(defun imap-mailbox-put (propname value &optional mailbox)
+  (if imap-mailbox-data
+      (put (intern (or mailbox imap-current-mailbox) imap-mailbox-data)
+          propname value)
+    (error "Imap-mailbox-data is nil, prop %s value %s mailbox %s buffer %s"
+          propname value mailbox (current-buffer)))
+  t)
 
 (defsubst imap-mailbox-get-1 (propname &optional mailbox)
   (get (intern-soft (or mailbox imap-current-mailbox) imap-mailbox-data)
        propname))
 
-(defun imap-mailbox-get (propname &optional mailbox buffer)
-  (let ((mailbox (imap-utf7-encode mailbox)))
-    (with-current-buffer (or buffer (current-buffer))
-      (imap-mailbox-get-1 propname (or mailbox imap-current-mailbox)))))
-
-(defun imap-mailbox-map-1 (func &optional mailbox-decoder buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (let (result)
-      (mapatoms
-       (lambda (s)
-        (push (funcall func (if mailbox-decoder
-                                (funcall mailbox-decoder (symbol-name s))
-                              (symbol-name s))) result))
-       imap-mailbox-data)
-      result)))
-
-(defun imap-mailbox-map (func &optional buffer)
+(defun imap-mailbox-get (propname &optional mailbox)
+  (imap-mailbox-get-1 propname (or (imap-utf7-encode mailbox)
+                                  imap-current-mailbox)))
+
+(defun imap-mailbox-map-1 (func &optional mailbox-decoder)
+  (let (result)
+    (mapatoms
+     (lambda (s)
+       (push (funcall func (if mailbox-decoder
+                              (funcall mailbox-decoder (symbol-name s))
+                            (symbol-name s))) result))
+     imap-mailbox-data)
+    result))
+
+(defun imap-mailbox-map (func)
   "Map a function across each mailbox in `imap-mailbox-data', returning a list.
 Function should take a mailbox name (a string) as
 the only argument."
-  (imap-mailbox-map-1 func 'imap-utf7-decode buffer))
+  (imap-mailbox-map-1 func 'imap-utf7-decode))
 
 (defun imap-current-mailbox (&optional buffer)
   (with-current-buffer (or buffer (current-buffer))
@@ -1650,29 +1647,26 @@ is non-nil return these properties."
                    uids)
          (imap-message-get uids receive))))))
 
-(defun imap-message-put (uid propname value &optional buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (if imap-message-data
-       (put (intern (number-to-string uid) imap-message-data)
-            propname value)
-      (error "Imap-message-data is nil, uid %s prop %s value %s buffer %s"
-            uid propname value (current-buffer)))
-    t))
+(defun imap-message-put (uid propname value)
+  (if imap-message-data
+      (put (intern (number-to-string uid) imap-message-data)
+          propname value)
+    (error "Imap-message-data is nil, uid %s prop %s value %s buffer %s"
+          uid propname value (current-buffer)))
+  t)
 
-(defun imap-message-get (uid propname &optional buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (get (intern-soft (number-to-string uid) imap-message-data)
-        propname)))
+(defun imap-message-get (uid propname)
+  (get (intern-soft (number-to-string uid) imap-message-data)
+       propname))
 
-(defun imap-message-map (func propname &optional buffer)
+(defun imap-message-map (func propname)
   "Map a function across each message in `imap-message-data', returning a list."
-  (with-current-buffer (or buffer (current-buffer))
-    (let (result)
-      (mapatoms
-       (lambda (s)
-        (push (funcall func (get s 'UID) (get s propname)) result))
-       imap-message-data)
-      result)))
+  (let (result)
+    (mapatoms
+     (lambda (s)
+       (push (funcall func (get s 'UID) (get s propname)) result))
+     imap-message-data)
+    result))
 
 (defmacro imap-message-envelope-date (uid &optional buffer)
   `(with-current-buffer (or ,buffer (current-buffer))

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index b27f072..f7bae6d 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -589,10 +589,11 @@ If EXAMINE is non-nil the group is selected read-only."
        (let (minuid maxuid)
          (when (> (imap-mailbox-get 'exists) 0)
            (imap-fetch "1:*" "UID" nil 'nouidfetch)
-           (imap-message-map (lambda (uid Uid)
-                               (setq minuid (if minuid (min minuid uid) uid)
-                                     maxuid (if maxuid (max maxuid uid) uid)))
-                             'UID))
+           (imap-message-map
+            (lambda (uid Uid)
+              (setq minuid (if minuid (min minuid uid) uid)
+                    maxuid (if maxuid (max maxuid uid) uid)))
+            'UID))
          (list (imap-mailbox-get 'exists) minuid maxuid))))))
 
 (defun nnimap-possibly-change-group (group &optional server)