(nntp-wait-for-string): Supply a timeout for accept-process-output to ensure progress.
[gnus] / lisp / imap.el
index 88e8ee0..e286a14 100644 (file)
@@ -1303,40 +1303,38 @@ 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)
+    (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 +1648,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))
@@ -2897,104 +2892,6 @@ Return nil if no complete line has arrived."
        (imap-forward)
        (nreverse body)))))
 
-(when imap-debug                       ; (untrace-all)
-  (require 'trace)
-  (buffer-disable-undo (get-buffer-create imap-debug-buffer))
-  (mapc (lambda (f) (trace-function-background f imap-debug-buffer))
-       '(
-         imap-utf7-encode
-         imap-utf7-decode
-         imap-error-text
-         imap-kerberos4s-p
-         imap-kerberos4-open
-         imap-ssl-p
-         imap-ssl-open
-         imap-network-p
-         imap-network-open
-         imap-interactive-login
-         imap-kerberos4a-p
-         imap-kerberos4-auth
-         imap-cram-md5-p
-         imap-cram-md5-auth
-         imap-login-p
-         imap-login-auth
-         imap-anonymous-p
-         imap-anonymous-auth
-         imap-open-1
-         imap-open
-         imap-opened
-         imap-ping-server
-         imap-authenticate
-         imap-close
-         imap-capability
-         imap-namespace
-         imap-send-command-wait
-         imap-mailbox-put
-         imap-mailbox-get
-         imap-mailbox-map-1
-         imap-mailbox-map
-         imap-current-mailbox
-         imap-current-mailbox-p-1
-         imap-current-mailbox-p
-         imap-mailbox-select-1
-         imap-mailbox-select
-         imap-mailbox-examine-1
-         imap-mailbox-examine
-         imap-mailbox-unselect
-         imap-mailbox-expunge
-         imap-mailbox-close
-         imap-mailbox-create-1
-         imap-mailbox-create
-         imap-mailbox-delete
-         imap-mailbox-rename
-         imap-mailbox-lsub
-         imap-mailbox-list
-         imap-mailbox-subscribe
-         imap-mailbox-unsubscribe
-         imap-mailbox-status
-         imap-mailbox-acl-get
-         imap-mailbox-acl-set
-         imap-mailbox-acl-delete
-         imap-current-message
-         imap-list-to-message-set
-         imap-fetch-asynch
-         imap-fetch
-         imap-message-put
-         imap-message-get
-         imap-message-map
-         imap-search
-         imap-message-flag-permanent-p
-         imap-message-flags-set
-         imap-message-flags-del
-         imap-message-flags-add
-         imap-message-copyuid-1
-         imap-message-copyuid
-         imap-message-copy
-         imap-message-appenduid-1
-         imap-message-appenduid
-         imap-message-append
-         imap-body-lines
-         imap-envelope-from
-         imap-send-command-1
-         imap-send-command
-         imap-wait-for-tag
-         imap-sentinel
-         imap-find-next-line
-         imap-arrival-filter
-         imap-parse-greeting
-         imap-parse-response
-         imap-parse-resp-text
-         imap-parse-resp-text-code
-         imap-parse-data-list
-         imap-parse-fetch
-         imap-parse-status
-         imap-parse-acl
-         imap-parse-flag-list
-         imap-parse-envelope
-         imap-parse-body-extension
-         imap-parse-body
-         )))
-
 (provide 'imap)
 
 ;;; imap.el ends here