Repair octave-inf.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d81faec84fbd7bb36b325a5ff2db9c72ab483b5b..39c11d23041af7668b6b4ff51535695ade2a592f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-21  Francesco Potort\e,Al\e(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.