fix emacs config

REVERT: a6e8564 Update README and NEWS to reflect most recent commit
REVERT: b59b4dc Merge pull request #1047 from jwiegley/johnw/revert
REVERT: 343c40d Fix another test
REVERT: 692e6a5 Fix normalize test for :hook
REVERT: cba23de Revert "Auto detect mode suffix in hook keyword"
REVERT: 77945e0 Merge pull request #1029 from joelpet/bind-which-key-cons
REVERT: 007a15b Allow describing commands when using :bind in use-package
REVERT: bcf0984 Merge pull request #1030 from skangas/merge-emacs
REVERT: ff8c572 Merge code changes from emacs.git
REVERT: ff2b0fd Merge new use-package manual from emacs.git
REVERT: 9078709 Merge pull request #1026 from skangas/revert-for-copyright
REVERT: d4e932e Merge pull request #1027 from skangas/revert-for-copyright2
REVERT: 221d0b2 Revert "Add: 'local' keyword"
REVERT: 634ceb7 Remove tests lacking a copyright assignment for now

git-subtree-dir: emacs.d/use-package
git-subtree-split: 9090080b15486c3e337be254226efe7e5fde4c99

.gitignore

@@ -19,3 +19,5 @@ emacs.d/eln-cache
 emacs.d/.dap-breakpoints
 emacs.d/eshell
 emacs.d/multisession/
+emacs.d/quelpa/
+emacs.d/tree-sitter/

emacs.d/init.el

@@ -91,13 +91,13 @@
 
   ;; Save history
   (setq savehist-additional-variables '(mark-ring
-					                              global-mark-ring
-					                              search-ring
-					                              regexp-search-ring
-					                              extended-command-history)
-	      savehist-autosave-interval 60
-	      enable-recursive-minibuffers t
-	      history-length 1000)
+                                        global-mark-ring
+                                        search-ring
+                                        regexp-search-ring
+                                        extended-command-history)
+        savehist-autosave-interval 60
+        enable-recursive-minibuffers t
+        history-length 1000)
   (savehist-mode 1)
 
   ;; smart tab behavior - indent or complete
@@ -108,13 +108,13 @@
 (progn
   (defun enable-flycheck (hook)
     (add-hook hook
-	            ;; Flycheck
-	            ;; http://www.flycheck.org/en/latest/index.html
-	            `(lambda ()
-		             (use-package flycheck
-		               :diminish flycheck-mode
-		               :config
-		               (flycheck-mode))))))
+              ;; Flycheck
+              ;; http://www.flycheck.org/en/latest/index.html
+              `(lambda ()
+                 (use-package flycheck
+                   :diminish flycheck-mode
+                   :config
+                   (flycheck-mode))))))
 
 
 ;; -- Theme/Style setup --
@@ -165,11 +165,11 @@
     :ensure helm
     :diminish helm-mode
     :bind (("M-x" . helm-M-x)
-	         ("C-x b" . helm-mini)
-	         ("C-x C-f" . helm-find-files))
+           ("C-x b" . helm-mini)
+           ("C-x C-f" . helm-find-files))
     :init
     (setq helm-move-to-line-cycle-in-source t
-	        helm-M-x-always-save-history t)
+          helm-M-x-always-save-history t)
     :config
     (helm-mode 1))
 
@@ -192,7 +192,7 @@
     ;; Use helm-projectile
     :config
     (setq projectile-completion-system 'helm
-	        projectile-switch-project-action 'helm-projectile)
+          projectile-switch-project-action 'helm-projectile)
     (helm-projectile-on))
 
   ;; Configure helm-projectile
@@ -208,10 +208,10 @@
     :diminish company-mode
     :init
     (setq company-idle-delay 0.2
-	        company-minimum-prefix-length 2
-	        company-require-match nil
-	        company-dabbrev-ignore-case nil
-	        company-dabbrev-downcase nil)
+          company-minimum-prefix-length 2
+          company-require-match nil
+          company-dabbrev-ignore-case nil
+          company-dabbrev-downcase nil)
     :config
     (global-company-mode))
 
@@ -222,7 +222,7 @@
     :defer 1
     :init
     (setq ws-butler-keep-whitespace-before-point nil
-	        require-final-newline t)
+          require-final-newline t)
     :config
     (ws-butler-global-mode +1))
 
