Merge from emacs--rel--22

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36a7b44bc81282fd2064fd515ad7888cab94e73d..719b5a4948df559087762bf112de50937031e43a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-28  Nick Roberts  <nickrob@snap.net.nz>
+
+       * progmodes/gdb-ui.el (gdb-info-breakpoints-custom): Make breakpoint
+       icons work for assembler, i.e. FILE.s, FILE.S (not disassembly).
+       (gdb-goto-breakpoint): Likewise for visiting breakpoints.
+       (gdb-assembler-custom): Be careful not to match other addresses.
+
 2008-04-29  Jason Rumney  <jasonr@gnu.org>
 
        * battery.el (battery-status-function): Use w32-battery-status