[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Francesco Potortì]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Francesco Potortì <pot>        07/09/22 00:09:14

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11807
retrieving revision 1.11808
diff -u -b -r1.11807 -r1.11808
--- ChangeLog   21 Sep 2007 20:19:10 -0000      1.11807
+++ ChangeLog   22 Sep 2007 00:09:12 -0000      1.11808
@@ -1,3 +1,9 @@
+2007-09-21  Francesco Potort,Al(B  <address@hidden>
+
+       * 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  <address@hidden>
 
        * 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.