procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* progmodes/octave.el (inferior-octave-startup): Spit out error

Browse source 
message.
This commit is contained in:
Leo Liu 2013-11-22 22:17:48 +08:00
parent 15ba218206
commit 965bb23acf
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-11-22 Leo Liu <sdl.web@gmail.com>
* progmodes/octave.el (inferior-octave-startup): Spit out error
message.
2013-11-22 Bozhidar Batsov <bozhidar@batsov.com>
* progmodes/ruby-mode.el (ruby-custom-encoding-magic-comment-template):

9
lisp/progmodes/octave.el
View file

@ -786,8 +786,13 @@ startup file, `~/.emacs-octave'."
;; output may be mixed up). Hence, we need to digest the Octave
;; output to see when it issues a prompt.
(while inferior-octave-receive-in-progress
(or (inferior-octave-process-live-p)
(error "Process `%s' died" inferior-octave-process))
(unless (inferior-octave-process-live-p)
;; Spit out the error messages.
(when inferior-octave-output-list
(princ (concat (mapconcat 'identity inferior-octave-output-list "\n")
"\n")
(process-mark inferior-octave-process)))
(error "Process `%s' died" inferior-octave-process))
(accept-process-output inferior-octave-process))
(goto-char (point-max))
(set-marker (process-mark proc) (point))