[Emacs-diffs] emacs/lisp/net mairix.el

[Glenn Morris]

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

Modified files:
        lisp/net       : mairix.el 

Log message:
        (rmail-buffer): Remove unneeded eval-when-compile.
        (rmail-narrow-to-non-pruned-header): Remove autoload.
        (mairix-rmail-fetch-field): Handle mbox Rmail.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/mairix.el?cvsroot=emacs&r1=1.4&r2=1.5

Patches:
Index: mairix.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/mairix.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- mairix.el   5 Jan 2009 03:22:45 -0000       1.4
+++ mairix.el   5 Feb 2009 06:36:14 -0000       1.5
@@ -228,8 +228,7 @@
 (autoload 'rmail "rmail")
 (autoload 'rmail-summary-displayed "rmail")
 (autoload 'rmail-summary "rmailsum")
-(eval-when-compile
-  (defvar rmail-buffer))
+(defvar rmail-buffer)
 
 (defun mairix-rmail-display (folder)
   "Display mbox file FOLDER with RMail."
@@ -253,17 +252,20 @@
       (rmail-summary))))
 
 ;; Fetching mail header field:
-(autoload 'rmail-narrow-to-non-pruned-header "rmail")
 (defun mairix-rmail-fetch-field (field)
   "Get mail header FIELD for current message using RMail."
   (unless (and (boundp 'rmail-buffer)
               rmail-buffer)
     (error "No RMail buffer available"))
+  ;; At this point, we are in rmail mode, so the rmail funcs are loaded.
+  (if (fboundp 'rmail-get-header)      ; Emacs 23
+      (rmail-get-header field)
   (save-excursion
     (set-buffer rmail-buffer)
     (save-restriction
-      (rmail-narrow-to-non-pruned-header)
-      (mail-fetch-field field))))
+       ;; Don't warn about this when compiling Emacs 23.
+       (with-no-warnings (rmail-narrow-to-non-pruned-header))
+       (mail-fetch-field field)))))
 
 ;;; Gnus
 (eval-when-compile