From 5d7c749d1e0830fe5fc5c0ac7cb99c3dece78f17 Mon Sep 17 00:00:00 2001
From: Gerard Vermeulen <gerard.vermeulen@neel.cnrs.fr>
Date: Sun, 30 Oct 2022 18:49:47 +0100
Subject: [PATCH] Update to Emacs-29.0.50 and Emacs-28.2

---
 README.org | 63 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/README.org b/README.org
index d59f011..136396d 100644
--- a/README.org
+++ b/README.org
@@ -211,21 +211,23 @@ The [[info:emacs#Init File][init file (info)]] does not load the ~custom-file~ a
        ("nongnu" . "https://elpa.nongnu.org/nongnu/")))
    ;; Pin packages to GNU ELPA for info or stability.
    '(package-pinned-packages
-     '((auctex . "gnu")
-       (compat . "gnu")
-       (consult . "gnu-devel")
-       (eglot . "gnu-devel")
-       (embark . "gnu-devel")
-       (embark-consult . "gnu-devel")
-       (engrave-faces . "gnu")
-       (marginalia . "gnu-devel")
-       (org . "gnu-devel")
-       (python . "gnu-devel")
-       (queue . "gnu")
-       (rainbow-mode . "gnu")
-       (spinner . "gnu")
-       (xr . "gnu")
-       (vertico . "gnu-devel"))))
+     `,(delq nil `((auctex . "gnu")
+                   (compat . "gnu")
+                   (consult . "gnu-devel")
+                   ,(when (version< emacs-version "28.9.9")
+                      '(eglot . "gnu-devel"))
+                   (embark . "gnu-devel")
+                   (embark-consult . "gnu-devel")
+                   (engrave-faces . "gnu")
+                   (marginalia . "gnu-devel")
+                   (org . "gnu-devel")
+                   ,(when (version< emacs-version "28.9.9")
+                      '(python . "gnu-devel"))
+                   (queue . "gnu")
+                   (rainbow-mode . "gnu")
+                   (spinner . "gnu")
+                   (xr . "gnu")
+                   (vertico . "gnu-devel")))))
 #+end_src
 
 #+caption[Customize the third set of Emacs variables]:
@@ -234,16 +236,18 @@ The [[info:emacs#Init File][init file (info)]] does not load the ~custom-file~ a
 #+begin_src emacs-lisp
   (custom-set-variables
    '(package-selected-packages
-     '(async              ; asynchroneous processing
-       auctex             ; Aalborg University Center TeX
-       company            ; complete anything
-       magit              ; Git Text-based User Interface
-       no-littering       ; keep `user-emacs-directory' clean
-       org                ; thought organizer
-       python             ; major mode to edit Python files
-       vertico            ; VERTical Interactive Completion
-       wgrep              ; open a writable grep buffer
-       xr)))              ; undo rx to grok regular expressions
+     `,(delq nil `(async              ; asynchroneous processing
+                   auctex             ; Aalborg University Center TeX
+                   company            ; complete anything
+                   engrave-faces      ; convert font-lock to ANSI/HTML/LaTeX
+                   magit              ; Git Text-based User Interface
+                   no-littering       ; keep `user-emacs-directory' clean
+                   org                ; thought organizer
+                   ,(when (version< emacs-version "28.9.9")
+                      'python)        ; major mode to edit Python files
+                   vertico            ; VERTical Interactive Completion
+                   wgrep              ; open a writable grep buffer
+                   xr))))             ; undo rx to grok regular expressions
 #+end_src
 
 #+caption[Customize the fourth set of Emacs variables]:
@@ -325,7 +329,8 @@ the contents of packages and allows to update packages to the latest version.
       ;; Shadow built-in `org' by installing `org'.
       (shadow-builtin-by-install 'org)
       ;; Shadow built-in `python' by installing `python'.
-      (shadow-builtin-by-install 'python)
+      (when (version< emacs-version "28.9.9")
+        (shadow-builtin-by-install 'python))
       ;; Install the selected packages.
       (package-install-selected-packages)))
 
@@ -2565,8 +2570,7 @@ listings below make* [[https://github.com/tecosaur/engrave-faces#readme][Engrave
 #+caption: documentation strings.
 #+name: lst:ensure-engrave-faces-with-latex-face-mapper-fix
 #+begin_src emacs-lisp :tangle no
-  (when (and (ensure-package-installation 'engrave-faces)
-             (require 'engrave-faces-latex nil t))
+  (when (require 'engrave-faces-latex nil t)
     (defun engrave-faces-latex-face-mapper-override (faces content)
       "Create a LaTeX representation of CONTENT with FACES applied."
       (let* ((style (engrave-faces-preset-style faces))
@@ -3647,7 +3651,8 @@ mode independent [[https://github.com/joaotavora/eglot][eglot]] configuration:
 #+caption: Ensure =eglot= installation.
 #+name: lst:ensure-eglot-installation
 #+begin_src emacs-lisp
-  (when (ensure-package-installation 'eglot)
+  (when (and (version< emacs-version "28.9.9")
+             (ensure-package-installation 'eglot))
     ;; (defvar eglot-server-programs
     ;;   `((python-mode . ("pylsp" "-vvv")))
     ;;   "Shadow the definition of `eglot-server-programs' in `eglot'.")