From: Leo Liu Date: Fri, 22 Nov 2013 14:17:48 +0000 (+0800) Subject: * progmodes/octave.el (inferior-octave-startup): Spit out error X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~742 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=965bb23acf061c4d02b4dc0685d71955f8f2b6e3;p=emacs.git * progmodes/octave.el (inferior-octave-startup): Spit out error message. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87a7050eb35..f9b6f6ee356 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-11-22 Leo Liu + + * progmodes/octave.el (inferior-octave-startup): Spit out error + message. + 2013-11-22 Bozhidar Batsov * progmodes/ruby-mode.el (ruby-custom-encoding-magic-comment-template): diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index 475f4d8d316..5e79e6627d8 100644 --- a/lisp/progmodes/octave.el +++ b/lisp/progmodes/octave.el @@ -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))