From: Glenn Morris Date: Tue, 5 May 2015 00:38:16 +0000 (-0400) Subject: Replace instances of "(eval-when-compile (autoload ...))" X-Git-Tag: emacs-25.0.90~2205 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=067968210e5088536b14ac5830eb623a7619f35f;p=emacs.git Replace instances of "(eval-when-compile (autoload ...))" * lisp/gnus/gnus-art.el (nneething-get-file-name): Declare rather than autoload. * lisp/gnus/gnus-async.el (gnus-html-prefetch-images): Remove pointless autoload. * lisp/gnus/gnus-sync.el (gnus-group-topic): Autoload at run-time. (gnus-topic-create-topic, gnus-topic-enter-dribble): Declare rather than autoload. * lisp/gnus/mm-archive.el (gnus-recursive-directory-files) (mailcap-extension-to-mime): Autoload at run-time. * lisp/gnus/mm-util.el (latin-unity-massage-name) (latin-unity-maybe-remap, latin-unity-representations-feasible-region) (latin-unity-representations-present-region): Declare rather than autoload. * lisp/gnus/mml-smime.el (epg-make-context) (epg-passphrase-callback-function): Autoload at run-time. (epg-context-set-signers, epg-context-result-for) (epg-new-signature-digest-algorithm) (epg-verify-result-to-string, epg-list-keys, epg-verify-string) (epg-sign-string, epg-encrypt-string) (epg-context-set-passphrase-callback, epg-sub-key-fingerprint) (epg-configuration, epg-expand-group, epa-select-keys): Declare rather than autoload. * lisp/gnus/nnir.el (nnimap-change-group, nnimap-make-thread-query): Autoload at run-time. (gnus-group-topic-name, nnimap-buffer, nnimap-command) (gnus-registry-get-id-key, gnus-registry-action): Declare rather than autoload. * lisp/gnus/nnmail.el (mail-send-and-exit): Autoload at run-time. * lisp/gnus/spam.el (spam-stat-buffer-change-to-non-spam) (spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam) (spam-stat-buffer-is-spam, spam-stat-load, spam-stat-save) (spam-stat-split-fancy): Remove pointless autoloads. * lisp/net/mairix.el: Load gnus-util when compiling. (gnus-group-read-ephemeral-group, gnus-summary-toggle-header) (message-field-value): Declare rather than autoload. (mairix-gnus-ephemeral-nndoc, mairix-gnus-fetch-field): Check gnus-alive-p is fbound. (vm-quit, vm-visit-folder, vm-select-folder-buffer) (vm-check-for-killed-summary, vm-error-if-folder-empty) (vm-get-header-contents, vm-select-marked-or-prefixed-messages): Declare rather than autoload. --- diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 14f9adca85d..989a4247800 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -7027,8 +7027,7 @@ If given a prefix, show the hidden text instead." (gnus-check-server (gnus-find-method-for-group gnus-newsgroup-name)) (gnus-request-group gnus-newsgroup-name t))) -(eval-when-compile - (autoload 'nneething-get-file-name "nneething")) +(declare-function nneething-get-file-name "nneething" (id)) (defun gnus-request-article-this-buffer (article group) "Get an article and insert it into this buffer." diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el index b1b3af9658e..d4d3dba2417 100644 --- a/lisp/gnus/gnus-async.el +++ b/lisp/gnus/gnus-async.el @@ -226,9 +226,6 @@ that was fetched." `(lambda (arg) (gnus-async-article-callback arg ,group ,article ,mark ,summary ,next))) -(eval-when-compile - (autoload 'gnus-html-prefetch-images "gnus-html")) - (defun gnus-async-article-callback (arg group article mark summary next) "Function called when an async article is done being fetched." (save-excursion diff --git a/lisp/gnus/gnus-sync.el b/lisp/gnus/gnus-sync.el index 3c0025f0df2..c9ccc3ec69d 100644 --- a/lisp/gnus/gnus-sync.el +++ b/lisp/gnus/gnus-sync.el @@ -90,10 +90,7 @@ (require 'gnus-util) (defvar gnus-topic-alist) ;; gnus-group.el -(eval-when-compile - (autoload 'gnus-group-topic "gnus-topic") - (autoload 'gnus-topic-create-topic "gnus-topic" nil t) - (autoload 'gnus-topic-enter-dribble "gnus-topic")) +(autoload 'gnus-group-topic "gnus-topic") (defgroup gnus-sync nil "The Gnus synchronization facility." @@ -605,6 +602,10 @@ unwanted groups via the LeSync URL." loc name gnus-sync-lesync-name (or sources ""))) nil))) +(declare-function gnus-topic-create-topic "gnus-topic" + (topic parent &optional previous full-topic)) +(declare-function gnus-topic-enter-dribble "gnus-topic" ()) + (defun gnus-sync-lesync-install-group-entry (name) (let* ((master (assoc name gnus-newsrc-alist)) (old-topic-name (gnus-group-topic name)) diff --git a/lisp/gnus/mm-archive.el b/lisp/gnus/mm-archive.el index d88e159900b..9c86c4ac4f3 100644 --- a/lisp/gnus/mm-archive.el +++ b/lisp/gnus/mm-archive.el @@ -23,9 +23,8 @@ ;;; Code: (require 'mm-decode) -(eval-when-compile - (autoload 'gnus-recursive-directory-files "gnus-util") - (autoload 'mailcap-extension-to-mime "mailcap")) +(autoload 'gnus-recursive-directory-files "gnus-util") +(autoload 'mailcap-extension-to-mime "mailcap") (defvar mm-archive-decoders '(("application/ms-tnef" t "tnef" "-f" "-" "-C") diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index 0b7590114c4..ab9145f8b1c 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -1058,11 +1058,10 @@ This affects whether coding conversion should be attempted generally." (length (memq (coding-system-base b) priorities))) t)))) -(eval-when-compile - (autoload 'latin-unity-massage-name "latin-unity") - (autoload 'latin-unity-maybe-remap "latin-unity") - (autoload 'latin-unity-representations-feasible-region "latin-unity") - (autoload 'latin-unity-representations-present-region "latin-unity")) +(declare-function latin-unity-massage-name "ext:latin-unity") +(declare-function latin-unity-maybe-remap "ext:latin-unity") +(declare-function latin-unity-representations-feasible-region "ext:latin-unity") +(declare-function latin-unity-representations-present-region "ext:latin-unity") (defvar latin-unity-coding-systems) (defvar latin-unity-ucs-list) diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el index 6f49f126842..3f0809edbe8 100644 --- a/lisp/gnus/mml-smime.el +++ b/lisp/gnus/mml-smime.el @@ -317,24 +317,25 @@ Whether the passphrase is cached at all is controlled by (defvar inhibit-redisplay) (defvar password-cache-expiry) -(eval-when-compile - (autoload 'epg-make-context "epg") - (autoload 'epg-context-set-armor "epg") - (autoload 'epg-context-set-signers "epg") - (autoload 'epg-context-result-for "epg") - (autoload 'epg-new-signature-digest-algorithm "epg") - (autoload 'epg-verify-result-to-string "epg") - (autoload 'epg-list-keys "epg") - (autoload 'epg-decrypt-string "epg") - (autoload 'epg-verify-string "epg") - (autoload 'epg-sign-string "epg") - (autoload 'epg-encrypt-string "epg") - (autoload 'epg-passphrase-callback-function "epg") - (autoload 'epg-context-set-passphrase-callback "epg") - (autoload 'epg-sub-key-fingerprint "epg") - (autoload 'epg-configuration "epg-config") - (autoload 'epg-expand-group "epg-config") - (autoload 'epa-select-keys "epa")) +(autoload 'epg-make-context "epg") +(autoload 'epg-passphrase-callback-function "epg") +(declare-function epg-context-set-signers "epg" (context signers)) +(declare-function epg-context-result-for "epg" (context name)) +(declare-function epg-new-signature-digest-algorithm "epg" (cl-x) t) +(declare-function epg-verify-result-to-string "epg" (verify-result)) +(declare-function epg-list-keys "epg" (context &optional name mode)) +(declare-function epg-verify-string "epg" + (context signature &optional signed-text)) +(declare-function epg-sign-string "epg" (context plain &optional mode)) +(declare-function epg-encrypt-string "epg" + (context plain recipients &optional sign always-trust)) +(declare-function epg-context-set-passphrase-callback "epg" + (context passphrase-callback)) +(declare-function epg-sub-key-fingerprint "epg" (cl-x) t) +(declare-function epg-configuration "epg-config" ()) +(declare-function epg-expand-group "epg-config" (config group)) +(declare-function epa-select-keys "epa" + (context prompt &optional names secret)) (defvar mml-smime-epg-secret-key-id-list nil) diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 08ca7c7e06b..15ccc4725d7 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -281,16 +281,6 @@ is `(valuefunc member)'." (require 'gnus-sum) -(eval-when-compile - (autoload 'nnimap-buffer "nnimap") - (autoload 'nnimap-command "nnimap") - (autoload 'nnimap-change-group "nnimap") - (autoload 'nnimap-make-thread-query "nnimap") - (autoload 'gnus-registry-action "gnus-registry") - (autoload 'gnus-registry-get-id-key "gnus-registry") - (autoload 'gnus-group-topic-name "gnus-topic")) - - (nnoo-declare nnir) (nnoo-define-basics nnir) @@ -586,6 +576,8 @@ Add an entry here when adding a new search engine.") ;; Gnus glue. +(declare-function gnus-group-topic-name "gnus-topic" ()) + (defun gnus-group-make-nnir-group (nnir-extra-parms &optional specs) "Create an nnir group. Prompt for a search query and determine the groups to search as follows: if called from the *Server* @@ -948,6 +940,10 @@ ready to be added to the list of search results." ;;; Search Engine Interfaces: +(autoload 'nnimap-change-group "nnimap") +(declare-function nnimap-buffer "nnimap" ()) +(declare-function nnimap-command "nnimap" (&rest args)) + ;; imap interface (defun nnir-run-imap (query srv &optional groups) "Run a search against an IMAP back-end server. @@ -1774,6 +1770,9 @@ environment unless `not-global' is non-nil." (let ((backend (car (gnus-server-to-method server)))) (nnoo-current-server-p (or backend 'nnir) server))) +(autoload 'nnimap-make-thread-query "nnimap") +(declare-function gnus-registry-get-id-key "gnus-registry" (id key)) + (defun nnir-search-thread (header) "Make an nnir group based on the thread containing the article header. The current server will be searched. If the registry is @@ -1841,6 +1840,10 @@ article came from is also searched." (forward-line))))) groups)) +;; Behind gnus-registry-enabled test. +(declare-function gnus-registry-action "gnus-registry" + (action data-header from &optional to method)) + (defun nnir-registry-action (action data-header from &optional to method) "Call `gnus-registry-action' with the original article group." (gnus-registry-action diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 5c5481095e2..71bc916a927 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -36,8 +36,7 @@ (autoload 'gnus-add-buffer "gnus") (autoload 'gnus-kill-buffer "gnus") -(eval-when-compile - (autoload 'mail-send-and-exit "sendmail" nil t)) +(autoload 'mail-send-and-exit "sendmail" nil t) (defgroup nnmail nil "Reading mail with Gnus." diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el index 500f34139be..02ec69516c1 100644 --- a/lisp/gnus/spam.el +++ b/lisp/gnus/spam.el @@ -2232,15 +2232,6 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)." ;;{{{ spam-stat -(eval-when-compile - (autoload 'spam-stat-buffer-change-to-non-spam "spam-stat") - (autoload 'spam-stat-buffer-change-to-spam "spam-stat") - (autoload 'spam-stat-buffer-is-non-spam "spam-stat") - (autoload 'spam-stat-buffer-is-spam "spam-stat") - (autoload 'spam-stat-load "spam-stat") - (autoload 'spam-stat-save "spam-stat") - (autoload 'spam-stat-split-fancy "spam-stat")) - (require 'spam-stat) (defun spam-check-stat () diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el index c1b107932c3..087ae439f3f 100644 --- a/lisp/net/mairix.el +++ b/lisp/net/mairix.el @@ -265,18 +265,22 @@ Currently there are 'threads and 'flags.") (mail-fetch-field field))))) ;;; Gnus -(eval-when-compile - (defvar gnus-article-buffer) - (autoload 'gnus-summary-toggle-header "gnus-sum") - (autoload 'gnus-buffer-exists-p "gnus-util") - (autoload 'message-field-value "message") - (autoload 'gnus-group-read-ephemeral-group "gnus-group") - (autoload 'gnus-alive-p "gnus-util")) + +;; For gnus-buffer-exists-p, although it seems that could be replaced by: +;; (and buffer (get-buffer buffer)) +(eval-when-compile (require 'gnus-util)) +(defvar gnus-article-buffer) +(declare-function gnus-group-read-ephemeral-group "gnus-group" + (group method &optional activate quit-config + request-only select-articles parameters number)) +(declare-function gnus-summary-toggle-header "gnus-sum" (&optional arg)) +(declare-function message-field-value "message" (header &optional not-all)) ;; Display function: (defun mairix-gnus-ephemeral-nndoc (folder) "Create ephemeral nndoc group for reading mbox file FOLDER in Gnus." - (unless (gnus-alive-p) + (unless (and (fboundp 'gnus-alive-p) + (gnus-alive-p)) (error "Gnus is not running")) (gnus-group-read-ephemeral-group ;; add randomness to group string to prevent Gnus from using a @@ -289,26 +293,29 @@ Currently there are 'threads and 'flags.") ;; Fetching mail header field: (defun mairix-gnus-fetch-field (field) "Get mail header FIELD for current message using Gnus." - (unless (gnus-alive-p) + (unless (and (fboundp 'gnus-alive-p) + (gnus-alive-p)) (error "Gnus is not running")) (unless (gnus-buffer-exists-p gnus-article-buffer) (error "No article buffer available")) (with-current-buffer gnus-article-buffer + ;; gnus-art requires gnus-sum and message. (gnus-summary-toggle-header 1) (message-field-value field))) ;;; VM ;;; written by Ulrich Mueller -(eval-when-compile - (autoload 'vm-quit "vm-folder") - (autoload 'vm-visit-folder "vm") - (autoload 'vm-select-folder-buffer "vm-macro") - (autoload 'vm-check-for-killed-summary "vm-misc") - (autoload 'vm-get-header-contents "vm-summary") - (autoload 'vm-check-for-killed-summary "vm-misc") - (autoload 'vm-error-if-folder-empty "vm-misc") - (autoload 'vm-select-marked-or-prefixed-messages "vm-folder")) +(declare-function vm-quit "ext:vm-folder" (&optional no-change)) +(declare-function vm-visit-folder "ext:vm-startup" + (folder &optional read-only)) +(declare-function vm-select-folder-buffer "ext:vm-macro" ()) ; defsubst +(declare-function vm-check-for-killed-summary "ext:vm-misc" ()) +(declare-function vm-error-if-folder-empty "ext:vm-misc" ()) +(declare-function vm-get-header-contents "ext:vm-summary" + (message header-name-regexp &optional clump-sep)) +(declare-function vm-select-marked-or-prefixed-messages "ext:vm-folder" + (prefix)) ;; Display function (defun mairix-vm-display (folder)