martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into pr-830

Browse Source
This commit is contained in:
John Wiegley
2022-11-15 09:21:07 -08:00
parent ec96b47664 cf8ab8b52e
commit 49fffe7cf4
16 changed files with 223 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/lisp/use-package/use-package-chords-tests.el
View File

@@ -158,4 +158,4 @@
;; no-update-autoloads: t
;; End:
;;; use-package-tests.el ends here
;;; use-package-chords-tests.el ends here

25
test/lisp/use-package/use-package-tests.el
View File

@@ -875,6 +875,12 @@
(gnus-harvest-install))
t))))
(ert-deftest use-package-test/:autoload-1 ()
(match-expansion
(use-package foo :autoload bar)
`(unless (fboundp 'bar)
(autoload #'bar "foo"))))
(ert-deftest use-package-test/:defines-1 ()
(match-expansion
(use-package foo :defines bar)
@@ -1150,7 +1156,7 @@
(match-expansion
(use-package foo :custom-face (foo ((t (:background "#e4edfc")))))
`(progn
(custom-set-faces (backquote (foo ((t (:background "#e4edfc"))))))
(apply #'face-spec-set (backquote (foo ((t (:background "#e4edfc"))))))
(require 'foo nil nil))))
(ert-deftest use-package-test/:custom-face-2 ()
@@ -1160,11 +1166,18 @@
(example-1-face ((t (:foreground "LightPink"))))
(example-2-face ((t (:foreground "LightGreen")))))
`(progn
(custom-set-faces
(backquote (example-1-face ((t (:foreground "LightPink"))))))
(custom-set-faces
(backquote (example-2-face ((t (:foreground "LightGreen"))))))
(require 'example nil nil))))
(apply #'face-spec-set
(backquote (example-1-face ((t (:foreground "LightPink"))))))
(apply #'face-spec-set
(backquote (example-2-face ((t (:foreground "LightGreen"))))))
(require 'example nil nil))))
(ert-deftest use-package-test/:custom-face-3 ()
(match-expansion
(use-package foo :custom-face (foo ((t (:background "#e4edfc"))) face-defspec-spec))
`(progn
(apply #'face-spec-set (backquote (foo ((t (:background "#e4edfc"))) face-defspec-spec)))
(require 'foo nil nil))))
(ert-deftest use-package-test/:init-1 ()
(match-expansion