[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/organizing-package.el 975e98b 2/5: Move several `d
From: |
Artur Malabarba |
Subject: |
[Emacs-diffs] scratch/organizing-package.el 975e98b 2/5: Move several `declare-function's to where they're used. |
Date: |
Sun, 29 Mar 2015 10:33:25 +0000 |
branch: scratch/organizing-package.el
commit 975e98b6b2ed8d2047732b4a655313d11ad45825
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
Move several `declare-function's to where they're used.
---
lisp/emacs-lisp/package.el | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index fffa181..6beb5f2 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -204,12 +204,6 @@ If VERSION is nil, the package is not loaded (it is
\"disabled\")."
:group 'package
:version "24.1")
-(defvar Info-directory-list)
-(declare-function info-initialize "info" ())
-(declare-function url-http-file-exists-p "url-http" (url))
-(declare-function lm-header "lisp-mnt" (header))
-(declare-function lm-commentary "lisp-mnt" (&optional file))
-
(defcustom package-archives '(("gnu" . "http://elpa.gnu.org/packages/"))
"An alist of archives from which to fetch.
The default value points to the GNU Emacs package repository.
@@ -534,6 +528,9 @@ Return the max version (as a string) if the package is held
at a lower version."
force))
(t (error "Invalid element in `package-load-list'")))))
+(defvar Info-directory-list)
+(declare-function info-initialize "info" ())
+
(defun package-activate-1 (pkg-desc &optional reload)
"Activate package given by PKG-DESC, even if it was already active.
If RELOAD is non-nil, also `load' any files inside the package which
@@ -876,6 +873,8 @@ buffer is killed afterwards. Return the last value in
BODY."
(insert-file-contents (expand-file-name ,file ,location)))
,@body))
+(declare-function url-http-file-exists-p "url-http" (url))
+
(defun package--archive-file-exists-p (location file)
(let ((http (string-match "\\`https?:" location)))
(if http
@@ -1295,6 +1294,8 @@ is wrapped around any parts requiring it."
(t dep)))
deps))))
+(declare-function lm-header "lisp-mnt" (header))
+
(defun package-buffer-info ()
"Return a `package-desc' describing the package in the current buffer.
@@ -1769,6 +1770,8 @@ the table."
(with-current-buffer standard-output
(describe-package-1 package)))))
+(declare-function lm-commentary "lisp-mnt" (&optional file))
+
(defun describe-package-1 (pkg)
(require 'lisp-mnt)
(let* ((desc (or