From: John Wiegley <johnw@newartisans.com>
Date: Sun, 7 Aug 2022 15:58:26 +0000 (-0700)
Subject: Merge pull request from conao3/fix-declare-style
X-Git-Tag: emacs-29.0.90~1306^2~15^2~26
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0dc78ef4c8;p=emacs.git

Merge pull request from conao3/fix-declare-style

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

0dc78ef4c875e33b677e2ac13a2105bcbf45288e
diff --cc lisp/use-package/use-package-core.el
index 36d5ccb977b,99ddc56eb45..2859e3382ca
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@@ -1657,13 -1558,11 +1657,13 @@@ 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 `customize-set-variable' with each variable definition.
 -:custom-face     Call `customize-set-faces' with each face definition.
 +: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 `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))
+   (declare (indent defun))
    (unless (memq :disabled args)
      (macroexp-progn
       (use-package-concat