jflack/emacs-matlab
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

matlab-shell.el:

Browse source 
(matlab-shell-capture-text): Move the evaluation of forms,
or the display of the help buffer outside the
outermost save-excursion.  This allows these commands to reposition
point in different buffers.
This commit is contained in:
Eric Ludlam 2019-12-16 19:30:08 -05:00
parent cd70817b60
commit 1b8414d946
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
matlab-shell.el
View file

@ -974,11 +974,12 @@ Sends commands to the MATLAB shell to initialize the MATLAB process."
The filter captures indicators with <EMACSCAP> text </EMACSCAP>.
This strips out that text from the shell and displays in a help.
STR is provided by comint, but is unused."
(save-excursion
(let ((start nil) (end nil) (buffname "*MATLAB Output*")
(insertbuff nil) (bufflist nil)
(append nil)
)
(let ((start nil) (end nil) (buffname "*MATLAB Output*")
(insertbuff nil) (bufflist nil)
(append nil)
(evalforms nil)
)
(save-excursion
(goto-char (point-max))
(while (re-search-backward (regexp-quote matlab-shell-capturetext-end-text) nil t)
@ -1020,11 +1021,8 @@ STR is provided by comint, but is unused."
(if (string= buffname "eval")
;; The desire is to evaluate some Emacs Lisp code instead of
;; capture output to display in Emacs.
(condition-case nil
(let ((forms (read txt)))
(eval forms))
(error (message "Failed to evaluate forms from MATLAB: \"%s\"" txt))
)
(setq evalforms (read txt))
(save-excursion
(when insertbuff
;; Already have a buffer to append to.
@ -1045,9 +1043,15 @@ STR is provided by comint, but is unused."
))))
;; Setup for next loop
(goto-char (point-max)))
(goto-char (point-max))))
;; All done, display the buffer.
(if evalforms
;; Evaluate some forms
(condition-case nil
(eval evalforms)
(error (message "Failed to evaluate forms from MATLAB: \"%s\"" txt)))
;; Or display the buffer or eval the forms.
(when bufflist
(cond
((string= "*MATLAB Help*" buffname)
@ -1056,13 +1060,12 @@ STR is provided by comint, but is unused."
(t
(with-current-buffer (car bufflist)
(view-mode))))
(display-buffer (car bufflist)
'((display-buffer-below-selected display-buffer-at-bottom)
(inhibit-same-window . t)
(window-height . fit-window-to-buffer))))
)))
(window-height . shrink-window-if-larger-then-buffer)))))
))
;;; COMMANDS