(imap-send-command): Simplify.

(imap-wait-for-tag): point-max - buffer-size.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23e238b88b83153790a75dfd064327319adedcc9..75c697ca72ddac5308ff91cd88f72f7fba57f39d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * net/imap.el (imap-send-command): Simplify.
+       (imap-wait-for-tag): point-max - buffer-size.
+
        * net/ange-ftp.el (internal-ange-ftp-mode): Use define-derived-mode.
 
        * emacs-lisp/easy-mmode.el (define-minor-mode): Don't use symbol-value

diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index 88e897fa32ec199364def6ad95739b762e7730e2..fb5dc2ac60c27835eae1bafbfbb0079c66f775cc 100644 (file)
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -2004,10 +2004,11 @@ on failure."
               (imap-send-command-1 cmdstr)
               (setq cmdstr nil)
               (unwind-protect
-                  (if (not (eq (imap-wait-for-tag tag) 'INCOMPLETE))
-                      (setq command nil) ;; abort command if no cont-req
-                    (setq command (cons (funcall cmd imap-continuation)
-                                        command)))
+                  (setq command
+                        (if (not (eq (imap-wait-for-tag tag) 'INCOMPLETE))
+                            nil ;; abort command if no cont-req
+                          (cons (funcall cmd imap-continuation)
+                                command)))
                 (setq imap-continuation nil)))
              (t
               (error "Unknown command type"))))
@@ -2021,7 +2022,7 @@ on failure."
       (while (and (null imap-continuation)
                  (memq (process-status imap-process) '(open run))
                  (< imap-reached-tag tag))
-       (let ((len (/ (point-max) 1024))
+       (let ((len (/ (buffer-size) 1024))
              message-log-max)
          (unless (< len 10)
            (setq imap-have-messaged t)