diff options
| author | John Wiegley | 2022-11-17 08:10:15 -0800 |
|---|---|---|
| committer | GitHub | 2022-11-17 08:10:15 -0800 |
| commit | a6cbfdd8f154e2cc61da673f8e6d2ccda1fe7d7c (patch) | |
| tree | 0024a4930514b8673a5e25dbdfd4017d56ae408b | |
| parent | e42c8479ec68fd84e57809b5375a7e6fe270cb55 (diff) | |
| parent | efae6048dd2b534669f931d3992ddba52c31122b (diff) | |
| download | emacs-a6cbfdd8f154e2cc61da673f8e6d2ccda1fe7d7c.tar.gz emacs-a6cbfdd8f154e2cc61da673f8e6d2ccda1fe7d7c.zip | |
Merge pull request from skangas/package-requires
GitHub-reference: https://github.com/jwiegley/use-package/issues/1024
| -rw-r--r-- | lisp/use-package/bind-chord.el | 2 | ||||
| -rw-r--r-- | lisp/use-package/bind-key.el | 6 | ||||
| -rw-r--r-- | lisp/use-package/use-package.el | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lisp/use-package/bind-chord.el b/lisp/use-package/bind-chord.el index ada84ae6d1a..ed736a4b966 100644 --- a/lisp/use-package/bind-chord.el +++ b/lisp/use-package/bind-chord.el | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | ;; Keywords: convenience, tools, extensions | 6 | ;; Keywords: convenience, tools, extensions |
| 7 | ;; URL: https://github.com/jwiegley/use-package | 7 | ;; URL: https://github.com/jwiegley/use-package |
| 8 | ;; Version: 0.2.1 | 8 | ;; Version: 0.2.1 |
| 9 | ;; Package-Requires: ((bind-key "1.0") (key-chord "0.6")) | 9 | ;; Package-Requires: ((emacs "24.3") (bind-key "1.0") (key-chord "0.6")) |
| 10 | ;; Filename: bind-chord.el | 10 | ;; Filename: bind-chord.el |
| 11 | 11 | ||
| 12 | ;; This program is free software; you can redistribute it and/or modify | 12 | ;; This program is free software; you can redistribute it and/or modify |
diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el index 7e4c28770bb..3168f686a09 100644 --- a/lisp/use-package/bind-key.el +++ b/lisp/use-package/bind-key.el | |||
| @@ -6,7 +6,8 @@ | |||
| 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> | 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> |
| 7 | ;; Created: 16 Jun 2012 | 7 | ;; Created: 16 Jun 2012 |
| 8 | ;; Version: 2.4.1 | 8 | ;; Version: 2.4.1 |
| 9 | ;; Keywords: keys keybinding config dotemacs | 9 | ;; Package-Requires: ((emacs "24.3")) |
| 10 | ;; Keywords: keys keybinding config dotemacs extensions | ||
| 10 | ;; URL: https://github.com/jwiegley/use-package | 11 | ;; URL: https://github.com/jwiegley/use-package |
| 11 | 12 | ||
| 12 | ;; This program is free software; you can redistribute it and/or modify | 13 | ;; This program is free software; you can redistribute it and/or modify |
| @@ -516,8 +517,7 @@ function symbol (unquoted)." | |||
| 516 | (command-desc (get-binding-description command)) | 517 | (command-desc (get-binding-description command)) |
| 517 | (was-command-desc (and was-command | 518 | (was-command-desc (and was-command |
| 518 | (get-binding-description was-command))) | 519 | (get-binding-description was-command))) |
| 519 | (at-present-desc (get-binding-description at-present)) | 520 | (at-present-desc (get-binding-description at-present))) |
| 520 | ) | ||
| 521 | (let ((line | 521 | (let ((line |
| 522 | (format | 522 | (format |
| 523 | (format "%%-%ds%%-%ds%%s\n" (car bind-key-column-widths) | 523 | (format "%%-%ds%%-%ds%%s\n" (car bind-key-column-widths) |
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 04befb7e464..bafa0934a6d 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | ;; Created: 17 Jun 2012 | 7 | ;; Created: 17 Jun 2012 |
| 8 | ;; Version: 2.4.4 | 8 | ;; Version: 2.4.4 |
| 9 | ;; Package-Requires: ((emacs "24.3") (bind-key "2.4")) | 9 | ;; Package-Requires: ((emacs "24.3") (bind-key "2.4")) |
| 10 | ;; Keywords: dotemacs startup speed config package | 10 | ;; Keywords: dotemacs startup speed config package extensions |
| 11 | ;; URL: https://github.com/jwiegley/use-package | 11 | ;; URL: https://github.com/jwiegley/use-package |
| 12 | 12 | ||
| 13 | ;; This program is free software; you can redistribute it and/or modify | 13 | ;; This program is free software; you can redistribute it and/or modify |