@@ -301,7 +301,9 @@
   ;;      (forge--format repo "https://%h/%o/%n/blob/%r/%f%L"
   ;;                     `((?r . ,rev) (?f . ,file) (?L . ,highlight))))))
 
-
+  (add-hook 'before-save-hook
+            'whitespace-cleanup)
+  
   (use-package lsp-mode
     :config
     (setq lsp-enable-file-watchers nil)
@@ -321,7 +323,13 @@
     (setq lsp-enable-imenu nil)
     (setq lsp-enable-snippet nil)
     (setq read-process-output-max (* 1024 1024)) ;; 1MB
-    (setq lsp-idle-delay 0.5))
+    (setq lsp-idle-delay 0.5)
+    :hook ((rust-mode . lsp)
+           (rust-ts-mode . lsp)
+           (python-mode . lsp)
+           (python-ts-mode . lsp)           
+           (lsp-mode . lsp-enable-which-key-integration))
+    :commands lsp)
 
     (use-package lsp-ui
       :config
@@ -332,13 +340,14 @@
       (setq lsp-ui-doc-border (face-foreground 'default))
       (setq lsp-ui-sideline-enable t)
       (setq lsp-ui-sideline-show-code-actions t)
-      (setq lsp-ui-sideline-delay 0.05))
+      (setq lsp-ui-sideline-delay 0.05)
+      :commands lsp-ui-mode)
 
     (use-package helm-lsp
       :defer t
       :commands helm-lsp-workspace-symbol)
 
-    (use-package wgrep-ag)    
+    (use-package wgrep-ag)
     (use-package quelpa)
     (use-package quelpa-use-package)
 
@@ -349,8 +358,8 @@
       (require 'llm-ollama)
       (setopt ellama-keymap-prefix "C-c e")
       (setopt ellama-provider
-		          (make-llm-ollama
-		           :chat-model "deepseek-coder:6.7b" :embedding-model "deepseek-coder:6.7b")))
+              (make-llm-ollama
+               :chat-model "deepseek-coder:6.7b" :embedding-model "deepseek-coder:6.7b")))
 
     (use-package copilot
       :quelpa (copilot :fetcher github
@@ -360,12 +369,13 @@
       :init
       (add-hook 'prog-mode-hook 'copilot-mode))
 
-    (use-package tree-sitter
-      :init
-      (global-tree-sitter-mode)
-      (add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode))
-    (use-package tree-sitter-langs)
-    
+    (use-package treesit-auto
+      :custom
+      (treesit-auto-install 'prompt)
+      :config
+      (treesit-auto-add-to-auto-mode-alist 'all)
+      (global-treesit-auto-mode))
+
     ;; ;; Turn `C-]' into a sticky "super" modifier.
     (define-key local-function-key-map [?\C-\]] 'event-apply-super-modifier)
     ;; Move the global binding for C-] to C-s-]
@@ -375,7 +385,7 @@
     ;; tab to complete copilot completions
     (define-key copilot-completion-map (kbd "C-c <tab>") 'copilot-accept-completion)
     (define-key copilot-completion-map (kbd "C-c TAB") 'copilot-accept-completion)
-    (define-key copilot-completion-map (kbd "C-c n n") 'copilot-next-completion)        
+    (define-key copilot-completion-map (kbd "C-c n n") 'copilot-next-completion)
   )
 
 ;; -- Load layers --

emacs.d/layers/rust/init.el

@@ -1,9 +1,5 @@
 (use-package rust-mode
-  :defer t
-  :diminish rust-mode
+  :diminish rust-ts-mode
   :ensure t
-  :mode (("\\.rs\\'" . rust-mode))
   :init
-  (setq rust-format-on-save t)
-  :hook (rust-mode . (lambda ()
-                                 (lsp))))  ; or lsp-deferred
+  (setq rust-format-on-save t))

emacs.d/use-package/NEWS.md

@@ -1,14 +1,5 @@
 # Changes
 
-## 2.4.5
-
-This is mostly a bug-fix release:
-
-- When `:hook` is using in the form `(use-package foo :hook bar)`,
-  this is once again equivalent to
-  `(use-package foo :hook (bar . foo))` and no longer the same as
-  `(use-package foo :hook (bar . foo-mode))`.
-
 ## 2.4.4
 
 This release prepares for inclusion to GNU ELPA and includes no other changes

emacs.d/use-package/README.md

@@ -166,21 +166,7 @@ The `:bind` keyword takes either a cons or a list of conses:
          ("M-o w" . highlight-phrase)))
 ```
 
-Alternatively, the command name may be replaced with a cons `(desc . command)`,
-where `desc` is a string describing `command`, which is the name of a command
-to bind to:
-
-```elisp
-(use-package avy
-  :bind ("C-:" ("Jump to char" . avy-goto-char)
-         "M-g f" ("Jump to line" . avy-goto-line)))
-```
-
-These descriptions can be used by other code that deals with key bindings.
-For example, the GNU ELPA package which-key displays them when showing key
-bindings, instead of the plain command names.
-
-The `:commands` keyword takes either a symbol or a list of symbols.
+The `:commands` keyword likewise takes either a symbol or a list of symbols.
 
 **NOTE**: inside strings, special keys like `tab` or `F1`-`Fn` have to be written inside angle brackets, e.g. `"C-<up>"`.
 Standalone special keys (and some combinations) can be written in square brackets, e.g. `[tab]` instead of `"<tab>"`. The syntax for the keybindings is similar to
@@ -401,10 +387,13 @@ string `"%PDF"`.
 
 ## Hooks
 
-The `:hook` keyword allows adding functions onto package hooks. The
-following are equivalent:
+The `:hook` keyword allows adding functions onto package hooks. Thus,
+all of the following are equivalent:
 
 ``` elisp
+(use-package company
+  :hook prog-mode)
+
 (use-package company
   :hook (prog-mode . company-mode))
 
@@ -414,10 +403,13 @@ following are equivalent:
   (add-hook 'prog-mode-hook #'company-mode))
 ```
 
-And likewise, when multiple hooks should be applied, all of the
-following are also equivalent:
+And likewise, when multiple hooks should be applied, the following are also
+equivalent:
 
 ``` elisp
+(use-package company
+  :hook (prog-mode text-mode))
+
 (use-package company
   :hook ((prog-mode text-mode) . company-mode))
 
@@ -425,15 +417,6 @@ following are also equivalent:
   :hook ((prog-mode . company-mode)
          (text-mode . company-mode)))
 
