From dbfb3484cddcb81400265e5885ac5c5b1c51bc87 Mon Sep 17 00:00:00 2001
From: Naoya Yamashita <conao3@gmail.com>
Date: Tue, 23 Feb 2021 02:49:18 +0900
Subject: add autoload keyword
:autoload is similar to :command but this generate autoload
statement as *no-interactive* function.
---
lisp/use-package/use-package-core.el | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
(limited to 'lisp/use-package')
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 28bc5a50ed0..e153b535156 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -94,6 +94,7 @@
;; Any other keyword that also declares commands to be autoloaded (such as
;; :bind) must appear before this keyword.
:commands
+ :autoload
:init
:defer
:demand
@@ -118,7 +119,8 @@ declaration is incorrect."
(defcustom use-package-deferring-keywords
'(:bind-keymap
:bind-keymap*
- :commands)
+ :commands
+ :autoload)
"Unless `:demand' is used, keywords in this list imply deferred loading.
The reason keywords like `:hook' are not in this list is that
they only imply deferred loading if they reference actual
@@ -1309,6 +1311,28 @@ meaning:
(delete-dups arg)))
(use-package-process-keywords name rest state)))
+;;;; :autoload
+
+(defalias 'use-package-normalize/:autoload 'use-package-normalize/:commands)
+
+(defun use-package-handler/:autoload (name _keyword arg rest state)
+ (use-package-concat
+ ;; Since we deferring load, establish any necessary autoloads, and also
+ ;; keep the byte-compiler happy.
+ (let ((name-string (use-package-as-string name)))
+ (cl-mapcan
+ #'(lambda (command)
+ (when (symbolp command)
+ (append
+ (unless (plist-get state :demand)
+ `((unless (fboundp ',command)
+ (autoload #',command ,name-string))))
+ (when (bound-and-true-p byte-compile-current-file)
+ `((eval-when-compile
+ (declare-function ,command ,name-string)))))))
+ (delete-dups arg)))
+ (use-package-process-keywords name rest state)))
+
;;;; :defer
(defalias 'use-package-normalize/:defer 'use-package-normalize-predicate)
@@ -1570,6 +1594,7 @@ this file. Usage:
package. This is useful if the package is being lazily
loaded, and you wish to conditionally call functions in your
`:init' block that are defined in the package.
+:autoload Similar to :commands, but it for no-interactive one.
:hook Specify hook(s) to attach this package to.
:bind Bind keys, and define autoloads for the bound commands.
--
cgit v1.2.3
From 6b344a919754d53070280e691924011ad9086c76 Mon Sep 17 00:00:00 2001
From: Andrey Listopadov <andreyorst@gmail.com>
Date: Sat, 15 Oct 2022 19:03:03 +0300
Subject: Use face-spec-set instead of custom-set-faces
GitHub-reference: https://github.com/jwiegley/use-package/issues/934
Copyright-paperwork-exempt: yes
---
lisp/use-package/use-package-core.el | 2 +-
test/lisp/use-package/use-package-tests.el | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'lisp/use-package')
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 31b80486432..21b1a7ab40e 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -1518,7 +1518,7 @@ no keyword implies `:all'."
(defun use-package-handler/:custom-face (name _keyword args rest state)
"Generate use-package custom-face keyword code."
(use-package-concat
- (mapcar #'(lambda (def) `(custom-set-faces (backquote ,def))) args)
+ (mapcar #'(lambda (def) `(apply #'face-spec-set (backquote ,def))) args)
(use-package-process-keywords name rest state)))
;;;; :init
diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el
index 1ccd3ad0786..7d98ca99e4a 100644
--- a/test/lisp/use-package/use-package-tests.el
+++ b/test/lisp/use-package/use-package-tests.el
@@ -1156,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 ()
@@ -1166,11 +1166,11 @@
(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/:init-1 ()
(match-expansion
--
cgit v1.2.3
From 0fafd98513fd582f50aa114a4db0c59f0de12bcd Mon Sep 17 00:00:00 2001
From: Payas Relekar <relekarpayas@gmail.com>
Date: Tue, 25 Oct 2022 20:02:35 +0530
Subject: Update copyright for submission to ELPA
- Update year to 2022
- Set copyright to Free Software Foundation, Inc.
---
lisp/use-package/bind-chord.el | 2 +-
lisp/use-package/bind-key.el | 2 +-
lisp/use-package/use-package-bind-key.el | 2 +-
lisp/use-package/use-package-chords.el | 2 +-
lisp/use-package/use-package-core.el | 2 +-
lisp/use-package/use-package-delight.el | 2 +-
lisp/use-package/use-package-diminish.el | 2 +-
lisp/use-package/use-package-ensure-system-package.el | 2 +-
lisp/use-package/use-package-ensure.el | 2 +-
lisp/use-package/use-package-jump.el | 2 +-
lisp/use-package/use-package-lint.el | 2 +-
lisp/use-package/use-package.el | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
(limited to 'lisp/use-package')
diff --git a/lisp/use-package/bind-chord.el b/lisp/use-package/bind-chord.el
index ff19c81fc78..bf0f5866ac4 100644
--- a/lisp/use-package/bind-chord.el
+++ b/lisp/use-package/bind-chord.el
@@ -1,6 +1,6 @@
;;; bind-chord.el --- key-chord binding helper for use-package-chords -*- lexical-binding: t; -*-
-;; Copyright (C) 2015-2019 Justin Talbott
+;; Copyright (C) 2015-2022 Free Software Foundation, Inc.
;; Author: Justin Talbott <justin@waymondo.com>
;; Keywords: convenience, tools, extensions
diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el
index 17e161cd72e..817ca5efb2d 100644
--- a/lisp/use-package/bind-key.el
+++ b/lisp/use-package/bind-key.el
@@ -1,6 +1,6 @@
;;; bind-key.el --- A simple way to manage personal keybindings -*- lexical-binding: t; -*-
-;; Copyright (c) 2012-2017 John Wiegley
+;; Copyright (c) 2012-2022 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@newartisans.com>
;; Maintainer: John Wiegley <johnw@newartisans.com>
diff --git a/lisp/use-package/use-package-bind-key.el b/lisp/use-package/use-package-bind-key.el
index 9642f311750..5ca2d016478 100644
--- a/lisp/use-package/use-package-bind-key.el
+++ b/lisp/use-package/use-package-bind-key.el
@@ -1,6 +1,6 @@
;;; use-package-bind-key.el --- Support for the :bind/:bind-keymap keywords -*- lexical-binding: t; -*-
-;; Copyright (C) 2012-2017 John Wiegley
+;; Copyright (C) 2012-2022 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@newartisans.com>
;; Maintainer: John Wiegley <johnw@newartisans.com>
diff --git a/lisp/use-package/use-package-chords.el b/lisp/use-package/use-package-chords.el
index cf390dbe593..4a4d9e7fea7 100644
--- a/lisp/use-package/use-package-chords.el
+++ b/lisp/use-package/use-package-chords.el
@@ -1,6 +1,6 @@
;;; use-package-chords.el --- key-chord keyword for use-package -*- lexical-binding: t; -*-
-;; Copyright (C) 2015-2019 Justin Talbott
+;; Copyright (C) 2015-2022 Free Software Foundation, Inc.
;; Author: Justin Talbott <justin@waymondo.com>
;; Keywords: convenience, tools, extensions
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 31b80486432..76c6a97e062 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -1,6 +1,6 @@
;;; use-package-core.el --- A configuration macro for simplifying your .emacs -*- lexical-binding: t; -*-
-;; Copyright (C) 2012-2017 John Wiegley
+;; Copyright (C) 2012-2022 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@newartisans.com>
;; Maintainer: John Wiegley <johnw@newartisans.com>
diff --git a/lisp/use-package/use-package-delight.el b/lisp/use-package/use-package-delight.el
index 85d5c7cb4d6..558be5e4706 100644
--- a/lisp/use-package/use-package-delight.el
+++ b/lisp/use-package/use-package-delight.el
@@ -1,6 +1,6 @@
;;; use-package-delight.el --- Support for the :delight keyword -*- lexical-binding: t; -*-
-;; Copyright (C) 2012-2017 John Wiegley
+;; Copyright (C) 2012-2022 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@newartisans.com>
;; Maintainer: John Wiegley <johnw@newartisans.com>
diff --git a/lisp/use-package/use-package-diminish.el b/lisp/use-package/use-package-diminish.el
index 1f3895f42cd..5b20830ee6a 100644
--- a/lisp/use-package/use-package-diminish.el
+++ b/lisp/use-package/use-package-diminish.el
@@ -1,6 +1,6 @@
;;; use-package-diminish.el --- Support for the :diminish keyword -*- lexical-binding: t; -*-
-;; Copyright (C) 2012-2017 John Wiegley
+;; Copyright (C) 2012-2022 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@newartisans.com>
;; Maintainer: John Wiegley <johnw@newartisans.com>
diff --git a/lisp/use-package/use-package-ensure-system-package.el b/lisp/use-package/use-package-ensure-system-package.el
index 7c591af7d9b..8f1affadae0 100644
--- a/lisp/use-package/use-package-ensure-system-package.el
+++ b/lisp/use-package/use-package-ensure-system-package.el
@@ -1,6 +1,6 @@
;;; use-package-ensure-system-package.el --- auto install system packages -*- lexical-binding: t; -*-
-;; Copyright (C) 2017 Justin Talbott
+;; Copyright (C) 2022 Free Software Foundation, Inc.
;; Author: Justin Talbott <justin@waymondo.com>
;; Keywords: convenience, tools, extensions
diff --git a/lisp/use-package/use-package-ensure.el b/lisp/use-package/use-package-ensure.el
index cb31b4b7dd4..78a7e8be1e2 100644
--- a/lisp/use-package/use-package-ensure.el
+++ b/lisp/use-package/use-package-ensure.el
@@ -1,6 +1,6 @@
;;; use-package-ensure.el --- Support for the :ensure and :pin keywords -*- lexical-binding: t; -*-
-;; Copyright (C) 2012-2017 John Wiegley
+;; Copyright (C) 2012-2022 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@newartisans.com>
;; Maintainer: John Wiegley <johnw@newartisans.com>
diff --git a/lisp/use-package/use-package-jump.el b/lisp/use-package/use-package-jump.el
index 4044ad16564..224d2e06b6e 100644
--- a/lisp/use-package/use-package-jump.el
+++ b/lisp/use-package/use-package-jump.el
@@ -1,6 +1,6 @@
;;; use-package-jump.el --- Attempt to jump to a use-package declaration -*- lexical-binding: t; -*-
-;; Copyright (C) 2012-2017 John Wiegley
+;; Copyright (C) 2012-2022 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@newartisans.com>
;; Maintainer: John Wiegley <johnw@newartisans.com>
diff --git a/lisp/use-package/use-package-lint.el b/lisp/use-package/use-package-lint.el
index c6e7c3c0ce2..49a47a9d32b 100644
--- a/lisp/use-package/use-package-lint.el
+++ b/lisp/use-package/use-package-lint.el
@@ -1,6 +1,6 @@
;;; use-package-lint.el --- Attempt to find errors in use-package declarations -*- lexical-binding: t; -*-
-;; Copyright (C) 2012-2017 John Wiegley
+;; Copyright (C) 2012-2022 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@newartisans.com>
;; Maintainer: John Wiegley <johnw@newartisans.com>
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 0e194d5f182..62bb2407a51 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -1,6 +1,6 @@
;;; use-package.el --- A configuration macro for simplifying your .emacs -*- lexical-binding: t; -*-
-;; Copyright (C) 2012-2017 John Wiegley
+;; Copyright (C) 2012-2022 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@newartisans.com>
;; Maintainer: John Wiegley <johnw@newartisans.com>
--
cgit v1.2.3
From abd655c99ef457962d8b424fd70b94f90595ed6b Mon Sep 17 00:00:00 2001
From: Payas Relekar <relekarpayas@gmail.com>
Date: Thu, 27 Oct 2022 08:50:53 +0530
Subject: Update version to 2.4.2
In preparation for inclusion to GNU ELPA.
---
etc/USE-PACKAGE-NEWS | 4 ++++
lisp/use-package/use-package-core.el | 4 ++--
lisp/use-package/use-package.el | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
(limited to 'lisp/use-package')
diff --git a/etc/USE-PACKAGE-NEWS b/etc/USE-PACKAGE-NEWS
index 1f516966980..6e8530ef377 100644
--- a/etc/USE-PACKAGE-NEWS
+++ b/etc/USE-PACKAGE-NEWS
@@ -1,5 +1,9 @@
# Changes
+## 2.4.2
+
+This release prepares for inclusion to GNU ELPA and includes no other changes
+
## 2.4.1
This is mostly a bug-fix release:
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 76c6a97e062..6832c447c7d 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -6,7 +6,7 @@
;; Maintainer: John Wiegley <johnw@newartisans.com>
;; Created: 17 Jun 2012
;; Modified: 29 Nov 2017
-;; Version: 2.4.1
+;; Version: 2.4.2
;; Package-Requires: ((emacs "24.3"))
;; Keywords: dotemacs startup speed config package
;; URL: https://github.com/jwiegley/use-package
@@ -66,7 +66,7 @@
"A use-package declaration for simplifying your `.emacs'."
:group 'startup)
-(defconst use-package-version "2.4.1"
+(defconst use-package-version "2.4.2"
"This version of use-package.")
(defcustom use-package-keywords
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 62bb2407a51..574431d80b5 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -6,7 +6,7 @@
;; Maintainer: John Wiegley <johnw@newartisans.com>
;; Created: 17 Jun 2012
;; Modified: 29 Nov 2017
-;; Version: 2.4.1
+;; Version: 2.4.2
;; Package-Requires: ((emacs "24.3") (bind-key "2.4"))
;; Keywords: dotemacs startup speed config package
;; URL: https://github.com/jwiegley/use-package
--
cgit v1.2.3
From 2ee9b31ca4bde97999eedd444430afdb5dbf1cad Mon Sep 17 00:00:00 2001
From: Payas Relekar <relekarpayas@gmail.com>
Date: Fri, 28 Oct 2022 10:37:18 +0530
Subject: bind-key.el: Bump version for ELPA
---
lisp/use-package/bind-key.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'lisp/use-package')
diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el
index 817ca5efb2d..cca5ad86187 100644
--- a/lisp/use-package/bind-key.el
+++ b/lisp/use-package/bind-key.el
@@ -6,7 +6,7 @@
;; Maintainer: John Wiegley <johnw@newartisans.com>
;; Created: 16 Jun 2012
;; Modified: 29 Nov 2017
-;; Version: 2.4
+;; Version: 2.4.1
;; Keywords: keys keybinding config dotemacs
;; URL: https://github.com/jwiegley/use-package
--
cgit v1.2.3
From 370890e518ebf2f2f6c5e2a0a27576e111de22d6 Mon Sep 17 00:00:00 2001
From: Payas Relekar <relekarpayas@gmail.com>
Date: Fri, 28 Oct 2022 17:39:16 +0530
Subject: Bump version to 2.4.3
---
etc/USE-PACKAGE-NEWS | 2 +-
lisp/use-package/use-package-core.el | 4 ++--
lisp/use-package/use-package.el | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'lisp/use-package')
diff --git a/etc/USE-PACKAGE-NEWS b/etc/USE-PACKAGE-NEWS
index 6e8530ef377..38f5dc70a16 100644
--- a/etc/USE-PACKAGE-NEWS
+++ b/etc/USE-PACKAGE-NEWS
@@ -1,6 +1,6 @@
# Changes
-## 2.4.2
+## 2.4.3
This release prepares for inclusion to GNU ELPA and includes no other changes
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index f27d158fc05..52d7abd4cbb 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -6,7 +6,7 @@
;; Maintainer: John Wiegley <johnw@newartisans.com>
;; Created: 17 Jun 2012
;; Modified: 29 Nov 2017
-;; Version: 2.4.2
+;; Version: 2.4.3
;; Package-Requires: ((emacs "24.3"))
;; Keywords: dotemacs startup speed config package
;; URL: https://github.com/jwiegley/use-package
@@ -66,7 +66,7 @@
"A use-package declaration for simplifying your `.emacs'."
:group 'startup)
-(defconst use-package-version "2.4.2"
+(defconst use-package-version "2.4.3"
"This version of use-package.")
(defcustom use-package-keywords
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 574431d80b5..240693c1189 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -6,7 +6,7 @@
;; Maintainer: John Wiegley <johnw@newartisans.com>
;; Created: 17 Jun 2012
;; Modified: 29 Nov 2017
-;; Version: 2.4.2
+;; Version: 2.4.3
;; Package-Requires: ((emacs "24.3") (bind-key "2.4"))
;; Keywords: dotemacs startup speed config package
;; URL: https://github.com/jwiegley/use-package
--
cgit v1.2.3
From 76a5ce5d8693cf7e8a70209b4275e0c21708e4a9 Mon Sep 17 00:00:00 2001
From: Andrey Listopadov <andreyorst@gmail.com>
Date: Sat, 29 Oct 2022 13:24:13 +0300
Subject: Allow passing the SPEC-TYPE argument via :custom-face
GitHub-reference: https://github.com/jwiegley/use-package/issues/1008
Copyright-paperwork-exempt: yes
---
lisp/use-package/use-package-core.el | 4 ++--
lisp/use-package/use-package.el | 2 +-
test/lisp/use-package/use-package-tests.el | 7 +++++++
3 files changed, 10 insertions(+), 3 deletions(-)
(limited to 'lisp/use-package')
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index f27d158fc05..135b1ca96b0 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -1501,7 +1501,7 @@ no keyword implies `:all'."
(defun use-package-normalize/:custom-face (name-symbol _keyword arg)
"Normalize use-package custom-face keyword."
(let ((error-msg
- (format "%s wants a (<symbol> <face-spec>) or list of these"
+ (format "%s wants a (<symbol> <face-spec> [spec-type]) or list of these"
name-symbol)))
(unless (listp arg)
(use-package-error error-msg))
@@ -1512,7 +1512,7 @@ no keyword implies `:all'."
(spec (nth 1 def)))
(when (or (not face)
(not spec)
- (> (length def) 2))
+ (> (length def) 3))
(use-package-error error-msg))))))
(defun use-package-handler/:custom-face (name _keyword args rest state)
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 574431d80b5..240693c1189 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -6,7 +6,7 @@
;; Maintainer: John Wiegley <johnw@newartisans.com>
;; Created: 17 Jun 2012
;; Modified: 29 Nov 2017
-;; Version: 2.4.2
+;; Version: 2.4.3
;; Package-Requires: ((emacs "24.3") (bind-key "2.4"))
;; Keywords: dotemacs startup speed config package
;; URL: https://github.com/jwiegley/use-package
diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el
index 7d98ca99e4a..185f7691ba9 100644
--- a/test/lisp/use-package/use-package-tests.el
+++ b/test/lisp/use-package/use-package-tests.el
@@ -1172,6 +1172,13 @@
(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
(use-package foo :init (init))
--
cgit v1.2.3
From 7122ac5397c1fbb4e76c123d490106a99bcb611d Mon Sep 17 00:00:00 2001
From: Payas Relekar <relekarpayas@gmail.com>
Date: Sat, 5 Nov 2022 13:28:24 +0530
Subject: Bump version to 2.4.4
---
etc/USE-PACKAGE-NEWS | 2 +-
lisp/use-package/use-package-core.el | 4 ++--
lisp/use-package/use-package.el | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'lisp/use-package')
diff --git a/etc/USE-PACKAGE-NEWS b/etc/USE-PACKAGE-NEWS
index 38f5dc70a16..c499820755f 100644
--- a/etc/USE-PACKAGE-NEWS
+++ b/etc/USE-PACKAGE-NEWS
@@ -1,6 +1,6 @@
# Changes
-## 2.4.3
+## 2.4.4
This release prepares for inclusion to GNU ELPA and includes no other changes
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 53bc3ed2a42..7d7217d094b 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -6,7 +6,7 @@
;; Maintainer: John Wiegley <johnw@newartisans.com>
;; Created: 17 Jun 2012
;; Modified: 29 Nov 2017
-;; Version: 2.4.3
+;; Version: 2.4.4
;; Package-Requires: ((emacs "24.3"))
;; Keywords: dotemacs startup speed config package
;; URL: https://github.com/jwiegley/use-package
@@ -66,7 +66,7 @@
"A use-package declaration for simplifying your `.emacs'."
:group 'startup)
-(defconst use-package-version "2.4.3"
+(defconst use-package-version "2.4.4"
"This version of use-package.")
(defcustom use-package-keywords
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 240693c1189..9d046e0b149 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -6,7 +6,7 @@
;; Maintainer: John Wiegley <johnw@newartisans.com>
;; Created: 17 Jun 2012
;; Modified: 29 Nov 2017
-;; Version: 2.4.3
+;; Version: 2.4.4
;; Package-Requires: ((emacs "24.3") (bind-key "2.4"))
;; Keywords: dotemacs startup speed config package
;; URL: https://github.com/jwiegley/use-package
--
cgit v1.2.3
From 45e6ee1371bdfec607aaf0b5be2b340460f704db Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Sun, 13 Nov 2022 23:16:05 +0100
Subject: Fix tests on Emacs 26 or older
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This fixes the following error in Emacs 25.3:
In toplevel form:
bind-key.el:549:1:Error: the function ‘mapcan’ is not known to be defined.
---
lisp/use-package/bind-key.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'lisp/use-package')
diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el
index cca5ad86187..567ef9e4e85 100644
--- a/lisp/use-package/bind-key.el
+++ b/lisp/use-package/bind-key.el
@@ -223,11 +223,11 @@ See `bind-key' for more details."
In contrast to `define-key', this function removes the binding from the keymap."
(define-key keymap key nil)
;; Split M-key in ESC key
- (setq key (mapcan (lambda (k)
- (if (and (integerp k) (/= (logand k ?\M-\0) 0))
- (list ?\e (logxor k ?\M-\0))
- (list k)))
- key))
+ (setq key (cl-mapcan (lambda (k)
+ (if (and (integerp k) (/= (logand k ?\M-\0) 0))
+ (list ?\e (logxor k ?\M-\0))
+ (list k)))
+ key))
;; Delete single keys directly
(if (= (length key) 1)
(delete key keymap)
@@ -241,7 +241,7 @@ In contrast to `define-key', this function removes the binding from the keymap."
(delete (last key) submap)
;; Delete submap if it is empty
(when (= 1 (length submap))
- (bind-key--remove prefix keymap)))))
+ (bind-key--remove prefix keymap)))))
;;;###autoload
(defmacro bind-key* (key-name command &optional predicate)
--
cgit v1.2.3
From 43254ae62f1a775edab9a3c74d0411ba0577de0e Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Sun, 13 Nov 2022 23:20:40 +0100
Subject: Fix building on Emacs 24.3
This fixes the following error:
use-package-core.el:60:32:Error: Cannot open load file: subr-x
---
lisp/use-package/use-package-core.el | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
(limited to 'lisp/use-package')
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 53bc3ed2a42..9e7b3b56e12 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -53,11 +53,18 @@
;; iterating over them to "disable all themes" won't disable it.
(setq custom-enabled-themes (remq 'use-package custom-enabled-themes))
-(if (and (eq emacs-major-version 24) (eq emacs-minor-version 3))
- (defsubst hash-table-keys (hash-table)
- "Return a list of keys in HASH-TABLE."
- (cl-loop for k being the hash-keys of hash-table collect k))
- (eval-when-compile (require 'subr-x)))
+(eval-when-compile
+ (if (and (eq emacs-major-version 24) (eq emacs-minor-version 3))
+ (progn
+ (defsubst hash-table-keys (hash-table)
+ "Return a list of keys in HASH-TABLE."
+ (cl-loop for k being the hash-keys of hash-table collect k))
+ (defsubst string-suffix-p (suffix string &optional ignore-case)
+ (let ((start-pos (- (length string) (length suffix))))
+ (and (>= start-pos 0)
+ (eq t (compare-strings suffix nil nil
+ string start-pos nil ignore-case))))))
+ (require 'subr-x)))
(eval-when-compile
(require 'regexp-opt))
--
cgit v1.2.3
From ff30d22909194f818e5262537bcd045c4bf86e90 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 14 Nov 2022 02:15:19 +0100
Subject: Various checkdoc fixes
---
lisp/use-package/bind-key.el | 8 ++--
lisp/use-package/use-package-bind-key.el | 2 +-
lisp/use-package/use-package-core.el | 56 +++++++++++-----------
.../use-package-ensure-system-package.el | 4 +-
lisp/use-package/use-package-ensure.el | 6 +--
lisp/use-package/use-package-jump.el | 13 +++--
lisp/use-package/use-package-lint.el | 2 +-
test/lisp/use-package/use-package-chords-tests.el | 2 +-
8 files changed, 47 insertions(+), 46 deletions(-)
(limited to 'lisp/use-package')
diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el
index cca5ad86187..1a84d6a9066 100644
--- a/lisp/use-package/bind-key.el
+++ b/lisp/use-package/bind-key.el
@@ -29,7 +29,7 @@
;; If you have lots of keybindings set in your .emacs file, it can be hard to
;; know which ones you haven't set yet, and which may now be overriding some
-;; new default in a new emacs version. This module aims to solve that
+;; new default in a new Emacs version. This module aims to solve that
;; problem.
;;
;; Bind keys as follows in your .emacs:
@@ -104,7 +104,7 @@
(require 'easy-mmode)
(defgroup bind-key nil
- "A simple way to manage personal keybindings"
+ "A simple way to manage personal keybindings."
:group 'emacs)
(defcustom bind-key-column-widths '(18 . 40)
@@ -127,7 +127,7 @@
;; Create override-global-mode to force key remappings
(defvar override-global-map (make-keymap)
- "override-global-mode keymap")
+ "Keymap for `override-global-mode'.")
(define-minor-mode override-global-mode
"A minor mode so that keymap settings override other modes."
@@ -150,7 +150,7 @@ Elements have the form ((KEY . [MAP]) CMD ORIGINAL-CMD)")
KEY-NAME may be a vector, in which case it is passed straight to
`define-key'. Or it may be a string to be interpreted as
-spelled-out keystrokes, e.g., \"C-c C-z\". See documentation of
+spelled-out keystrokes, e.g., `C-c C-z'. See documentation of
`edmacro-mode' for details.
COMMAND must be an interactive function or lambda form.
diff --git a/lisp/use-package/use-package-bind-key.el b/lisp/use-package/use-package-bind-key.el
index 5ca2d016478..5e6a10925ca 100644
--- a/lisp/use-package/use-package-bind-key.el
+++ b/lisp/use-package/use-package-bind-key.el
@@ -29,7 +29,7 @@
;;; Commentary:
;; Provides support for the :bind, :bind*, :bind-keymap and :bind-keymap*
-;; keywords. Note that these are currently still baked into
+;; keywords. Note that these are currently still baked into
;; `use-package-keywords' and `use-package-deferring-keywords', although this
;; is harmless if they are never used.
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 7d7217d094b..5b001e496dd 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -63,11 +63,11 @@
(require 'regexp-opt))
(defgroup use-package nil
- "A use-package declaration for simplifying your `.emacs'."
+ "A `use-package' declaration for simplifying your `.emacs'."
:group 'startup)
(defconst use-package-version "2.4.4"
- "This version of use-package.")
+ "This version of `use-package'.")
(defcustom use-package-keywords
'(:disabled
@@ -106,13 +106,13 @@
"The set of valid keywords, in the order they are processed in.
The order of this list is *very important*, so it is only
advisable to insert new keywords, never to delete or reorder
-them. Further, attention should be paid to the NEWS.md if the
+them. Further, attention should be paid to the NEWS.md if the
default order ever changes, as they may have subtle effects on
-the semantics of use-package declarations and may necessitate
+the semantics of `use-package' declarations and may necessitate
changing where you had inserted a new keyword earlier.
Note that `:disabled' is special in this list, as it causes
-nothing at all to happen, even if the rest of the use-package
+nothing at all to happen, even if the rest of the `use-package'
declaration is incorrect."
:type '(repeat symbol)
:group 'use-package)
@@ -132,9 +132,9 @@ otherwise requested."
:group 'use-package)
(defcustom use-package-ignore-unknown-keywords nil
- "If non-nil, issue warning instead of error when unknown
-keyword is encountered. The unknown keyword and its associated
-arguments will be ignored in the `use-package' expansion."
+ "If non-nil, warn instead of signaling error for unknown keywords.
+The unknown keyword and its associated arguments will be ignored
+in the `use-package' expansion."
:type 'boolean
:group 'use-package)
@@ -149,7 +149,7 @@ call)."
"Whether to report about loading and configuration details.
If you customize this, then you should require the `use-package'
feature in files that use `use-package', even if these files only
-contain compiled expansions of the macros. If you don't do so,
+contain compiled expansions of the macros. If you don't do so,
then the expanded macros do their job silently."
:type '(choice (const :tag "Quiet, without catching errors" errors)
(const :tag "Quiet" nil)
@@ -196,9 +196,9 @@ Each entry in the alist is a list of three elements:
The first element is the `use-package' keyword.
The second is a form that can be evaluated to get the default
-value. It can also be a function that will receive the name of
-the use-package declaration and the keyword plist given to
-`use-package', in normalized form. The value it returns should
+value. It can also be a function that will receive the name of
+the `use-package' declaration and the keyword plist given to
+`use-package', in normalized form. The value it returns should
also be in normalized form (which is sometimes *not* what one
would normally write in a `use-package' declaration, so use
caution).
@@ -206,9 +206,9 @@ caution).
The third element is a form that can be evaluated to determine
whether or not to assign a default value; if it evaluates to nil,
then the default value is not assigned even if the keyword is not
-present in the `use-package' form. This third element may also be
+present in the `use-package' form. This third element may also be
a function, in which case it receives the name of the package (as
-a symbol) and a list of keywords (in normalized form). It should
+a symbol) and a list of keywords (in normalized form). It should
return nil or non-nil depending on whether defaulting should be
attempted."
:type `(repeat
@@ -293,7 +293,7 @@ This disables:
The main advantage to this variable is that, if you know your
configuration works, it will make the byte-compiled file as
-minimal as possible. It can also help with reading macro-expanded
+minimal as possible. It can also help with reading macro-expanded
definitions, to understand the main intent of what's happening."
:type 'boolean
:group 'use-package)
@@ -305,7 +305,7 @@ definitions, to understand the main intent of what's happening."
"\\s-+\\("))
(or (bound-and-true-p lisp-mode-symbol-regexp)
"\\(?:\\sw\\|\\s_\\|\\\\.\\)+") "\\)")
- "Sexp providing regexp for finding use-package forms in user files.
+ "Sexp providing regexp for finding `use-package' forms in user files.
This is used by `use-package-jump-to-package-form' and
`use-package-enable-imenu-support'."
:type 'sexp
@@ -316,7 +316,7 @@ This is used by `use-package-jump-to-package-form' and
This is done by adjusting `lisp-imenu-generic-expression' to
include support for finding `use-package' and `require' forms.
-Must be set before loading use-package."
+Must be set before loading `use-package'."
:type 'boolean
:set
#'(lambda (sym value)
@@ -338,8 +338,8 @@ Must be set before loading use-package."
(font-lock-add-keywords 'emacs-lisp-mode use-package-font-lock-keywords)
(defcustom use-package-compute-statistics nil
- "If non-nil, compute statistics concerned use-package declarations.
-View the statistical report using `use-package-report'. Note that
+ "If non-nil, compute statistics concerned `use-package' declarations.
+View the statistical report using `use-package-report'. Note that
if this option is enabled, you must require `use-package' in your
user init file at loadup time, or you will see errors concerning
undefined variables."
@@ -365,14 +365,14 @@ undefined variables."
(and sym (symbolp sym)))
(defsubst use-package-as-symbol (string-or-symbol)
- "If STRING-OR-SYMBOL is already a symbol, return it. Otherwise
-convert it to a symbol and return that."
+ "If STRING-OR-SYMBOL is already a symbol, return it.
+Otherwise convert it to a symbol and return that."
(if (symbolp string-or-symbol) string-or-symbol
(intern string-or-symbol)))
(defsubst use-package-as-string (string-or-symbol)
- "If STRING-OR-SYMBOL is already a string, return it. Otherwise
-convert it to a string and return that."
+ "If STRING-OR-SYMBOL is already a string, return it.
+Otherwise convert it to a string and return that."
(if (stringp string-or-symbol) string-or-symbol
(symbol-name string-or-symbol)))
@@ -738,8 +738,8 @@ one.
If AFTER is non-nil, insert KEYWORD either at the end of the
keywords list, or after the ANCHOR if one has been provided.
If TEST is non-nil, it is the test used to compare ELEM to list
-elements. The default is `eq'.
-The modified list is returned. The original list is not modified."
+elements. The default is `eq'.
+The modified list is returned. The original list is not modified."
(let (result)
(dolist (k xs)
(if (funcall (or test #'eq) k anchor)
@@ -989,6 +989,8 @@ If RECURSED is non-nil, recurse into sublists."
;;
(defun use-package-reset-statistics ()
+ "Reset statistics for `use-package'.
+See also `use-package-statistics'."
(interactive)
(setq use-package-statistics (make-hash-table)))
@@ -1031,7 +1033,7 @@ The information is formatted in a way suitable for
(format "%.2f" (use-package-statistics-time statistics))))))
(defun use-package-report ()
- "Show current statistics gathered about use-package declarations.
+ "Show current statistics gathered about `use-package' declarations.
In the table that's generated, the status field has the following
meaning:
Configured :config has been processed (the package is loaded!)
@@ -1055,7 +1057,7 @@ meaning:
(define-derived-mode use-package-statistics-mode tabulated-list-mode
"use-package statistics"
- "Show current statistics gathered about use-package declarations."
+ "Show current statistics gathered about `use-package' declarations."
(setq tabulated-list-format
;; The sum of column width is 80 characters:
[("Package" 25 t)
diff --git a/lisp/use-package/use-package-ensure-system-package.el b/lisp/use-package/use-package-ensure-system-package.el
index 8f1affadae0..c42996f9d2a 100644
--- a/lisp/use-package/use-package-ensure-system-package.el
+++ b/lisp/use-package/use-package-ensure-system-package.el
@@ -29,7 +29,7 @@
"List of custom packages installed.")
(defun use-package-ensure-system-package-consify (arg)
- "Turn `arg' into a cons of (`package-name' . `install-command')."
+ "Turn ARG into a cons of (`package-name' . `install-command')."
(cond
((stringp arg)
(cons arg `(system-packages-install ,arg)))
@@ -54,7 +54,7 @@
;;;###autoload
(defun use-package-normalize/:ensure-system-package (_name-symbol keyword args)
- "Turn `arg' into a list of cons-es of (`package-name' . `install-command')."
+ "Turn ARGS into a list of conses of (`package-name' . `install-command')."
(use-package-as-one (symbol-name keyword) args
(lambda (_label arg)
(cond
diff --git a/lisp/use-package/use-package-ensure.el b/lisp/use-package/use-package-ensure.el
index 78a7e8be1e2..a879c294dc3 100644
--- a/lisp/use-package/use-package-ensure.el
+++ b/lisp/use-package/use-package-ensure.el
@@ -37,7 +37,7 @@
(require 'use-package-core)
(defgroup use-package-ensure nil
- "Support for :ensure and :pin keywords in use-package declarations."
+ "Support for :ensure and :pin keywords in `use-package' declarations."
:group 'use-package)
(eval-when-compile
@@ -64,7 +64,7 @@ to all `:ensure' keywords (always a list, even if only one); and
the current `state' plist created by previous handlers.
Note that this function is called whenever `:ensure' is provided,
-even if it is nil. It is up to the function to decide on the
+even if it is nil. It is up to the function to decide on the
semantics of the various values for `:ensure'.
This function should return non-nil if the package is installed.
@@ -111,7 +111,7 @@ manually updated package."
(archive-name (if (stringp archive) archive (symbol-name archive))))
(if (use-package-archive-exists-p archive-symbol)
(add-to-list 'package-pinned-packages (cons package archive-name))
- (error "Archive '%s' requested for package '%s' is not available."
+ (error "Archive '%s' requested for package '%s' is not available"
archive-name package))
(unless (bound-and-true-p package--initialized)
(package-initialize t))))
diff --git a/lisp/use-package/use-package-jump.el b/lisp/use-package/use-package-jump.el
index 224d2e06b6e..6b9c02808e1 100644
--- a/lisp/use-package/use-package-jump.el
+++ b/lisp/use-package/use-package-jump.el
@@ -30,8 +30,8 @@
;; Provides the command `M-x use-package-jump-to-package-form', however it
;; only works if the package being jumped to was required during
-;; initialization. If it was delay-loaded, it will not work. Improvements are
-;; needed.
+;; initialization. If it was delay-loaded, it will not work.
+;; Improvements are needed.
;;; Code:
@@ -48,11 +48,10 @@ Returns an absolute file path or nil if none is found."
;;;###autoload
(defun use-package-jump-to-package-form (package)
- "Attempt to find and jump to the `use-package' form that loaded
-PACKAGE. This will only find the form if that form actually
-required PACKAGE. If PACKAGE was previously required then this
-function will jump to the file that originally required PACKAGE
-instead."
+ "Attempt to find and jump to the `use-package' form that loaded PACKAGE.
+This will only find the form if that form actually required
+PACKAGE. If PACKAGE was previously required then this function
+will jump to the file that originally required PACKAGE instead."
(interactive (list (completing-read "Package: " features)))
(let* ((package (if (stringp package) (intern package) package))
(requiring-file (use-package-find-require package))
diff --git a/lisp/use-package/use-package-lint.el b/lisp/use-package/use-package-lint.el
index 49a47a9d32b..12974ab15e4 100644
--- a/lisp/use-package/use-package-lint.el
+++ b/lisp/use-package/use-package-lint.el
@@ -63,7 +63,7 @@
;;;###autoload
(defun use-package-lint ()
- "Check for errors in use-package declarations.
+ "Check for errors in `use-package' declarations.
For example, if the module's `:if' condition is met, but even
with the specified `:load-path' the module cannot be found."
(interactive)
diff --git a/test/lisp/use-package/use-package-chords-tests.el b/test/lisp/use-package/use-package-chords-tests.el
index 3c3dc4b4fe0..2b7588dd807 100644
--- a/test/lisp/use-package/use-package-chords-tests.el
+++ b/test/lisp/use-package/use-package-chords-tests.el
@@ -158,4 +158,4 @@
;; no-update-autoloads: t
;; End:
-;;; use-package-tests.el ends here
+;;; use-package-chords-tests.el ends here
--
cgit v1.2.3