[Emacs-diffs] /srv/bzr/emacs/trunk r112671: * progmodes/octave.el (inferior-octave-startup): Fix bug#14433.

[Leo Liu]

------------------------------------------------------------
revno: 112671
fixes bug: http://debbugs.gnu.org/14433
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-22 23:28:42 +0800
message:
  * progmodes/octave.el (inferior-octave-startup): Fix bug#14433.
modified:
  lisp/ChangeLog
  lisp/progmodes/octave.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-22 14:47:19 +0000
+++ b/lisp/ChangeLog    2013-05-22 15:28:42 +0000
@@ -1,3 +1,7 @@
+2013-05-22  Leo Liu  <address@hidden>
+
+       * progmodes/octave.el (inferior-octave-startup): Fix bug#14433.
+
 2013-05-22  Michael Albinus  <address@hidden>
 
        * autorevert.el (auto-revert-notify-add-watch)

=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el  2013-05-21 23:19:03 +0000
+++ b/lisp/progmodes/octave.el  2013-05-22 15:28:42 +0000
@@ -770,20 +770,17 @@
            (when (and inferior-octave-startup-file
                       (file-exists-p inferior-octave-startup-file))
              (format "source (\"%s\");\n" inferior-octave-startup-file))))
-    (insert-before-markers
-     (concat
-      (if inferior-octave-output-list
-          (concat (mapconcat
-                   'identity inferior-octave-output-list "\n")
-                  "\n"))
-      inferior-octave-output-string))
+    (when inferior-octave-output-list
+      (insert-before-markers
+       (mapconcat 'identity inferior-octave-output-list "\n")))
 
     ;; And finally, everything is back to normal.
     (set-process-filter proc 'comint-output-filter)
     ;; Just in case, to be sure a cd in the startup file
     ;; won't have detrimental effects.
     (inferior-octave-resync-dirs)
-    ;; A trick to get the prompt highlighted.
+    ;; Generate a proper prompt, which is critical to
+    ;; `comint-history-isearch-backward-regexp'.  Bug#14433.
     (comint-send-string proc "\n")))
 
 (defvar inferior-octave-completion-table