diff options
| author | Eli Zaretskii | 2023-01-01 05:47:47 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2023-01-01 05:47:47 -0500 |
| commit | 3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2 (patch) | |
| tree | bc5715fea2ff0ae8830afdee165dcaa22344f159 /lisp/use-package | |
| parent | df192b5153f9d0c9b371f28f6460a038cba8a987 (diff) | |
| parent | cae528457cb862dc886a34240c9d4c73035b6659 (diff) | |
| download | emacs-3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2.tar.gz emacs-3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2.zip | |
Merge from origin/emacs-29
cae528457c ; Add 2023 to copyright years.
b394359261 Improve documentation of 'isearch-open-overlay-temporary'
ab3210e709 Document 'use-package' in the 2 main manuals
# Conflicts:
# etc/refcards/ru-refcard.tex
# lib/explicit_bzero.c
# m4/explicit_bzero.m4
Diffstat (limited to 'lisp/use-package')
| -rw-r--r-- | lisp/use-package/bind-key.el | 2 | ||||
| -rw-r--r-- | lisp/use-package/use-package-bind-key.el | 2 | ||||
| -rw-r--r-- | lisp/use-package/use-package-core.el | 2 | ||||
| -rw-r--r-- | lisp/use-package/use-package-delight.el | 2 | ||||
| -rw-r--r-- | lisp/use-package/use-package-diminish.el | 2 | ||||
| -rw-r--r-- | lisp/use-package/use-package-ensure-system-package.el | 2 | ||||
| -rw-r--r-- | lisp/use-package/use-package-ensure.el | 2 | ||||
| -rw-r--r-- | lisp/use-package/use-package-jump.el | 2 | ||||
| -rw-r--r-- | lisp/use-package/use-package-lint.el | 2 | ||||
| -rw-r--r-- | lisp/use-package/use-package.el | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el index c3890c4d0aa..b216c668d83 100644 --- a/lisp/use-package/bind-key.el +++ b/lisp/use-package/bind-key.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; bind-key.el --- A simple way to manage personal keybindings -*- lexical-binding: t; -*- | 1 | ;;; bind-key.el --- A simple way to manage personal keybindings -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (c) 2012-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (c) 2012-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: John Wiegley <johnw@newartisans.com> | 5 | ;; Author: John Wiegley <johnw@newartisans.com> |
| 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> | 6 | ;; 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 4ebf54825c6..47eb066eba0 100644 --- a/lisp/use-package/use-package-bind-key.el +++ b/lisp/use-package/use-package-bind-key.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; use-package-bind-key.el --- Support for the :bind/:bind-keymap keywords -*- lexical-binding: t; -*- | 1 | ;;; use-package-bind-key.el --- Support for the :bind/:bind-keymap keywords -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2012-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2012-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: John Wiegley <johnw@newartisans.com> | 5 | ;; Author: John Wiegley <johnw@newartisans.com> |
| 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> | 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> |
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index 1dee08e55b2..379e119b60f 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; use-package-core.el --- A configuration macro for simplifying your .emacs -*- lexical-binding: t; -*- | 1 | ;;; use-package-core.el --- A configuration macro for simplifying your .emacs -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2012-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2012-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: John Wiegley <johnw@newartisans.com> | 5 | ;; Author: John Wiegley <johnw@newartisans.com> |
| 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> | 6 | ;; 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 41978b94f49..4f571cd3990 100644 --- a/lisp/use-package/use-package-delight.el +++ b/lisp/use-package/use-package-delight.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; use-package-delight.el --- Support for the :delight keyword -*- lexical-binding: t; -*- | 1 | ;;; use-package-delight.el --- Support for the :delight keyword -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2012-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2012-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: John Wiegley <johnw@newartisans.com> | 5 | ;; Author: John Wiegley <johnw@newartisans.com> |
| 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> | 6 | ;; 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 7fff93b0e9b..f683694dbd8 100644 --- a/lisp/use-package/use-package-diminish.el +++ b/lisp/use-package/use-package-diminish.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; use-package-diminish.el --- Support for the :diminish keyword -*- lexical-binding: t; -*- | 1 | ;;; use-package-diminish.el --- Support for the :diminish keyword -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2012-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2012-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: John Wiegley <johnw@newartisans.com> | 5 | ;; Author: John Wiegley <johnw@newartisans.com> |
| 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> | 6 | ;; 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 6681e5afb72..ef4afac1a0b 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 @@ | |||
| 1 | ;;; use-package-ensure-system-package.el --- auto install system packages -*- lexical-binding: t; -*- | 1 | ;;; use-package-ensure-system-package.el --- auto install system packages -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2022-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Justin Talbott <justin@waymondo.com> | 5 | ;; Author: Justin Talbott <justin@waymondo.com> |
| 6 | ;; Keywords: convenience, tools, extensions | 6 | ;; Keywords: convenience, tools, extensions |
diff --git a/lisp/use-package/use-package-ensure.el b/lisp/use-package/use-package-ensure.el index dae0312dbad..e0ea982594e 100644 --- a/lisp/use-package/use-package-ensure.el +++ b/lisp/use-package/use-package-ensure.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; use-package-ensure.el --- Support for the :ensure and :pin keywords -*- lexical-binding: t; -*- | 1 | ;;; use-package-ensure.el --- Support for the :ensure and :pin keywords -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2012-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2012-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: John Wiegley <johnw@newartisans.com> | 5 | ;; Author: John Wiegley <johnw@newartisans.com> |
| 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> | 6 | ;; 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 6fc52afd286..4fc5c3f0a8e 100644 --- a/lisp/use-package/use-package-jump.el +++ b/lisp/use-package/use-package-jump.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; use-package-jump.el --- Attempt to jump to a use-package declaration -*- lexical-binding: t; -*- | 1 | ;;; use-package-jump.el --- Attempt to jump to a use-package declaration -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2012-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2012-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: John Wiegley <johnw@newartisans.com> | 5 | ;; Author: John Wiegley <johnw@newartisans.com> |
| 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> | 6 | ;; 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 498213a76bf..9239d01148a 100644 --- a/lisp/use-package/use-package-lint.el +++ b/lisp/use-package/use-package-lint.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; use-package-lint.el --- Attempt to find errors in use-package declarations -*- lexical-binding: t; -*- | 1 | ;;; use-package-lint.el --- Attempt to find errors in use-package declarations -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2012-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2012-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: John Wiegley <johnw@newartisans.com> | 5 | ;; Author: John Wiegley <johnw@newartisans.com> |
| 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> | 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> |
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 0929696466b..7682468522d 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; use-package.el --- A configuration macro for simplifying your .emacs -*- lexical-binding: t; -*- | 1 | ;;; use-package.el --- A configuration macro for simplifying your .emacs -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2012-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2012-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: John Wiegley <johnw@newartisans.com> | 5 | ;; Author: John Wiegley <johnw@newartisans.com> |
| 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> | 6 | ;; Maintainer: John Wiegley <johnw@newartisans.com> |