-(use-package company
-  :hook (prog-mode . company-mode)
-  :hook (text-mode . company-mode))
-
-(use-package company
-  :hook
-  (prog-mode . company-mode)
-  (text-mode . company-mode))
-
 (use-package company
   :commands company-mode
   :init
@@ -441,8 +424,8 @@ following are also equivalent:
   (add-hook 'text-mode-hook #'company-mode))
 ```
 
-When using `:hook`, omit the "-hook" suffix if you specify the hook
-explicitly, as this is appended by default. For example, the following
+When using `:hook` omit the "-hook" suffix if you specify the hook
+explicitly, as this is appended by default. For example the following
 code will not work as it attempts to add to the `prog-mode-hook-hook`
 which does not exist:
 

emacs.d/use-package/bind-key.el

@@ -10,29 +10,29 @@
 ;; Keywords: keys keybinding config dotemacs extensions
 ;; URL: https://github.com/jwiegley/use-package
 
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
-;; If you have lots of keybindings set in your init 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 problem.
+;; 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
+;; problem.
+;;
+;; Bind keys as follows in your .emacs:
 ;;
-;; Bind keys as follows in your init file:
+;;   (require 'bind-key)
 ;;
 ;;   (bind-key "C-c x" 'my-ctrl-c-x-command)
 ;;
@@ -95,8 +95,6 @@
 ;; This display will tell you if you've overridden a default keybinding, and
 ;; what the default was.  Also, it will tell you if the key was rebound after
 ;; your binding it with `bind-key', and what it was rebound it to.
-;;
-;; See the `use-package' info manual for more information.
 
 ;;; Code:
 
@@ -105,10 +103,7 @@
 
 (defgroup bind-key nil
   "A simple way to manage personal keybindings."
-  :group 'keyboard
-  :group 'convenience
-  :link '(emacs-commentary-link :tag "Commentary" "bind-key.el")
-  :version "29.1")
+  :group 'emacs)
 
 (defcustom bind-key-column-widths '(18 . 40)
   "Width of columns in `describe-personal-keybindings'."
@@ -117,7 +112,8 @@
 
 (defcustom bind-key-segregation-regexp
   "\\`\\(\\(C-[chx] \\|M-[gso] \\)\\([CM]-\\)?\\|.+-\\)"
-  "Regexp used by \\[describe-personal-keybindings] to divide key sets."
+  "Regular expression used to divide key sets in the output from
+\\[describe-personal-keybindings]."
   :type 'regexp
   :group 'bind-key)
 
@@ -132,18 +128,7 @@
   "Keymap for `override-global-mode'.")
 
 (define-minor-mode override-global-mode
-  "A minor mode for allowing keybindings to override other modes.
-The main purpose of this mode is to simplify bindings keys in
-such a way that they take precedence over other modes.
-
-To achieve this, the keymap `override-global-map' is added to
-`emulation-mode-map-alists', which makes it take precedence over
-keymaps in `minor-mode-map-alist'.  Thereby, key bindings get an
-even higher precedence than global key bindings defined with
-`keymap-global-set' (or, in Emacs 28 or older, `global-set-key').
-
-The macro `bind-key*' (which see) provides a convenient way to
-add keys to that keymap."
+  "A minor mode so that keymap settings override other modes."
   :init-value t
   :lighter "")
 
@@ -162,12 +147,11 @@ Elements have the form ((KEY . [MAP]) CMD ORIGINAL-CMD)")
   "Bind KEY-NAME to COMMAND in KEYMAP (`global-map' if not passed).
 
 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 the documentation
-of `edmacro-mode' for details.
+`define-key'. Or it may be a string to be interpreted as
+spelled-out keystrokes, e.g., `C-c C-z'. See documentation of
+`edmacro-mode' for details.
 
