masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 19:29:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Reduce some code duplication"

Browse source 
This reverts commit 1e560c5140.
This commit is contained in:
John Wiegley 2017-12-04 10:29:27 -08:00
parent fb9d159632
commit 026433a8a0
2 changed files with 35 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
up-core.el
View file

@ -273,16 +273,6 @@ Must be set before loading use-package."
"Report MSG as an error, so the user knows it came from this package."
(error "use-package: %s" msg))
(defun use-package-hush (f body)
(condition-case-unless-debug err
(macroexp-progn body)
(error
(if (stringp f)
(ignore (display-warning 'use-package
(format f (error-message-string err))
:error))
(funcall f err)))))
(defsubst use-package-concat (&rest elems)
"Delete all empty lists from ELEMS (nil or (list nil)), and append them."
(apply #'append (delete nil (delete (list nil) elems))))
@ -1307,6 +1297,11 @@ no keyword implies `:all'."
;;; The main macro
;;
(defsubst use-package-hush (context body)
`((condition-case-unless-debug err
,(macroexp-progn body)
(error (funcall ,context err)))))
(defun use-package-core (name args)
(let* ((context (gensym "use-package--warning"))
(args* (use-package-normalize-keywords name args))
@ -1409,9 +1404,14 @@ this file. Usage:
(macroexp-progn
(if (eq use-package-verbose 'errors)
(use-package-core name args)
(use-package-hush
(format "Failed to parse package %s: %%s" name)
'((use-package-core name args)))))))
(condition-case-unless-debug err
(use-package-core name args)
(error
(ignore
(display-warning
'use-package
(format "Failed to parse package %s: %s"
name (error-message-string err)) :error))))))))
(put 'use-package 'lisp-indent-function 'defun)

35
up-ensure.el
View file

@ -143,22 +143,31 @@ manually updated package."
"(an unquoted symbol name)")))))))
(defun use-package-ensure-elpa (name ensure state &optional no-refresh)
(let ((package (or (and (eq ensure t) (use-package-as-symbol name))
ensure)))
(let ((package
(or (and (eq ensure t) (use-package-as-symbol name))
ensure)))
(when package
(require 'package)
(unless (package-installed-p package)
(use-package-hush
(format "Failed to install %s: %%s" name)
'((when (assoc package (bound-and-true-p package-pinned-packages))
(package-read-all-archive-contents))
(if (assoc package package-archive-contents)
(package-install package)
(package-refresh-contents)
(when (assoc package (bound-and-true-p package-pinned-packages))
(package-read-all-archive-contents))
(package-install package))
t))))))
(condition-case-unless-debug err
(progn
(when (assoc package (bound-and-true-p
package-pinned-packages))
(package-read-all-archive-contents))
(if (assoc package package-archive-contents)
(package-install package)
(package-refresh-contents)
(when (assoc package (bound-and-true-p
package-pinned-packages))
(package-read-all-archive-contents))
(package-install package))
t)
(error
(ignore
(display-warning 'use-package
(format "Failed to install %s: %s"
name (error-message-string err))
:error))))))))
(defun use-package-handler/:ensure (name keyword ensure rest state)
(let* ((body (use-package-process-keywords name rest state)))