[Maxima-commits] [git] Maxima CAS branch master updated. branch-5_48-base-319-g854c4e4cd

[rtoy <rt...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Maxima CAS".

The branch, master has been updated
       via  854c4e4cd0819d2498a09f0a18e79dfc64582d0e (commit)
       via  ce3f0a0a184fe44f540020502d32bb4084e60ee3 (commit)
      from  ff646590d9341cebf39f658ea86da2b48c61caf4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 854c4e4cd0819d2498a09f0a18e79dfc64582d0e
Author: Raymond Toy <toy...@gm...>
Date:   Wed Dec 10 15:13:57 2025 -0800

    Update Changelog for #4647

diff --git a/ChangeLog b/ChangeLog
index c043af3d2..4fa958860 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,8 @@ Bug fixes for numbered bugs:
  * \#4619: limit(inf = inf) causes stack overflow
  * \#4633: integrate(exp(- t) log(t), t, 0, 1) --> integral nounform
  * \#4636: signum(ind) is an error
- 
+ * \#4647: Maxima error in --preload file causes Lisp error
+
 Changes in the Windows installer:
 ---------------------------------
  * Update SBCL

commit ce3f0a0a184fe44f540020502d32bb4084e60ee3
Author: Raymond Toy <toy...@gm...>
Date:   Wed Dec 10 15:10:47 2025 -0800

    Fix #4647:  Error in --preload file causes Lisp error
    
    Instead of a Lisp error, we should continue to the repl.  To do so, we
    need to catch 'macsyma-quit which is thrown when an error is
    encountered.  This works when the file is either a mac or lisp file.

diff --git a/src/init-cl.lisp b/src/init-cl.lisp
index 771897d8d..9289a2b67 100644
--- a/src/init-cl.lisp
+++ b/src/init-cl.lisp
@@ -512,7 +512,9 @@ maxima [options] --batch-string='batch_answers_from_file:false; ...'
 				     ;; $loadprint T so we can see the file being loaded;
 				     ;; unless *maxima-quiet* is T.
 				     (let (($loadprint (not *maxima-quiet*)))
-				       ($load file)))
+                                       ;; If there's an error, catch
+                                       (catch 'macsyma-quit
+				         ($load file))))
 			 :help-string
                          "Preload <file>, which may be any file time accepted by
         Maxima's LOAD function.  The <file> is loaded before any other

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        | 3 ++-
 src/init-cl.lisp | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Maxima CAS