[Emacs-diffs] trunk r115189: * progmodes/octave.el (inferior-octave-startup): Spit out error

[Leo Liu]

------------------------------------------------------------
revno: 115189
revision-id: address@hidden
parent: address@hidden
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Fri 2013-11-22 22:17:48 +0800
message:
  * progmodes/octave.el (inferior-octave-startup): Spit out error
  message.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/octave.el       
octavemod.el-20091113204419-o5vbwnq5f7feedwu-1028

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-22 12:36:38 +0000
+++ b/lisp/ChangeLog    2013-11-22 14:17:48 +0000
@@ -1,3 +1,8 @@
+2013-11-22  Leo Liu  <address@hidden>
+
+       * progmodes/octave.el (inferior-octave-startup): Spit out error
+       message.
+
 2013-11-22  Bozhidar Batsov  <address@hidden>
 
        * progmodes/ruby-mode.el (ruby-custom-encoding-magic-comment-template):

=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el  2013-11-22 09:50:41 +0000
+++ b/lisp/progmodes/octave.el  2013-11-22 14:17:48 +0000
@@ -786,8 +786,13 @@
     ;; 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))