From: Jay B. <bel...@us...> - 2004-05-11 19:50:00
|
Update of /cvsroot/maxima/maxima/interfaces/emacs/emaxima In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22221/maxima/interfaces/emacs/emaxima Modified Files: maxima.el Log Message: Made changes for the new prompts. Index: maxima.el =================================================================== RCS file: /cvsroot/maxima/maxima/interfaces/emacs/emaxima/maxima.el,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- maxima.el 29 Apr 2004 03:46:05 -0000 1.34 +++ maxima.el 11 May 2004 19:49:48 -0000 1.35 @@ -185,6 +185,21 @@ :prefix "maxima-" :tag "Maxima") +(defcustom maxima-inchar "%i" + "*The character used for an input prompt." + :group 'maxima + :type 'string) + +(defcustom maxima-outchar "%o" + "*The character used for an output prompt." + :group 'maxima + :type 'string) + +(defcustom maxima-linechar "%t" + "*The character used for an intermediate output prompt." + :group 'maxima + :type 'string) + (defcustom maxima-indent-amount 2 "*The amount of each indentation level in `maxima-mode'. This is used after `then', etc." @@ -1610,7 +1625,8 @@ (save-excursion (goto-char pos) (beginning-of-line) - (while (re-search-forward "(C[0-9]+).*\r" pmark t) + (while (re-search-forward + (concat "(" maxima-inchar "[0-9]+).*\r") pmark t) (replace-match "" t t)))))) (defun inferior-maxima-wait-for-output () @@ -1776,7 +1792,8 @@ (end) (k)) ;; Replace the output prompt with spaces - (setq beg (string-match "\\(^([D][0-9]*) \\)" output)) + (setq beg (string-match + (concat "\\(^(" maxima-outchar "[0-9]*) \\)") output)) (if (not beg) output (setq end (1+ (string-match ")" output beg))) @@ -2114,7 +2131,8 @@ ;;;; Inferior Maxima mode (defvar inferior-maxima-prompt - "\\(^([C][0-9]*) \\)\\|\\(^MAXIMA>+\\)\\|\\(^(dbm:[0-9]*) \\)" + (concat "\\(^(" maxima-inchar + "[0-9]*) \\)\\|\\(^MAXIMA>+\\)\\|\\(^(dbm:[0-9]*) \\)") ; \\(^[^#%)>]*[#%)>]+ *\\)" "*Regexp to recognize prompts from the inferior Maxima") ; or lisp") |