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

Merge pull request from vermiculus/master

Browse source 
Do not quote lambda expressions
GitHub-reference: https://github.com/jwiegley/use-package/issues/140
This commit is contained in:
John Wiegley 2014-12-20 18:45:21 -06:00
commit 647950fd16
2 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/use-package/bind-key.el
View file

@ -285,8 +285,8 @@ function symbol (unquoted)."
(dolist (binding (dolist (binding
(setq personal-keybindings (setq personal-keybindings
(sort personal-keybindings (sort personal-keybindings
#'(lambda (l r) (lambda (l r)
(car (compare-keybindings l r)))))) (car (compare-keybindings l r))))))
(if (not (eq (cdar last-binding) (cdar binding))) (if (not (eq (cdar last-binding) (cdar binding)))
(princ (format "\n\n%s\n%s\n\n" (princ (format "\n\n%s\n%s\n\n"

50
lisp/use-package/use-package.el
View file

@ -393,43 +393,43 @@ For full documentation. please see commentary.
(setq init-body (setq init-body
`(progn `(progn
,init-body ,init-body
,@(mapcar #'(lambda (elem) ,@(mapcar (lambda (elem)
(push (cdr elem) commands) (push (cdr elem) commands)
(funcall func elem)) (funcall func elem))
cons-list)))))))) cons-list))))))))
(funcall init-for-commands (funcall init-for-commands
#'(lambda (binding) (lambda (binding)
`(bind-key ,(car binding) `(bind-key ,(car binding)
(quote ,(cdr binding)))) (quote ,(cdr binding))))
keybindings-alist) keybindings-alist)
(funcall init-for-commands (funcall init-for-commands
#'(lambda (binding) (lambda (binding)
`(bind-key* ,(car binding) `(bind-key* ,(car binding)
(quote ,(cdr binding)))) (quote ,(cdr binding))))
overriding-keybindings-alist) overriding-keybindings-alist)
(funcall init-for-commands (funcall init-for-commands
#'(lambda (mode) (lambda (mode)
`(add-to-list 'auto-mode-alist `(add-to-list 'auto-mode-alist
(quote ,mode))) (quote ,mode)))
mode-alist) mode-alist)
(funcall init-for-commands (funcall init-for-commands
#'(lambda (interpreter) (lambda (interpreter)
`(add-to-list 'interpreter-mode-alist `(add-to-list 'interpreter-mode-alist
(quote ,interpreter))) (quote ,interpreter)))
interpreter-alist)) interpreter-alist))
`(progn `(progn
,pre-load-body ,pre-load-body
,@(mapcar ,@(mapcar
#'(lambda (path) (lambda (path)
`(add-to-list 'load-path `(add-to-list 'load-path
,(if (file-name-absolute-p path) ,(if (file-name-absolute-p path)
path path
(expand-file-name path user-emacs-directory)))) (expand-file-name path user-emacs-directory))))
(cond ((stringp pkg-load-path) (cond ((stringp pkg-load-path)
(list pkg-load-path)) (list pkg-load-path))
((functionp pkg-load-path) ((functionp pkg-load-path)
@ -449,11 +449,11 @@ For full documentation. please see commentary.
,(if (and (or commands (use-package-plist-get args :defer)) ,(if (and (or commands (use-package-plist-get args :defer))
(not (use-package-plist-get args :demand))) (not (use-package-plist-get args :demand)))
(let (form) (let (form)
(mapc #'(lambda (command) (mapc (lambda (command)
(push `(unless (fboundp (quote ,command)) (push `(unless (fboundp (quote ,command))
(autoload (function ,command) (autoload (function ,command)
,name-string nil t)) ,name-string nil t))
form)) form))
commands) commands)
`(when ,(or predicate t) `(when ,(or predicate t)