Mercurial > emacs
changeset 84771:20c4f1b1d217
Repair octave-inf.el.
| author | Francesco Potortì <pot@gnu.org> |
|---|---|
| date | Sat, 22 Sep 2007 00:09:12 +0000 |
| parents | 58d1504f4b02 |
| children | c104419f915c |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Sep 21 23:26:55 2007 +0000 +++ b/lisp/ChangeLog Sat Sep 22 00:09:12 2007 +0000 @@ -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.