[Maxima-commits] CVS: maxima/src plot.lisp, 1.168, 1.168.2.1 maxima.bat.in, 1.19, 1.19.16.1

[Andrej V. <an...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv20666/src

Modified Files:
      Tag: RELEASE-5_23-BRANCH
	plot.lisp maxima.bat.in 
Log Message:
Updates for gnuplot 4.4 on windows.


Index: plot.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/plot.lisp,v
retrieving revision 1.168
retrieving revision 1.168.2.1
diff -u -d -r1.168 -r1.168.2.1
--- plot.lisp	16 Nov 2010 13:44:34 -0000	1.168
+++ plot.lisp	7 Jan 2011 14:23:16 -0000	1.168.2.1
@@ -78,7 +78,7 @@
     ;; adaptive-plotting will do.
     ((mlist) $adapt_depth 5)
     ((mlist) $gnuplot_preamble "")
-    ((mlist) $gnuplot_default_term_command "set term pop")
+    ((mlist) $gnuplot_default_term_command ,(if (string= *autoconf-win32* "true") "set term windows" "set term pop"))
     ((mlist) $gnuplot_dumb_term_command
      "set term dumb 79 22")
     ((mlist) $gnuplot_ps_term_command

Index: maxima.bat.in
===================================================================
RCS file: /cvsroot/maxima/maxima/src/maxima.bat.in,v
retrieving revision 1.19
retrieving revision 1.19.16.1
diff -u -d -r1.19 -r1.19.16.1
--- maxima.bat.in	27 Jul 2008 07:04:10 -0000	1.19
+++ maxima.bat.in	7 Jan 2011 14:23:16 -0000	1.19.16.1
@@ -22,7 +22,7 @@
 set package=@PACKAGE@

 set verbose=false

 set mingw_gccver=GCCVER

-set path=%maxima_prefix%\bin;%maxima_prefix%\lib\gcc-lib\mingw32\GCCVER;%path%

+set path=%maxima_prefix%\gnuplot;%maxima_prefix%\bin;%maxima_prefix%\lib\gcc-lib\mingw32\GCCVER;%path%

 

 if "%USERPROFILE%" == "" goto win9x

 if "%MAXIMA_USERDIR%" == "" set MAXIMA_USERDIR=%USERPROFILE%\maxima