From 82903da9d8d50bf446a9fc90d65e4fefd18f17eb Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 27 Apr 2013 17:09:12 +0200 Subject: [PATCH] don't use obsolete flet Unfortunately there isn't a proper dynamically scoped replacement, so we have to resort to using funcall. --- lisp/use-package/use-package.el | 61 +++++++++++++++++---------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 46b46278c07..f4db4e3259a 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -482,35 +482,38 @@ For full documentation. please see commentary. ,init-body))) - (flet ((init-for-commands - (func sym-or-list) - (let ((cons-list (if (and (consp sym-or-list) - (stringp (car sym-or-list))) - (list sym-or-list) - sym-or-list))) - (if cons-list - (setq init-body - `(progn - ,init-body - ,@(mapcar #'(lambda (elem) - (push (cdr elem) commands) - (funcall func elem)) - cons-list))))))) - - (init-for-commands #'(lambda (binding) - `(bind-key ,(car binding) - (quote ,(cdr binding)))) - (plist-get args :bind)) - - (init-for-commands #'(lambda (mode) - `(add-to-list 'auto-mode-alist - (quote ,mode))) - (plist-get args :mode)) - - (init-for-commands #'(lambda (interpreter) - `(add-to-list 'interpreter-mode-alist - (quote ,interpreter))) - (plist-get args :interpreter))) + (let ((init-for-commands + (lambda (func sym-or-list) + (let ((cons-list (if (and (consp sym-or-list) + (stringp (car sym-or-list))) + (list sym-or-list) + sym-or-list))) + (if cons-list + (setq init-body + `(progn + ,init-body + ,@(mapcar #'(lambda (elem) + (push (cdr elem) commands) + (funcall func elem)) + cons-list)))))))) + + (funcall init-for-commands + #'(lambda (binding) + `(bind-key ,(car binding) + (quote ,(cdr binding)))) + (plist-get args :bind)) + + (funcall init-for-commands + #'(lambda (mode) + `(add-to-list 'auto-mode-alist + (quote ,mode))) + (plist-get args :mode)) + + (funcall init-for-commands + #'(lambda (interpreter) + `(add-to-list 'interpreter-mode-alist + (quote ,interpreter))) + (plist-get args :interpreter))) `(progn ,@(mapcar -- 2.39.2