[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111096: mairix.el fix for bug#13294

[Glenn Morris]

------------------------------------------------------------
revno: 111096
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-12-29 19:28:52 -0800
message:
  mairix.el fix for bug#13294
  
  * lisp/net/mairix.el (rmail, rmail-summary-displayed, rmail-summary):
  Remove unnecessary/buggy autoloads (missing interactive). 
  (rmail-summary-displayed, rmail-summary): Declare.
  (mairix-rmail-display): Just require rmail.
modified:
  lisp/ChangeLog
  lisp/net/mairix.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-29 11:06:10 +0000
+++ b/lisp/ChangeLog    2012-12-30 03:28:52 +0000
@@ -1,3 +1,10 @@
+2012-12-30  Glenn Morris  <address@hidden>
+
+       * net/mairix.el (rmail, rmail-summary-displayed, rmail-summary):
+       Remove unnecessary/buggy autoloads (missing interactive).  (Bug#13294)
+       (rmail-summary-displayed, rmail-summary): Declare.
+       (mairix-rmail-display): Just require rmail.
+
 2012-12-29  Chong Yidong  <address@hidden>
 
        * emacs-lisp/package.el (package-untar-buffer): Improve integrity

=== modified file 'lisp/net/mairix.el'
--- a/lisp/net/mairix.el        2012-07-11 23:13:41 +0000
+++ b/lisp/net/mairix.el        2012-12-30 03:28:52 +0000
@@ -222,14 +222,12 @@
 
 ;;; RMail
 
-;; Display function:
-(autoload 'rmail "rmail")
-(autoload 'rmail-summary-displayed "rmail")
-(autoload 'rmail-summary "rmailsum")
-(defvar rmail-buffer)
+(declare-function rmail-summary-displayed "rmail" ())
+(declare-function rmail-summary "rmailsum" ()) ; autoloaded in rmail
 
 (defun mairix-rmail-display (folder)
   "Display mbox file FOLDER with RMail."
+  (require 'rmail)
   (let (show-summary)
     ;; If it exists, select existing RMail window
     (when (and (boundp 'rmail-buffer)
@@ -249,6 +247,8 @@
     (when show-summary
       (rmail-summary))))
 
+(defvar rmail-buffer)
+
 ;; Fetching mail header field:
 (defun mairix-rmail-fetch-field (field)
   "Get mail header FIELD for current message using RMail."