Merge branch 'progfolio:master' into override-max-lisp-eval-depth

Author: bramadams

README.md

@@ -40,7 +40,7 @@ Elpaca requires:
 To install Elpaca, add the following elisp to your init.el. It must come before any calls to other Elpaca functions/macros. This will clone Elpaca into your `user-emacs-directory` under the `elpaca` subdirectory. It then builds and activates Elpaca.
 
 ```emacs-lisp
-(defvar elpaca-installer-version 0.10)
+(defvar elpaca-installer-version 0.11)
 (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
 (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
 (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
@@ -75,7 +75,7 @@ To install Elpaca, add the following elisp to your init.el. It must come before
   (unless (require 'elpaca-autoloads nil t)
     (require 'elpaca)
     (elpaca-generate-autoloads "elpaca" repo)
-    (load "./elpaca-autoloads")))
+    (let ((load-source-file-function nil)) (load "./elpaca-autoloads"))))
 (add-hook 'after-init-hook #'elpaca-process-queues)
 (elpaca `(,@elpaca-order))
 ```

doc/common.org

@@ -58,7 +58,7 @@ It then builds and activates Elpaca.
 
 #+name: installation-script
 #+begin_src emacs-lisp :lexical t :eval never-export
-(defvar elpaca-installer-version 0.10)
+(defvar elpaca-installer-version 0.11)
 (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
 (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
 (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
@@ -93,7 +93,7 @@ It then builds and activates Elpaca.
   (unless (require 'elpaca-autoloads nil t)
     (require 'elpaca)
     (elpaca-generate-autoloads "elpaca" repo)
-    (load "./elpaca-autoloads")))
+    (let ((load-source-file-function nil)) (load "./elpaca-autoloads"))))
 (add-hook 'after-init-hook #'elpaca-process-queues)
 (elpaca `(,@elpaca-order))
 #+end_src

doc/elpaca.texi

@@ -142,7 +142,7 @@ It then builds and activates Elpaca.
 
 @anchor{installation-script}
 @lisp