-COMMAND must be an interactive function, lambda form, or a cons
-`(STRING . DEFN)'.
+COMMAND must be an interactive function or lambda form.
 
 KEYMAP, if present, should be a keymap variable or symbol.
 For example:
@@ -441,11 +425,6 @@ function symbol (unquoted)."
 
 ;;;###autoload
 (defmacro bind-keys* (&rest args)
-  "Bind multiple keys at once, in `override-global-map'.
-Accepts the same keyword arguments as `bind-keys' (which see).
-
-This binds keys in such a way that bindings are not overridden by
-other modes.  See `override-global-mode'."
   (macroexp-progn (bind-keys-form args 'override-global-map)))
 
 (defun get-binding-description (elem)

emacs.d/use-package/doclicense.texi

@@ -1,505 +0,0 @@
-@c The GNU Free Documentation License.
-@center Version 1.3, 3 November 2008
-
-@c This file is intended to be included within another document,
-@c hence no sectioning command or @node.
-
-@display
-Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-@uref{https://fsf.org/}
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-@end display
-
-@enumerate 0
-@item
-PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document @dfn{free} in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
-
-This License is a kind of ``copyleft'', which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-@item
-APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License.  Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The ``Document'', below,
-refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as ``you''.  You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-A ``Modified Version'' of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A ``Secondary Section'' is a named appendix or a front-matter section
-of the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall
-subject (or to related matters) and contains nothing that could fall
-directly within that overall subject.  (Thus, if the Document is in
-part a textbook of mathematics, a Secondary Section may not explain
-any mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The ``Invariant Sections'' are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.  If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant.  The Document may contain zero
-Invariant Sections.  If the Document does not identify any Invariant
-Sections then there are none.
-
-The ``Cover Texts'' are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.  A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A ``Transparent'' copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text.  A copy that is not ``Transparent'' is called ``Opaque''.
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, La@TeX{} input
-format, SGML or XML using a publicly available
-DTD, and standard-conforming simple HTML,
-PostScript or PDF designed for human modification.  Examples
-of transparent image formats include PNG, XCF and
-JPG@.  Opaque formats include proprietary formats that can be
-read and edited only by proprietary word processors, SGML or
-XML for which the DTD and/or processing tools are
-not generally available, and the machine-generated HTML,
-PostScript or PDF produced by some word processors for
-output purposes only.
-
-The ``Title Page'' means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, ``Title Page'' means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-The ``publisher'' means any person or entity that distributes copies
-of the Document to the public.
-
-A section ``Entitled XYZ'' means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as ``Acknowledgements'',
-``Dedications'', ``Endorsements'', or ``History''.)  To ``Preserve the Title''
-of such a section when you modify the Document means that it remains a
-section ``Entitled XYZ'' according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document.  These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-@item
-VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-@item
-COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-@item
-MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-@enumerate A
-@item
-Use in the Title Page (and on the covers, if any) a title distinct
-from that of the Document, and from those of previous versions
-(which should, if there were any, be listed in the History section
-of the Document).  You may use the same title as a previous version
-if the original publisher of that version gives permission.
-
-@item
-List on the Title Page, as authors, one or more persons or entities
-responsible for authorship of the modifications in the Modified
-Version, together with at least five of the principal authors of the
-Document (all of its principal authors, if it has fewer than five),
-unless they release you from this requirement.
-
-@item
-State on the Title page the name of the publisher of the
-Modified Version, as the publisher.
-
-@item
-Preserve all the copyright notices of the Document.
-
-@item
-Add an appropriate copyright notice for your modifications
-adjacent to the other copyright notices.
-
-@item
-Include, immediately after the copyright notices, a license notice
-giving the public permission to use the Modified Version under the
-terms of this License, in the form shown in the Addendum below.
-
-@item
-Preserve in that license notice the full lists of Invariant Sections
-and required Cover Texts given in the Document's license notice.
-
-@item
-Include an unaltered copy of this License.
-
-@item
-Preserve the section Entitled ``History'', Preserve its Title, and add
-to it an item stating at least the title, year, new authors, and
-publisher of the Modified Version as given on the Title Page.  If
-there is no section Entitled ``History'' in the Document, create one
-stating the title, year, authors, and publisher of the Document as
-given on its Title Page, then add an item describing the Modified
-Version as stated in the previous sentence.
-
-@item
-Preserve the network location, if any, given in the Document for
-public access to a Transparent copy of the Document, and likewise
-the network locations given in the Document for previous versions
-it was based on.  These may be placed in the ``History'' section.
-You may omit a network location for a work that was published at
-least four years before the Document itself, or if the original
-publisher of the version it refers to gives permission.
-
-@item
-For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve
-the Title of the section, and preserve in the section all the
-substance and tone of each of the contributor acknowledgements and/or
-dedications given therein.
-
-@item
-Preserve all the Invariant Sections of the Document,
-unaltered in their text and in their titles.  Section numbers
-or the equivalent are not considered part of the section titles.
-
-@item
-Delete any section Entitled ``Endorsements''.  Such a section
-may not be included in the Modified Version.
-
-@item
-Do not retitle any existing section to be Entitled ``Endorsements'' or
-to conflict in title with any Invariant Section.
-
-@item
-Preserve any Warranty Disclaimers.
-@end enumerate
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled ``Endorsements'', provided it contains
-nothing but endorsements of your Modified Version by various
-parties---for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-@item
-COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled ``History''
-in the various original documents, forming one section Entitled
-``History''; likewise combine any sections Entitled ``Acknowledgements'',
-and any sections Entitled ``Dedications''.  You must delete all
-sections Entitled ``Endorsements.''
-
-@item
-COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-@item
-AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an ``aggregate'' if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included in an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
-
-@item
-TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers.  In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled ``Acknowledgements'',
-``Dedications'', or ``History'', the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-@item
-TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense, or distribute it is void, and
-will automatically terminate your rights under this License.
-
-However, if you cease all violation of this License, then your license
-from a particular copyright holder is reinstated (a) provisionally,
-unless and until the copyright holder explicitly and finally
-terminates your license, and (b) permanently, if the copyright holder
-fails to notify you of the violation by some reasonable means prior to
-60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, receipt of a copy of some or all of the same material does
-not give you any rights to use it.
-
-@item
-FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-@uref{https://www.gnu.org/licenses/}.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License ``or any later version'' applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.  If the Document
-specifies that a proxy can decide which future versions of this
-License can be used, that proxy's public statement of acceptance of a
-version permanently authorizes you to choose that version for the
-Document.
-
-@item
-RELICENSING
-
-``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any
-World Wide Web server that publishes copyrightable works and also
-provides prominent facilities for anybody to edit those works.  A
-public wiki that anybody can edit is an example of such a server.  A
-``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the
-site means any set of copyrightable works thus published on the MMC
-site.
-
-``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0
-license published by Creative Commons Corporation, a not-for-profit
-corporation with a principal place of business in San Francisco,
-California, as well as future copyleft versions of that license
-published by that same organization.
-
-``Incorporate'' means to publish or republish a Document, in whole or
-in part, as part of another Document.
-
-An MMC is ``eligible for relicensing'' if it is licensed under this
-License, and if all works that were first published under this License
-somewhere other than this MMC, and subsequently incorporated in whole
-or in part into the MMC, (1) had no cover texts or invariant sections,
-and (2) were thus incorporated prior to November 1, 2008.
-
-The operator of an MMC Site may republish an MMC contained in the site
-under CC-BY-SA on the same site at any time before August 1, 2009,
-provided the MMC is eligible for relicensing.
-
-@end enumerate
-
-@page
-@heading ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-@smallexample
-@group
-  Copyright (C)  @var{year}  @var{your name}.
-  Permission is granted to copy, distribute and/or modify this document
-  under the terms of the GNU Free Documentation License, Version 1.3
-  or any later version published by the Free Software Foundation;
-  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
-  Texts.  A copy of the license is included in the section entitled ``GNU
-  Free Documentation License''.
-@end group
-@end smallexample
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with@dots{}Texts.''@: line with this:
-
-@smallexample
-@group
-    with the Invariant Sections being @var{list their titles}, with
-    the Front-Cover Texts being @var{list}, and with the Back-Cover Texts
-    being @var{list}.
-@end group
-@end smallexample
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
-
-@c Local Variables:
-@c ispell-local-pdict: "ispell-dict"
-@c End:

emacs.d/use-package/docstyle.texi

@@ -1,19 +0,0 @@
-@c Emacs documentation style settings
-@documentencoding UTF-8
-@c These two require Texinfo 5.0 or later, so we use the older
-@c equivalent @set variables supported in 4.11 and hence
-@ignore
-@codequotebacktick on
-@codequoteundirected on
-@end ignore
-@set txicodequoteundirected
-@set txicodequotebacktick
-@iftex
-@c It turns out TeX sometimes fails to hyphenate, so we help it here
-@hyphenation{au-to-mat-i-cal-ly}
-@hyphenation{spec-i-fied}
-@hyphenation{work-a-round}
-@hyphenation{work-a-rounds}
-@hyphenation{un-marked}
-@hyphenation{dic-tion-ary}
-@end iftex

emacs.d/use-package/use-package-bind-key.el

@@ -5,20 +5,18 @@
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Maintainer: John Wiegley <johnw@newartisans.com>
 
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -26,10 +24,6 @@
 ;; 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.
-;;
-;; These keywords are made available by default by requiring `use-package'.
-;;
-;; See the `use-package' info manual for more information.
 
 ;;; Code:
 
@@ -38,14 +32,15 @@
 
 ;;;###autoload
 (defun use-package-autoload-keymap (keymap-symbol package override)
-  "Load PACKAGE and bind key sequence invoking this function to KEYMAP-SYMBOL.
-Then simulate pressing the same key sequence a again, so that the
-next key pressed is routed to the newly loaded keymap.
+  "Loads PACKAGE and then binds the key sequence used to invoke
+this function to KEYMAP-SYMBOL. It then simulates pressing the
+same key sequence a again, so that the next key pressed is routed
+to the newly loaded keymap.
 
-This function supports use-package's :bind-keymap keyword.  It
+This function supports use-package's :bind-keymap keyword. It
 works by binding the given key sequence to an invocation of this
-function for a particular keymap.  The keymap is expected to be
-defined by the package.  In this way, loading the package is
+function for a particular keymap. The keymap is expected to be
+defined by the package. In this way, loading the package is
 deferred until the prefix key sequence is pressed."
   (if (not (require package nil t))
       (use-package-error (format "Cannot load package.el: %s" package))
@@ -69,17 +64,8 @@ deferred until the prefix key sequence is pressed."
   (let ((arg args)
         args*)
     (while arg
-      (let ((x (car arg))
-            (y (cadr arg)))
+      (let ((x (car arg)))
         (cond
-         ;; (KEY DESC . COMMAND), i.e. (KEY . (DESC . COMMAND))
-         ((and (or (stringp x)
-                   (vectorp x))
-               (consp y)
-               (stringp (car y))
-               (or (use-package-recognize-function (cdr y) t #'stringp)))
-          (setq args* (nconc args* (list (cons x y))))
-          (setq arg (cddr arg)))
          ;; (KEY . COMMAND)
          ((and (consp x)
                (or (stringp (car x))

emacs.d/use-package/use-package-core.el

@@ -5,27 +5,29 @@
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Maintainer: John Wiegley <johnw@newartisans.com>
 
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
-;; This file contains the core implementation of the `use-package'
-;; macro.
+;; The `use-package' declaration macro allows you to isolate package
+;; configuration in your ".emacs" in a way that is performance-oriented and,
+;; well, just tidy.  I created it because I have over 80 packages that I use
+;; in Emacs, and things were getting difficult to manage.  Yet with this
+;; utility my total load time is just under 1 second, with no loss of
+;; functionality!
 ;;
-;; See the `use-package' info manual for more information.
+;; Please see README.md from the same repository for documentation.
 
 ;;; Code:
 
@@ -61,9 +63,7 @@
 
 (defgroup use-package nil
   "A `use-package' declaration for simplifying your `.emacs'."
-  :group 'initialization
-  :link '(custom-manual "(use-package) Top")
-  :version "29.1")
+  :group 'startup)
 
 (defconst use-package-version "2.4.4"
   "This version of `use-package'.")
@@ -100,7 +100,8 @@
     :load
     ;; This must occur almost last; the only forms which should appear after
     ;; are those that must happen directly after the config forms.
-    :config)
+    :config
+    :local)
   "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
@@ -963,18 +964,10 @@ If RECURSED is non-nil, recurse into sublists."
 
 (defun use-package-autoloads-mode (_name _keyword args)
   (mapcar
-   #'(lambda (x)
-       (cond
-        ((consp (cdr x))
-         (cons (cddr x) 'command))
-        ((consp x)
-         (cons (cdr x) 'command))))
+   #'(lambda (x) (cons (cdr x) 'command))
    (cl-remove-if-not #'(lambda (x)
-                         (or (and (consp x)
-                                  (use-package-non-nil-symbolp (cdr x)))
-                             (and (consp x)
-                                  (consp (cdr x))
-                                  (use-package-non-nil-symbolp (cddr x)))))
+                         (and (consp x)
+                              (use-package-non-nil-symbolp (cdr x))))
                      args)))
 
 (defun use-package-handle-mode (name alist args rest state)
@@ -1305,7 +1298,10 @@ meaning:
                               (setq every nil)))
                           every))))
          #'use-package-recognize-function
-         name label arg))))
+         (if (string-suffix-p "-mode" (symbol-name name))
+             name
+           (intern (concat (symbol-name name) "-mode")))
+         label arg))))
 
 (defalias 'use-package-autoloads/:hook 'use-package-autoloads-mode)
 
@@ -1584,6 +1580,31 @@ no keyword implies `:all'."
      (when use-package-compute-statistics
        `((use-package-statistics-gather :config ',name t))))))
 
+;;;; :local
+
+(defun use-package-normalize/:local (name keyword args)
+  (let ((first-arg-name (symbol-name (caar args))))
+    (if (not (string-suffix-p "-hook" first-arg-name))
+        (let* ((sym-name (symbol-name name))
+               (addition (if (string-suffix-p "-mode" sym-name)
+                             "-hook"
+                           "-mode-hook"))
+               (hook (intern (concat sym-name addition))))
+          `((,hook . ,(use-package-normalize-forms name keyword args))))
+      (cl-loop for (hook . code) in args
+               collect `(,hook . ,(use-package-normalize-forms name keyword code))))))
+
+(defun use-package-handler/:local (name _keyword arg rest state)
+  (let* ((body (use-package-process-keywords name rest state)))
+    (use-package-concat
+     body
+     (cl-loop for (hook . code) in arg
+              for func-name = (intern (concat "use-package-func/" (symbol-name hook)))
+              collect (progn
+                        (push 'progn code)
+                        `(defun ,func-name () ,code))
+              collect `(add-hook ',hook ',func-name)))))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; The main macro
@@ -1614,8 +1635,8 @@ no keyword implies `:all'."
 (defmacro use-package (name &rest args)
   "Declare an Emacs package by specifying a group of configuration options.
 
-For the full documentation, see Info node `(use-package) top'.
-Usage:
+For full documentation, please see the README file that came with
+this file.  Usage:
 
   (use-package package-name
      [:keyword [option]]...)
@@ -1652,15 +1673,12 @@ Usage:
                  `:magic-fallback', or `:interpreter'.  This can be an integer,
                  to force loading after N seconds of idle time, if the package
                  has not already been loaded.
+:after           Delay the use-package declaration until after the named modules
+                 have loaded. Once load, it will be as though the use-package
+                 declaration (without `:after') had been seen at that moment.
 :demand          Prevent the automatic deferred loading introduced by constructs
                  such as `:bind' (see `:defer' for the complete list).
 
-:after           Delay the effect of the use-package declaration
-                 until after the named libraries have loaded.
-                 Before they have been loaded, no other keyword
-                 has any effect at all, and once they have been
-                 loaded it is as if `:after' was not specified.
-
 :if EXPR         Initialize and load only if EXPR evaluates to a non-nil value.
 :disabled        The package is ignored completely if this keyword is present.
 :defines         Declare certain variables to silence the byte-compiler.

emacs.d/use-package/use-package-delight.el

@@ -5,28 +5,23 @@
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Maintainer: John Wiegley <johnw@newartisans.com>
 
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
-;; Provides support for the :delight keyword, which is made available
-;; by default by requiring `use-package'.  Using it requires the
-;; `delight' package to be installed (available on GNU ELPA).
-;;
-;; See the `use-package' info manual for more information.
+;; Provides support for the :delight keyword, which is made available by
+;; default by requiring `use-package'.
 
 ;;; Code:
 

emacs.d/use-package/use-package-diminish.el

@@ -5,28 +5,23 @@
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Maintainer: John Wiegley <johnw@newartisans.com>
 
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
-;; Provides support for the :diminish keyword, which is made available
-;; by default by requiring `use-package'.  Using it requires the
-;; `diminish' package to be installed (available on GNU ELPA).
-;;
-;; See the `use-package' info manual for more information.
+;; Provides support for the :diminish keyword, which is made available by
+;; default by requiring `use-package'.
 
 ;;; Code:
 

emacs.d/use-package/use-package-ensure-system-package.el

@@ -9,29 +9,24 @@
 ;; Package-Requires: ((use-package "2.1") (system-packages "1.0.4"))
 ;; Filename: use-package-ensure-system-package.el
 
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
-
+;;
 ;; The `:ensure-system-package` keyword allows you to ensure system
-;; binaries exist alongside your `use-package` declarations.  Using it
-;; requires the `system-packages' package to be installed (available
-;; on GNU ELPA).
+;; binaries exist alongside your `use-package` declarations.
 ;;
-;; See the `use-package' info manual for more information.
 
 ;;; Code:
 
@@ -42,10 +37,10 @@
   (declare-function system-packages-get-command "system-packages"))
 
 (defvar use-package-ensure-system-package--custom-packages '()
-  "List of commands used to install custom packages.")
+  "List of custom packages installed.")
 
 (defun use-package-ensure-system-package-consify (arg)
-  "Turn ARG into a cons of the form (PACKAGE-NAME . INSTALL-COMMAND')."
+  "Turn ARG into a cons of (`package-name' . `install-command')."
   (cond
    ((stringp arg)
     (cons arg `(system-packages-install ,arg)))
@@ -64,15 +59,13 @@
 	    `(system-packages-install ,(symbol-name (cdr arg)))))))))
 
 (defun use-package-ensure-system-package-update-custom-packages ()
-  "Update custom packages (not installed by system package manager).
-Run the same commands used for installing them."
   (interactive)
   (dolist (cmd use-package-ensure-system-package--custom-packages)
     (async-shell-command cmd)))
 
 ;;;###autoload
 (defun use-package-normalize/:ensure-system-package (_name-symbol keyword args)
-  "Turn ARGS into a list of conses of the form (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
@@ -82,7 +75,7 @@ Run the same commands used for installing them."
         (list (use-package-ensure-system-package-consify arg)))))))
 
 (defun use-package-ensure-system-package-exists? (file-or-exe)
-  "If FILE-OR-EXE is a string, ensure the file path exists.
+  "If variable is a string, ensure the file path exists.
 If it is a symbol, ensure the binary exist."
   (if (stringp file-or-exe)
       (file-exists-p file-or-exe)

emacs.d/use-package/use-package-ensure.el

@@ -5,27 +5,23 @@
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Maintainer: John Wiegley <johnw@newartisans.com>
 
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
-;; Provides support for the :ensure and :pin keywords, which are made
-;; available by default by requiring `use-package'.
-;;
-;; See the `use-package' info manual for more information.
+;; Provides support for the :ensure and :pin keywords, which is made available
+;; by default by requiring `use-package'.
 
 ;;; Code:
 
@@ -34,9 +30,7 @@
 
 (defgroup use-package-ensure nil
   "Support for :ensure and :pin keywords in `use-package' declarations."
-  :group 'use-package
-  :link '(custom-manual "(use-package) Installing packages")
-  :version "29.1")
+  :group 'use-package)
 
 (eval-when-compile
   (declare-function package-installed-p "package")

emacs.d/use-package/use-package-jump.el

@@ -5,29 +5,25 @@
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Maintainer: John Wiegley <johnw@newartisans.com>
 
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
-;; Provides the command `M-x use-package-jump-to-package-form'.  However, it
+;; 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 autoloaded, it will not work.
+;; initialization.  If it was delay-loaded, it will not work.
 ;; Improvements are needed.
-;;
-;; See the `use-package' info manual for more information.
 
 ;;; Code:
 

emacs.d/use-package/use-package-lint.el

@@ -5,26 +5,22 @@
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Maintainer: John Wiegley <johnw@newartisans.com>
 
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
 ;; Provides the command `M-x use-package-lint'.
-;;
-;; See the `use-package' info manual for more information.
 
 ;;; Code:
 

emacs.d/use-package/use-package-tests.el

@@ -1,21 +1,19 @@
 ;;; use-package-tests.el --- Tests for use-package.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2014-2022 Free Software Foundation, Inc.
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
 
 ;;; Code:
 
@@ -575,7 +573,7 @@
 
 (ert-deftest use-package-test/:bind-1 ()
   (match-expansion
-   (use-package foo :bind ("C-k" . key1) ("C-u" ("Key 2" . key2)))
+   (use-package foo :bind ("C-k" . key1) ("C-u" . key2))
    `(progn
       (unless
           (fboundp 'key1)
@@ -585,11 +583,11 @@
         (autoload #'key2 "foo" nil t))
       (bind-keys :package foo
                  ("C-k" . key1)
-                 ("C-u" "Key 2" . key2)))))
+                 ("C-u" . key2)))))
 
 (ert-deftest use-package-test/:bind-2 ()
   (match-expansion
-   (use-package foo :bind (("C-k" . key1) ("C-u" ("Key 2" . key2))))
+   (use-package foo :bind (("C-k" . key1) ("C-u" . key2)))
    `(progn
       (unless (fboundp 'key1)
         (autoload #'key1 "foo" nil t))
@@ -597,7 +595,7 @@
         (autoload #'key2 "foo" nil t))
       (bind-keys :package foo
                  ("C-k" . key1)
-                 ("C-u" "Key 2" . key2)))))
+                 ("C-u" . key2)))))
 
 (ert-deftest use-package-test/:bind-3 ()
   (match-expansion
@@ -987,7 +985,7 @@
                          'foopkg :hook args)))
     (should-error (norm nil))
     (should (equal (norm '(bar))
-                   '((bar . foopkg))))
+                   '((bar . foopkg-mode))))
     (should (equal (norm '((bar . foopkg)))
                    '((bar . foopkg))))
     (should (equal (norm '((bar . baz)))
@@ -995,9 +993,9 @@
     (should (equal (norm '(((bar baz) . quux)))
                    '(((bar baz) . quux))))
     (should (equal (norm '(bar baz))
-                   '(((bar baz) . foopkg))))
+                   '(((bar baz) . foopkg-mode))))
     (should (equal (norm '((bar baz) (quux bow)))
-                   '(((bar baz) . foopkg) ((quux bow) . foopkg))))
+                   '(((bar baz) . foopkg-mode) ((quux bow) . foopkg-mode))))
     (should (equal (norm '((bar . baz) (quux . bow)))
                    '((bar . baz) (quux . bow))))
     (should (equal (norm '(((bar1 bar2) . baz) ((quux1 quux2) . bow)))
@@ -1507,6 +1505,37 @@
              (config)
              t))))))
 
+(ert-deftest use-package-test/pre-post-hooks-with-:config ()
+  (let ((use-package-inject-hooks t))
+    (match-expansion
+     (use-package foo :config (config))
+     `(progn
+       (when
+           (run-hook-with-args-until-failure 'use-package--foo--pre-init-hook)
+         (run-hooks 'use-package--foo--post-init-hook))
+       (require 'foo nil nil)
+       (when
+           (run-hook-with-args-until-failure 'use-package--foo--pre-config-hook)
+         (config)
+         (run-hooks 'use-package--foo--post-config-hook))
+       t))))
+
+(ert-deftest use-package-test/pre-post-hooks-without-:config ()
+  ;; https://github.com/jwiegley/use-package/issues/785
+  (let ((use-package-inject-hooks t))
+    (match-expansion
+     (use-package foo)
+     `(progn
+        (when
+            (run-hook-with-args-until-failure 'use-package--foo--pre-init-hook)
+          (run-hooks 'use-package--foo--post-init-hook))
+        (require 'foo nil nil)
+        (when
+            (run-hook-with-args-until-failure 'use-package--foo--pre-config-hook)
+          t
+          (run-hooks 'use-package--foo--post-config-hook))
+        t))))
+
 (ert-deftest use-package-test-normalize/:diminish ()
   (should (equal (use-package-normalize-diminish 'foopkg :diminish nil)
                  '(foopkg-mode)))
@@ -1926,9 +1955,9 @@
      (use-package nonexistent
        :hook lisp-mode)
      `(when (locate-library nonexistent)
-        (unless (fboundp 'nonexistent)
-          (autoload #'nonexistent "nonexistent" nil t))
-        (add-hook 'lisp-mode-hook #'nonexistent)))))
+        (unless (fboundp 'nonexistent-mode)
+          (autoload #'nonexistent-mode "nonexistent" nil t))
+        (add-hook 'lisp-mode-hook #'nonexistent-mode)))))
 
 (ert-deftest bind-key/:prefix-map ()
   (match-expansion

emacs.d/use-package/use-package.el

@@ -10,31 +10,29 @@
 ;; Keywords: dotemacs startup speed config package extensions
 ;; URL: https://github.com/jwiegley/use-package
 
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
 ;; The `use-package' declaration macro allows you to isolate package
-;; configuration in your init file in a way that is
-;; performance-oriented and, well, just tidy.  I created it because I
-;; have over 80 packages that I use in Emacs, and things were getting
-;; difficult to manage.  Yet with this utility my total load time is
-;; just under 1 second, with no loss of functionality!
+;; configuration in your ".emacs" in a way that is performance-oriented and,
+;; well, just tidy.  I created it because I have over 80 packages that I use
+;; in Emacs, and things were getting difficult to manage.  Yet with this
+;; utility my total load time is just under 1 second, with no loss of
+;; functionality!
 ;;
-;; See the `use-package' info manual for more information.
+;; Please see README.md from the same repository for documentation.
 
 ;;; Code:
 

gitconfig

@@ -1,20 +1,16 @@
 [user]
   name = brettlangdon
   email = me@brett.is
-  signingkey = A70042D88B95AA2B
-
+  signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPG5FWUNREaSQ7t/vyc+jNaiq4nmaNC07535tnpN3hCj
 [credential]
   helper = store
-  
 [core]
   excludesfile = /Users/brettlangdon/.gitignore_global
   editor = emacs -nw -Q
   pager = delta --dark --keep-plus-minus-markers
   whitespace = trailing-space,space-before-tab
-  
 [interactive]
-    diffFilter = delta --color-only
-
+  diffFilter = delta --color-only
 [alias]
   st = status
   d = diff --color --minimal
@@ -29,33 +25,36 @@
 [grep]
   lineNumber = true
 [commit]
-	gpgsign = true
+  gpgsign = true
 [color]
-        ui = true
+  ui = true
 [color "diff-highlight"]
-       oldNormal = red bold
-       oldHighlight = red bold 52
-       newNormal = green bold
-       newHighlight = green bold 22
+  oldNormal = red bold
+  oldHighlight = red bold 52
+  newNormal = green bold
+  newHighlight = green bold 22
 [color "diff"]
-       meta = 227
-       frag = magenta bold
-       commit = 227 bold
-       old = red bold
-       new = green bold
-       whitespace = red reverse
+  meta = 227
+  frag = magenta bold
+  commit = 227 bold
+  old = red bold
+  new = green bold
+  whitespace = red reverse
 [gpg]
-        program = gpg
+  format = ssh
+[gpg "ssh"]
+  program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
+	allowedSignersFile = "/Users/brettlangdon/.config/git/allowed_signers"
 [tag]
-	forceSignAnnotated = true
+  forceSignAnnotated = true
 [pull]
-	rebase = true
+  rebase = true
 [init]
-	defaultBranch = main
+  defaultBranch = main
 [filter "lfs"]
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-	required = true
+  clean = git-lfs clean -- %f
+  smudge = git-lfs smudge -- %f
+  process = git-lfs filter-process
+  required = true
 [github]
-	user = brettlangdon
+  user = brettlangdon