[sagemath] 04/09: Update maxima.patch.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository sagemath.

commit 38fcbcec25e75cfdf2d259a50338786e65452953
Author: Tobias Hansen <thansen at localhost.localdomain>
Date:   Thu Apr 7 10:18:03 2016 +0100

    Update maxima.patch.
---
 debian/patches/maxima.patch | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/maxima.patch b/debian/patches/maxima.patch
index ff20784..37d0dcb 100644
--- a/debian/patches/maxima.patch
+++ b/debian/patches/maxima.patch
@@ -6,7 +6,7 @@
      sage: maxima.eval('load("plotdf");')
 -    '".../local/share/maxima/.../share/dynamics/plotdf.lisp"'
 +    '".../share/maxima/.../share/dynamics/plotdf.lisp"'
-     sage: maxima.eval('plotdf(x+y,[trajectory_at,2,-0.1]); ') #optional
+     sage: maxima.eval('plotdf(x+y,[trajectory_at,2,-0.1]); ')  # not tested
  
  This plots a direction field (the plotdf Maxima package was also
 --- a/sage/src/sage/interfaces/maxima_lib.py
@@ -22,16 +22,16 @@
  ecl_eval("(defvar *MAXIMA-LANG-SUBDIR* NIL)")
 --- a/sage/src/sage/interfaces/maxima.py
 +++ b/sage/src/sage/interfaces/maxima.py
-@@ -551,7 +551,7 @@
+@@ -554,7 +554,7 @@
          Expect.__init__(self,
                          name = 'maxima',
                          prompt = '\(\%i[0-9]+\) ',
 -                        command = 'maxima --userdir="%s" -p "%s"'%(SAGE_MAXIMA_DIR,STARTUP),
 +                        command = 'maxima -l ecl --userdir="%s" -p "%s"'%(SAGE_MAXIMA_DIR,STARTUP),
-                         maxread = 10000,
                          script_subdirectory = script_subdirectory,
                          restart_on_ctrlc = False,
-@@ -765,7 +765,7 @@
+                         verbose_start = False,
+@@ -788,7 +788,7 @@
          if not wait_for_prompt:
              return
          # line_echo sometimes has randomly inserted terminal echo in front #15811
@@ -42,7 +42,7 @@
          out = self._before()        # input echo + output prompt + output
 --- a/sage/src/sage/interfaces/maxima_abstract.py
 +++ b/sage/src/sage/interfaces/maxima_abstract.py
-@@ -157,7 +157,7 @@
+@@ -163,7 +163,7 @@
              -- Function: gcd (<p_1>, <p_2>, <x_1>, ...)
              ...
          """
@@ -51,7 +51,7 @@
          if sage.server.support.EMBEDDED_MODE:
              cmd += '< /dev/null'
  
-@@ -165,10 +165,7 @@
+@@ -171,10 +171,7 @@
              p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
                               stdout=subprocess.PIPE, stderr=subprocess.PIPE)
              res = p.stdout.read()
@@ -63,7 +63,7 @@
              return AsciiArtString(res)
          else:
              subprocess.Popen(cmd, shell=True)
-@@ -2349,7 +2346,7 @@
+@@ -2356,7 +2353,7 @@
          sage: maxima_version()
          '5.35.1'
      """
@@ -72,9 +72,9 @@
  
  def maxima_console():
      """
-@@ -2362,4 +2359,4 @@
-         Maxima 5.34.1 http://maxima.sourceforge.net
-         ...
-     """
+@@ -2372,4 +2369,4 @@
+     from sage.repl.rich_output.display_manager import get_display_manager
+     if not get_display_manager().is_in_terminal():
+         raise RuntimeError('Can use the console only in the terminal. Try %%maxima magics instead.')
 -    os.system('maxima')
 +    os.system('maxima -l ecl')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git