-(defvar elpaca-installer-version 0.10)
+(defvar elpaca-installer-version 0.11)
 (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
 (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
 (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
@@ -177,7 +177,7 @@ It then builds and activates Elpaca.
   (unless (require 'elpaca-autoloads nil t)
     (require 'elpaca)
     (elpaca-generate-autoloads "elpaca" repo)
-    (load "./elpaca-autoloads")))
+    (let ((load-source-file-function nil)) (load "./elpaca-autoloads"))))
 (add-hook 'after-init-hook #'elpaca-process-queues)
 (elpaca `(@comma{}@@elpaca-order))
 @end lisp
@@ -640,7 +640,7 @@ It must return a version string understood by @samp{version-to-list}.
 e.g.
 
 @lisp
-(elpaca (auctex :version (lambda (_) (require 'tex-site) AUCTeX-version)))
+(elpaca (example :version (lambda (_) "1.0.0")))
 @end lisp
 
 @node vars
@@ -898,7 +898,7 @@ A lock file is a collection of recipes for the exact versions of installed packa
 They can be used to build different versions of an Emacs configuration when combined with init file package declarations. 
 
 The @samp{elpaca-write-lock-file} command is used to write a lock file to disk.
-Setting the @samp{elpaca-lock-file} variable to that file's path will cause Elpaca to use those versions of the recipes when installing packages assuming the @samp{elpaca-lock-file-menu} is the first menu in @samp{elpaca-menu-functions}.
+Setting the @samp{elpaca-lock-file} variable to that file's path will cause Elpaca to use those versions of the recipes when installing packages assuming the @samp{elpaca-menu-lock-file} is the first menu in @samp{elpaca-menu-functions}.
 
 @node use-package Integration
 @section use-package Integration

doc/init.el

@@ -1,5 +1,5 @@
 ;; Example Elpaca configuration -*- lexical-binding: t; -*-
-(defvar elpaca-installer-version 0.10)
+(defvar elpaca-installer-version 0.11)
 (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
 (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
 (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
@@ -34,7 +34,7 @@
   (unless (require 'elpaca-autoloads nil t)
     (require 'elpaca)
     (elpaca-generate-autoloads "elpaca" repo)
-    (load "./elpaca-autoloads")))
+    (let ((load-source-file-function nil)) (load "./elpaca-autoloads"))))
 (add-hook 'after-init-hook #'elpaca-process-queues)
 (elpaca `(,@elpaca-order))
 

doc/installer.el

@@ -1,6 +1,6 @@
 ;; Elpaca Installer -*- lexical-binding: t; -*-
 ;; Copy below this line into your init.el
-(defvar elpaca-installer-version 0.10)
+(defvar elpaca-installer-version 0.11)
 (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
 (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
 (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
@@ -35,6 +35,6 @@
   (unless (require 'elpaca-autoloads nil t)
     (require 'elpaca)
     (elpaca-generate-autoloads "elpaca" repo)
-    (load "./elpaca-autoloads")))
+    (let ((load-source-file-function nil)) (load "./elpaca-autoloads"))))
 (add-hook 'after-init-hook #'elpaca-process-queues)
 (elpaca `(,@elpaca-order))

doc/manual.md

@@ -69,7 +69,7 @@ Elpaca requires:
 To install Elpaca, add the following elisp to your init.el. It must come before any calls to other Elpaca functions/macros. This will clone Elpaca into your `user-emacs-directory` under the `elpaca` subdirectory. It then builds and activates Elpaca.
 
 ```emacs-lisp
-(defvar elpaca-installer-version 0.10)
+(defvar elpaca-installer-version 0.11)
 (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
 (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
 (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
@@ -104,7 +104,7 @@ To install Elpaca, add the following elisp to your init.el. It must come before
   (unless (require 'elpaca-autoloads nil t)
     (require 'elpaca)
     (elpaca-generate-autoloads "elpaca" repo)
-    (load "./elpaca-autoloads")))
+    (let ((load-source-file-function nil)) (load "./elpaca-autoloads"))))
 (add-hook 'after-init-hook #'elpaca-process-queues)
 (elpaca `(,@elpaca-order))
 ```
@@ -508,7 +508,7 @@ The name of the file the package’s autoload file. When `nil`, autoload loa
 A function which must accept an Elpaca struct as its sole argument. It must return a version string understood by `version-to-list`. e.g.
 
 ```emacs-lisp
-(elpaca (auctex :version (lambda (_) (require 'tex-site) AUCTeX-version)))
+(elpaca (example :version (lambda (_) "1.0.0")))
 ```
 
 
@@ -728,7 +728,7 @@ Interactively evaluating an `elpaca` declaration will re-process the order. This
 
 A lock file is a collection of recipes for the exact versions of installed packages. They can be used to build different versions of an Emacs configuration when combined with init file package declarations.
 
-The `elpaca-write-lock-file` command is used to write a lock file to disk. Setting the `elpaca-lock-file` variable to that file’s path will cause Elpaca to use those versions of the recipes when installing packages assuming the `elpaca-lock-file-menu` is the first menu in `elpaca-menu-functions`.
+The `elpaca-write-lock-file` command is used to write a lock file to disk. Setting the `elpaca-lock-file` variable to that file’s path will cause Elpaca to use those versions of the recipes when installing packages assuming the `elpaca-menu-lock-file` is the first menu in `elpaca-menu-functions`.
 
 
 <a id="use-package-integration"></a>

doc/manual.org

@@ -368,7 +368,7 @@ It must return a version string understood by =version-to-list=.
 e.g.
 
 #+begin_src emacs-lisp :lexical t :eval never
-(elpaca (auctex :version (lambda (_) (require 'tex-site) AUCTeX-version)))
+(elpaca (example :version (lambda (_) "1.0.0")))
 #+end_src
 
 **** :vars
@@ -610,7 +610,7 @@ A lock file is a collection of recipes for the exact versions of installed packa
 They can be used to build different versions of an Emacs configuration when combined with init file package declarations. 
 
 The =elpaca-write-lock-file= command is used to write a lock file to disk.
-Setting the =elpaca-lock-file= variable to that file's path will cause Elpaca to use those versions of the recipes when installing packages assuming the =elpaca-lock-file-menu= is the first menu in =elpaca-menu-functions=.
+Setting the =elpaca-lock-file= variable to that file's path will cause Elpaca to use those versions of the recipes when installing packages assuming the =elpaca-menu-lock-file= is the first menu in =elpaca-menu-functions=.
 
 
 ** use-package Integration

elpaca-info.el

@@ -40,7 +40,8 @@
 (define-derived-mode elpaca-info-mode special-mode "elpaca-info-mode"
   "Major mode for viewing Elpaca package info.
 
-\\{elpaca-info-mode-map}")
+\\{elpaca-info-mode-map}"
+  :interactive nil)
 
 (defun elpaca-info--menus (id)
   "Return alist of menus filtered for item matching ID."

elpaca-log.el

@@ -149,6 +149,7 @@ It must accept a package ID symbol and REF string as its first two arguments."
 
 (define-minor-mode elpaca-log-update-mode "Auto display update diffs."
   :lighter " elum"
+  :interactive (elapca-log-mode)
   (unless (derived-mode-p 'elpaca-log-mode) (user-error "Not in `elpaca-log-mode' buffer"))
   (if elpaca-log-update-mode
       (progn
@@ -193,7 +194,8 @@ It must accept a package ID symbol and REF string as its first two arguments."
                                        (narrow-to-region (point) (line-end-position))
                                        (condition-case _ (forward-button 1)
                                          (error (user-error "No ref found on current line")))
-                                       (get-text-property (point) 'button-data)))))
+                                       (get-text-property (point) 'button-data))))
+               elpaca-log-mode)
   (funcall elpaca-log-diff-function (car data) (cdr data)))
 
 (defun elpaca-log--updates (entries)
@@ -279,6 +281,7 @@ It must accept a package ID symbol and REF string as its first two arguments."
 
 (define-derived-mode elpaca-log-mode elpaca-ui-mode "elpaca-log-mode"
   "Major mode for displaying Elpaca order log entries."
+  :interactive nil
   (setq tabulated-list-format [("Package" 30 t)
                                ("Status" 20 t)
                                ("Info" 80 t)

elpaca-manager.el

@@ -59,6 +59,7 @@ If RECACHE is non-nil, recompute `elpaca-manager--entry-cache'."
 
 (define-derived-mode elpaca-manager-mode elpaca-ui-mode "elpaca-manager-mode"
   "Major mode for displaying Elpaca packages."
+  :interactive nil
   (setq tabulated-list-format [("Package" 30 elpaca-ui--sort-package)
                                ("Description" 80 t)
                                ("Date" 15 t)

elpaca-menu-elpa.el

@@ -28,20 +28,32 @@
 (require 'url)
 (defvar url-http-end-of-headers)
 (defvar url-http-response-status)
+
+(defcustom elpaca-menu-elpa-use-mirror t
+  "When non-nil utilize Github mirror of GNU/NonGNU Savannah ELPA."
+  :type 'boolean :group 'elpaca)
+
 (defvar elpaca-menu-elpas
   `((gnu . ((name         . "GNU ELPA")
             (cache . ,(elpaca--read-file (expand-file-name "gnu-elpa.eld" elpaca-cache-directory)))
             (cache-path   . ,(expand-file-name "gnu-elpa.eld" elpaca-cache-directory))
-            (packages-url . "https://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/elpa-packages")
+            (packages-url . ,(if elpaca-menu-elpa-use-mirror
+                                 "https://raw.githubusercontent.com/emacsmirror/gnu_elpa/refs/heads/main/elpa-packages"
+                               "https://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/elpa-packages"))
             (metadata-url . "https://elpa.gnu.org/packages/")
-            (remote       . "https://git.savannah.gnu.org/git/emacs/elpa.git")
+            (remote       . ,(if elpaca-menu-elpa-use-mirror "https://github.com/emacsmirror/gnu_elpa"
+                               "https://git.savannah.gnu.org/git/emacs/elpa.git"))
             (branch-prefix . "externals")))
     (nongnu . ((name         . "NonGNU ELPA")
                (cache-path   . ,(expand-file-name "non-gnu-elpa.eld" elpaca-cache-directory))
                (cache . ,(elpaca--read-file (expand-file-name "non-gnu-elpa.eld" elpaca-cache-directory)))
-               (packages-url . "https://git.savannah.gnu.org/cgit/emacs/nongnu.git/plain/elpa-packages")
+               (packages-url . ,(if elpaca-menu-elpa-use-mirror
+                                    "https://raw.githubusercontent.com/emacsmirror/nongnu_elpa/refs/heads/main/elpa-packages"
+                                  "https://git.savannah.gnu.org/cgit/emacs/nongnu.git/plain/elpa-packages"))
                (metadata-url . "https://elpa.nongnu.org/nongnu/")
-               (remote       . "https://git.savannah.gnu.org/git/emacs/nongnu.git")
+               (remote       . ,(if elpaca-menu-elpa-use-mirror
+                                    "https://github.com/emacsmirror/nongnu_elpa"
+                                  "https://git.savannah.gnu.org/git/emacs/nongnu.git"))
                (branch-prefix . "elpa")))))
 
 (defun elpaca-menu-elpa--recipes (elpa)

elpaca-menu-melpa.el

@@ -130,9 +130,9 @@ If REQUEST is `update`, update the MELPA recipe cache."
   (pcase request
     ('index  (elpaca-menu-melpa--index item))
     ('update (setq elpaca-menu-melpa--index-cache nil)
-             (if (file-exists-p (expand-file-name "melpa/" elpaca-cache-directory))
-                 (elpaca-menu-melpa--update)
-               (elpaca-menu-melpa 'index item)))))
+             (when (file-exists-p (expand-file-name "melpa/" elpaca-cache-directory))
+               (elpaca-menu-melpa--update))
+             (elpaca-menu-melpa 'index item))))
 
 (provide 'elpaca-menu-melpa)
 ;;; elpaca-menu-melpa.el ends here

elpaca-menu-org.el

@@ -25,6 +25,8 @@
 ;;; Code:
 (require 'elpaca)
 (defvar elpaca-menu-org--index-cache nil "Cache of Org menu index.")
+(defcustom elpaca-menu-org-make-manual t "When non-nil build Org manual."
+  :type 'boolean :group 'elpaca)
 
 (defun elpaca-menu-org--build ()
   "Generate `org-version.el`.
@@ -53,7 +55,7 @@
     (when (fboundp 'org-make-org-version)
       (message "Making org-version")
       (org-make-org-version orgversion gitversion))
-    (when (fboundp 'org-make-manual)
+    (when (and elpaca-menu-org-make-manual (fboundp 'org-make-manual))
       (cd "../doc")
       (message "Making manual")
       (org-make-manual))))
@@ -73,8 +75,11 @@
                        :recipe
                        (list
                         :package "org"
-                        :repo '("https://git.savannah.gnu.org/git/emacs/org-mode.git" . "org")
-                        :pre-build '(progn (require 'elpaca-menu-org) (elpaca-menu-org--build))
+                        ;;"https://git.savannah.gnu.org/git/emacs/org-mode.git"
+                        :repo '("https://git.sr.ht/~bzg/org-mode" . "org")
+                        :pre-build `(progn (require 'elpaca-menu-org)
+                                           (setq elpaca-menu-org-make-manual ,elpaca-menu-org-make-manual)
+                                           (elpaca-menu-org--build))
                         :autoloads "org-loaddefs.el" :depth 1
                         :build '(:not elpaca--generate-autoloads-async)
                         :files '(:defaults ("etc/styles/" "etc/styles/*" "doc/*.texi")))))