From 1659e1697671946487005d3104fe72313b149d54 Mon Sep 17 00:00:00 2001 From: Steve Youngs Date: Sat, 21 May 2016 21:37:43 +1000 Subject: [PATCH] Fix an autoloads problem. * lisp/package-get.el (package-get-have-curl): Autoload it and set its value via requiring ffi-curl instead of a featurep test. Signed-off-by: Steve Youngs --- lisp/package-get.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/package-get.el b/lisp/package-get.el index f680618..c598773 100644 --- a/lisp/package-get.el +++ b/lisp/package-get.el @@ -203,12 +203,13 @@ as a local directory." (list :tag "Remote" host-name directory url-scheme))) :group 'package-get) -(defvar package-get-have-curl (featurep 'ffi-curl) +;;;###autoload +(defvar package-get-have-curl (ignore-errors (require 'ffi-curl)) "Non-nil when FFI and curl is available.") ;;;###autoload (defcustom package-get-download-sites - `(,@(when package-get-have-curl + `(,@(when package-get-have-curl '(("SXEmacs XE pkg mirror" "downloads.sxemacs.org" "xemacs-pkgs/packages" "http"))) ("US (Main XEmacs Site)" @@ -278,7 +279,7 @@ package download sites." ;;;###autoload (defcustom package-get-pre-release-download-sites - `(,@(when package-get-have-curl + `(,@(when package-get-have-curl '(("SXEmacs XE pkg Pre-Releases" "downloads.sxemacs.org" "xemacs-pkgs/beta/experimental/packages" "http"))) ("US Pre-Releases (Main XEmacs Site)" "ftp.xemacs.org" @@ -1255,6 +1256,4 @@ lead to Emacs accessing remote sites." (require 'package-ui) (load "cl-macs")) -;;;###autoload (condition-case nil (require 'ffi-curl) (error nil)) - ;;; package-get.el ends here -- 2.34.1