From 539884b83ef2ddf2ff811bd7858b034e783a663a Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Tue, 13 Nov 2018 14:45:08 +0100 Subject: [PATCH] update epl. Signed-off-by: Andreas Gerler --- elpa/epl-20150517.433/epl-autoloads.el | 15 -------- elpa/epl-20150517.433/epl-pkg.el | 1 - elpa/epl-20180205.2049/epl-autoloads.el | 22 ++++++++++++ elpa/epl-20180205.2049/epl-pkg.el | 2 ++ .../epl.el | 36 +++++++++++++------ 5 files changed, 50 insertions(+), 26 deletions(-) delete mode 100644 elpa/epl-20150517.433/epl-autoloads.el delete mode 100644 elpa/epl-20150517.433/epl-pkg.el create mode 100644 elpa/epl-20180205.2049/epl-autoloads.el create mode 100644 elpa/epl-20180205.2049/epl-pkg.el rename elpa/{epl-20150517.433 => epl-20180205.2049}/epl.el (94%) diff --git a/elpa/epl-20150517.433/epl-autoloads.el b/elpa/epl-20150517.433/epl-autoloads.el deleted file mode 100644 index b6f00858..00000000 --- a/elpa/epl-20150517.433/epl-autoloads.el +++ /dev/null @@ -1,15 +0,0 @@ -;;; epl-autoloads.el --- automatically extracted autoloads -;; -;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) - -;;;### (autoloads nil nil ("epl.el") (21908 14282 24908 0)) - -;;;*** - -;; Local Variables: -;; version-control: never -;; no-byte-compile: t -;; no-update-autoloads: t -;; End: -;;; epl-autoloads.el ends here diff --git a/elpa/epl-20150517.433/epl-pkg.el b/elpa/epl-20150517.433/epl-pkg.el deleted file mode 100644 index f50c3751..00000000 --- a/elpa/epl-20150517.433/epl-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "epl" "20150517.433" "Emacs Package Library" '((cl-lib "0.3")) :url "http://github.com/cask/epl" :keywords '("convenience")) diff --git a/elpa/epl-20180205.2049/epl-autoloads.el b/elpa/epl-20180205.2049/epl-autoloads.el new file mode 100644 index 00000000..c6221c54 --- /dev/null +++ b/elpa/epl-20180205.2049/epl-autoloads.el @@ -0,0 +1,22 @@ +;;; epl-autoloads.el --- automatically extracted autoloads +;; +;;; Code: + +(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path)))) + + +;;;### (autoloads nil "epl" "epl.el" (0 0 0 0)) +;;; Generated autoloads from epl.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "epl" '("epl-"))) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; coding: utf-8 +;; End: +;;; epl-autoloads.el ends here diff --git a/elpa/epl-20180205.2049/epl-pkg.el b/elpa/epl-20180205.2049/epl-pkg.el new file mode 100644 index 00000000..a977868d --- /dev/null +++ b/elpa/epl-20180205.2049/epl-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "epl" "20180205.2049" "Emacs Package Library" '((cl-lib "0.3")) :commit "78ab7a85c08222cd15582a298a364774e3282ce6" :keywords '("convenience") :authors '(("Sebastian Wiesner" . "swiesner@lunaryorn.com")) :maintainer '("Johan Andersson" . "johan.rejeep@gmail.com") :url "http://github.com/cask/epl") diff --git a/elpa/epl-20150517.433/epl.el b/elpa/epl-20180205.2049/epl.el similarity index 94% rename from elpa/epl-20150517.433/epl.el rename to elpa/epl-20180205.2049/epl.el index a06c8dcc..5bbd76a0 100644 --- a/elpa/epl-20150517.433/epl.el +++ b/elpa/epl-20180205.2049/epl.el @@ -6,8 +6,8 @@ ;; Author: Sebastian Wiesner ;; Maintainer: Johan Andersson ;; Sebastian Wiesner -;; Version: 0.9-cvs -;; Package-Version: 20150517.433 +;; Version: 0.10-cvs +;; Package-Version: 20180205.2049 ;; Package-Requires: ((cl-lib "0.3")) ;; Keywords: convenience ;; URL: http://github.com/cask/epl @@ -439,16 +439,17 @@ typically ends with -pkg.el." ;;; Package database access -(defun epl-package-installed-p (package) - "Determine whether a PACKAGE is installed. +(defun epl-package-installed-p (package &optional min-version) + "Determine whether a PACKAGE, of MIN-VERSION or newer, is installed. -PACKAGE is either a package name as symbol, or a package object." +PACKAGE is either a package name as symbol, or a package object. +When a explicit MIN-VERSION is provided it overwrites the version of the PACKAGE object." (let ((name (if (epl-package-p package) (epl-package-name package) package)) - (version (when (epl-package-p package) - (epl-package-version package)))) - (package-installed-p name version))) + (min-version (or min-version (and (epl-package-p package) + (epl-package-version package))))) + (package-installed-p name min-version))) (defun epl--parse-built-in-entry (entry) "Parse an ENTRY from the list of built-in packages. @@ -630,7 +631,21 @@ packages." ;;; Package operations -(defalias 'epl-install-file 'package-install-file) +(defun epl-install-file (file) + "Install a package from FILE, like `package-install-file'." + (interactive (advice-eval-interactive-spec + (cadr (interactive-form #'package-install-file)))) + (apply #'package-install-file (list file)) + (let ((package (epl-package-from-file file))) + (unless (epl-package--package-desc-p package) + (epl--kill-autoload-buffer package)))) + +(defun epl--kill-autoload-buffer (package) + "Kill the buffer associated with autoloads for PACKAGE." + (let* ((auto-name (format "%s-autoloads.el" (epl-package-name package))) + (generated-autoload-file (expand-file-name auto-name (epl-package-directory package))) + (buf (find-buffer-visiting generated-autoload-file))) + (when buf (kill-buffer buf)))) (defun epl-package-install (package &optional force) "Install a PACKAGE. @@ -642,7 +657,8 @@ non-nil, install PACKAGE, even if it is already installed." (package-install (epl-package-description package)) ;; The legacy API installs by name. We have no control over versioning, ;; etc. - (package-install (epl-package-name package))))) + (package-install (epl-package-name package)) + (epl--kill-autoload-buffer package)))) (defun epl-package-delete (package) "Delete a PACKAGE. -- 2.47.3