From: Francesco Potortì <pot@gnu.org>
Date: Sat, 22 Sep 2007 00:09:12 +0000 (+0000)
Subject: Repair octave-inf.el.
X-Git-Tag: emacs-pretest-23.0.90~10743
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=87094c03b7efb274fda191bc3832908c928194c8;p=emacs.git

Repair octave-inf.el.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d81faec84fb..39c11d23041 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-21  Francesco Potort,Al(B  <pot@gnu.org>
+
+	* progmodes/octave-inf.el (inferior-octave-mode): Use add-hook to
+	add inferior-octave-directory-tracker to the buffer-local value
+	of comint-input-filter-functions.
+
 2007-09-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* xt-mouse.el (xterm-mouse-mode): Re-enable suspend-tty-functions.
@@ -3589,7 +3595,12 @@
 
 	* replace.el (match): Use yellow1 instead of yellow.
 
+<<<<<<< ChangeLog
+	* progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of
+	red.
+=======
 	* progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of red.
+>>>>>>> 1.11807
 
 	* pcvs-info.el (cvs-unknown): Likewise.