(rmail-what-message): Unbreak it.

2 files changed, 17 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dadc4e735dd..e7b614cfe80 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-05  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmail.el (rmail-what-message): Unbreak it.
+
+        * net/mairix.el (rmail-buffer): Remove unneeded eval-when-compile.
+        (rmail-narrow-to-non-pruned-header): Remove autoload.
+        (mairix-rmail-fetch-field): Handle mbox Rmail.
+
 2009-02-04  Dave Love  <fx@gnu.org>
 
         * net/imap.el (imap-fetch-safe): Bind debug-on-error.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index af0f66f0312..e6be1323806 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2894,14 +2894,17 @@ or forward if N is negative."
 
 (defun rmail-what-message ()
   "For debugging Rmail: find the message number that point is in."
-  (let ((where (point))
-        (low 1)
-        (high rmail-total-messages)
-        (mid (/ rmail-total-messages 2)))
+  (let* ((high rmail-total-messages)
+         (mid (/ high 2))
+         (low 1)
+         (where (with-current-buffer (if (rmail-buffers-swapped-p)
+                                         rmail-view-buffer
+                                       (current-buffer))
+                  (point))))
     (while (> (- high low) 1)
       (if (>= where (rmail-msgbeg mid))
-          (setq low mid)
-        (setq high mid))
+          (setq low mid)
+          (setq high mid))
       (setq mid (+ low (/ (- high low) 2))))
     (if (>= where (rmail-msgbeg high)) high low)))