From: John Wiegley <johnw@newartisans.com>
Date: Sun, 7 Aug 2022 15:40:14 +0000 (-0700)
Subject: Merge pull request from iaeerfung/master
X-Git-Tag: emacs-29.0.90~1306^2~15^2~35
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e9b297a9fa0fb53d681866a4cf9d1f5439ddaae6;p=emacs.git

Merge pull request from iaeerfung/master

GitHub-reference: https://github.com/jwiegley/use-package/issues/912
---

e9b297a9fa0fb53d681866a4cf9d1f5439ddaae6
diff --cc lisp/use-package/use-package-core.el
index 3d195b257c7,962d950d458..49187e527ff
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@@ -1627,10 -1597,10 +1627,10 @@@ this file.  Usage
  :load-path       Add to the `load-path' before attempting to load the package.
  :diminish        Support for diminish.el (if installed).
  :delight         Support for delight.el (if installed).
- :custom          Call `custom-set' or `set-default' with each variable
+ :custom          Call `Custom-set' or `set-default' with each variable
                   definition without modifying the Emacs `custom-file'.
                   (compare with `custom-set-variables').
 -:custom-face     Call `customize-set-faces' with each face definition.
 +:custom-face     Call `custom-set-faces' with each face definition.
  :ensure          Loads the package using package.el if necessary.
  :pin             Pin the package to an archive."
    (declare (indent 1))