From: Jay B. <bel...@us...> - 2004-11-04 14:43:57
|
Update of /cvsroot/maxima/maxima/interfaces/emacs/emaxima In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12384 Modified Files: maxima.el Log Message: (maxima-send-region): Display the process buffer. Index: maxima.el =================================================================== RCS file: /cvsroot/maxima/maxima/interfaces/emacs/emaxima/maxima.el,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- maxima.el 3 Nov 2004 20:38:44 -0000 1.38 +++ maxima.el 4 Nov 2004 14:43:49 -0000 1.39 @@ -1393,21 +1393,13 @@ ;;;; Help functions (defun maxima-goto-info-node (node) - (if maxima-running-xemacs - (info "Maxima") - (info-other-window (concat "(Maxima)" node)))) + (info-other-window (concat "(Maxima)" node))) (defun maxima-get-info-on-subject (subject) - (if maxima-running-xemacs - (progn - (info "Maxima") - (Info-menu "Function and Variable Index")) - (info-other-window "(Maxima)Function and Variable Index")) + (info-other-window "(Maxima)Function and Variable Index") (search-forward subject) - (if maxima-running-xemacs - (Info-follow-nearest-node (point)) - (Info-follow-nearest-node)) - (re-search-forward (concat "-.*: *" subject "\\( \\|$\\)")) + (Info-follow-nearest-node) + (re-search-forward (concat "-.*: *" subject "\\s-")) (if (looking-at "^") (forward-line -1) (beginning-of-line))) @@ -1422,8 +1414,13 @@ (setq pt (point)) (search-forward ":") (skip-chars-backward ": ") - (setq name (buffer-substring-no-properties pt (point)))) - (maxima-get-info-on-subject name))) + (setq name (buffer-substring-no-properties pt (point))) + (skip-chars-forward ": ") + (setq pt (point)) + (end-of-line) + (skip-chars-backward ". ") + (setq place (buffer-substring-no-properties pt (point)))) + (maxima-get-info-on-subject place))) ; (if (not maxima-running-xemacs) ; (info-other-window (concat "(Maxima)" place)) ; (info "Maxima") @@ -1469,7 +1466,7 @@ (insert "q in the *info* buffer will return you here.\n") (insert "q in this buffer will exit Maxima help\n\n") (with-temp-buffer - (require 'info) + (require 'info nil t) (Info-mode) (Info-goto-node "(Maxima)Function and Variable Index") (goto-char (point-min)) @@ -1510,7 +1507,6 @@ (define-key (current-local-map) "\t" 'maxima-next-subject) (goto-char (point-min)) (re-search-forward "^\\*") - (forward-char -1) (pop-to-buffer maxima-help-buffer) (setq buffer-read-only t)) (kill-buffer maxima-help-buffer) @@ -1628,9 +1624,7 @@ (defun maxima-info () "Read the info file for Maxima." (interactive) - (if maxima-running-xemacs - (info "Maxima") - (info-other-window "Maxima"))) + (info-other-window "Maxima")) ;;;; Completion @@ -2499,7 +2493,8 @@ (if arg (maxima-region beg end) (if (maxima-check-parens beg end) - (maxima-region beg end)))) + (maxima-region beg end))) + (maxima-display-buffer)) (defun maxima-send-buffer (&optional arg) "Send the buffer to the Maxima process, after checking the parentheses. |