[Maxima-commits] [git] Maxima CAS branch, master, updated. branch-5_38-base-89-gda74d5f

[Kris K. <kj...@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  da74d5f75ecd279f3e4bfd152da68194234986ce (commit)
       via  e5fb199f1544e81c75ef1bd53b88b93581cb1520 (commit)
      from  0fc76342a4ac4745be9b6bb5b6772f2b85e00ae0 (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 da74d5f75ecd279f3e4bfd152da68194234986ce
Author: Kris Katterjohn <kat...@gm...>
Date:   Tue Jun 7 13:12:08 2016 -0500

    Define the variable $OLD_STDERR (instead of $OLD_STDIN)
    
    The undefined $OLD_STDERR was being assigned to in SETUP-CLIENT, but
    the unused $OLD_STDIN was being defined instead.
    
    See commits 15e5ab and 94bbec.

diff --git a/src/server.lisp b/src/server.lisp
index c9030a5..ce6d581 100644
--- a/src/server.lisp
+++ b/src/server.lisp
@@ -15,7 +15,7 @@
 (defvar $show_openplot t)
 (defvar *socket-connection*)
 (defvar $old_stdout)
-(defvar $old_stdin)
+(defvar $old_stderr)
 
 (defun setup-client (port &optional (host "localhost"))
   ;; The following command has to be executed on windows before

commit e5fb199f1544e81c75ef1bd53b88b93581cb1520
Author: Kris Katterjohn <kat...@gm...>
Date:   Mon Jun 6 00:04:47 2016 -0500

    Eliminate a superfluous PROG1
    
    In v5.0, this PROG1 was used to call MUNLOCAL after the LET form
    (with a comment saying this MUNLOCAL should be unwind-protected
    instead).  At some point prior to the initial repo commit, some
    things were redone, UNWIND-PROTECT was used to call MUNLOCAL
    instead and the MUNLOCAL call in the PROG1 was replaced with NIL.
    
    No functional changes.

diff --git a/src/mlisp.lisp b/src/mlisp.lisp
index c196476..50f99a6 100644
--- a/src/mlisp.lisp
+++ b/src/mlisp.lisp
@@ -215,13 +215,11 @@ is EQ to FNNAME if the latter is non-NIL."
 	     (vector-push fnname ar)
 	     (mbind finish2032 args fnname)
 	     (setq finish2033 t)
-	     (prog1
-		 (let ((aexprp (and aexprp (not (atom (caddr fn)))
-				    (eq (caar (caddr fn)) 'lambda))))
-		   (cond ((null (cddr fn)) (merror (intl:gettext "lambda: no body present.")))
-			 ((cdddr fn) (mevaln (cddr fn)))
-			 (t (meval (caddr fn)))))
-	       nil))
+	     (let ((aexprp (and aexprp (not (atom (caddr fn)))
+				(eq (caar (caddr fn)) 'lambda))))
+	       (cond ((null (cddr fn)) (merror (intl:gettext "lambda: no body present.")))
+		     ((cdddr fn) (mevaln (cddr fn)))
+		     (t (meval (caddr fn))))))
 	(if finish2033
 	    (progn
 	      (incf (fill-pointer *mlambda-call-stack*) -5)

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

Summary of changes:
 src/mlisp.lisp  |   12 +++++-------
 src/server.lisp |    2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Maxima CAS