summaryrefslogtreecommitdiff
path: root/lisp/net/mairix.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-12-29 19:28:52 -0800
committerGlenn Morris <rgm@gnu.org>2012-12-29 19:28:52 -0800
commit8db39aebe862bf2384a13b69e309115d92524853 (patch)
tree2368be983c28bcb806a535ab227a37f8e82d28fb /lisp/net/mairix.el
parent2550c6e4048a35f6f40f76c5da2666209a10dce0 (diff)
downloademacs-8db39aebe862bf2384a13b69e309115d92524853.tar.gz
emacs-8db39aebe862bf2384a13b69e309115d92524853.tar.bz2
emacs-8db39aebe862bf2384a13b69e309115d92524853.zip
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.
Diffstat (limited to 'lisp/net/mairix.el')
-rw-r--r--lisp/net/mairix.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el
index f85983e6e9f..50cc2ed3dc3 100644
--- a/lisp/net/mairix.el
+++ b/lisp/net/mairix.el
@@ -222,14 +222,12 @@ Currently there are 'threads and 'flags.")
;;; 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 @@ Currently there are 'threads and 'flags.")
(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."