From 818c78f4666edd3890fc0b58c50d06c422bafd82 Mon Sep 17 00:00:00 2001 From: Nicolas Dudebout Date: Wed, 25 Sep 2013 14:02:29 -0400 Subject: [PATCH] Removes `plist-get-sexp` This function was not working as advertised. Then `funcall` was evaluated too early and all the benefits of late evaluation for autoloads was lost. Furthermore, this function was not really needed in the first place: ``` (use-package foo :config my-foo-function) ``` can easily be replaced by the following: ``` (use-package foo :config (my-foo-function)) ``` --- lisp/use-package/use-package.el | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index ec2436e730b..68270657a9b 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -438,12 +438,6 @@ Return the list of recognized keywords." (error "Unrecognized keyword: %s" keyword)))) (plist-keys args))) -(defun plist-get-sexp (plist prop) - (let ((sexp-or-function (plist-get plist prop))) - (if (functionp sexp-or-function) - (funcall sexp-or-function) - sexp-or-function))) - (defun plist-get-value (plist prop) (let ((value-or-symbol (plist-get plist prop))) (if (symbolp value-or-symbol) @@ -476,12 +470,12 @@ For full documentation. please see commentary. :ensure loads package using package.el if necessary." (use-package-validate-keywords args) ; error if any bad keyword, ignore result (let* ((commands (plist-get args :commands)) - (pre-init-body (plist-get-sexp args :pre-init)) - (init-body (plist-get-sexp args :init)) - (config-body (plist-get-sexp args :config)) + (pre-init-body (plist-get args :pre-init)) + (init-body (plist-get args :init)) + (config-body (plist-get args :config)) (diminish-var (plist-get args :diminish)) (defines (plist-get args :defines)) - (idle-body (plist-get-sexp args :idle)) + (idle-body (plist-get args :idle)) (keybindings-alist (plist-get-value args :bind)) (mode-alist (plist-get-value args :mode)) (interpreter-alist (plist-get-value args :interpreter)) -- 2.39.2