From b85f9d6a97eb379bd7a461bc1b3499846eb1d933 Mon Sep 17 00:00:00 2001 From: Sean Devlin Date: Sat, 2 Aug 2025 10:51:18 -0500 Subject: [PATCH] Fix recursive load when 'calc-always-load-extensions' is set * lisp/calc/calc.el (calc-create-buffer): Call 'calc-load-everything'. (calc-always-load-extensions): Delete erroneous stanza. (Bug#79157) --- lisp/calc/calc.el | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index d4fb8776c6c..6f4664dd6c4 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -1468,7 +1468,8 @@ commands given here will actually operate on the *Calculator* stack." (calc-mode)) (setq max-lisp-eval-depth (max max-lisp-eval-depth 1000)) (when calc-always-load-extensions - (require 'calc-ext)) + (require 'calc-ext) + (calc-load-everything)) (when calc-language (require 'calc-ext) (calc-set-language calc-language calc-language-option t))) @@ -3522,11 +3523,6 @@ See Info node `(calc)Defining Functions'." (defcalcmodevar math-half-2-word-size 2147483648 "One-half of two to the power of `calc-word-size'.") -(when calc-always-load-extensions - (require 'calc-ext) - (calc-load-everything)) - - (run-hooks 'calc-load-hook) (provide 'calc)