From 8db39aebe862bf2384a13b69e309115d92524853 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 29 Dec 2012 19:28:52 -0800 Subject: [PATCH] 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. --- lisp/ChangeLog | 7 +++++++ lisp/net/mairix.el | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5907f5ef7ec..84e0ec4a095 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2012-12-30 Glenn Morris + + * 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 * emacs-lisp/package.el (package-untar-buffer): Improve integrity 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." -- 2.11.4.GIT