[Emacs-diffs] emacs/lisp ChangeLog mail/rmail.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/05 06:40:08

Modified files:
        lisp           : ChangeLog 
        lisp/mail      : rmail.el 

Log message:
        (rmail-what-message): Unbreak it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15256&r2=1.15257
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmail.el?cvsroot=emacs&r1=1.492&r2=1.493

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15256
retrieving revision 1.15257
diff -u -b -r1.15256 -r1.15257
--- ChangeLog   5 Feb 2009 02:34:35 -0000       1.15256
+++ ChangeLog   5 Feb 2009 06:40:01 -0000       1.15257
@@ -1,3 +1,11 @@
+2009-02-05  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/imap.el (imap-fetch-safe): Bind debug-on-error.

Index: mail/rmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -b -r1.492 -r1.493
--- mail/rmail.el       4 Feb 2009 03:38:26 -0000       1.492
+++ mail/rmail.el       5 Feb 2009 06:40:06 -0000       1.493
@@ -2894,10 +2894,13 @@
 
 (defun rmail-what-message ()
   "For debugging Rmail: find the message number that point is in."
-  (let ((where (point))
+  (let* ((high rmail-total-messages)
+         (mid (/ high 2))
        (low 1)
-       (high rmail-total-messages)
-       (mid (/ rmail-total-messages 2)))
+         (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)