*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dbc8a229442b5dea4f73626c23230edb39a4c6f4..7ddd1bd3fdd6eea5c1cf37281bfe6501dea25f02 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2005-04-28  Nick Roberts  <nickrob@snap.net.nz>
+
+       * progmodes/cc-mode.el: (cc-create-define-alist): New function.
+       (cc-define-alist): New variable.
+       (c-mode): Make it local and initialise it.
+
+       * progmodes/gdb-ui.el (gdb-active-process): New variable.
+       (gdb-exited): New function.
+       (gdb-annotation-rules): Use it.
+       (gdb-starting): Set gdb-active-process to t.
+       (gdb-stopping): Amend doc string.
+       (gdb-reset): Set gdb-active-process to nil.
+
+       * tooltip.el (tooltip-gud-tips): Show the associated #define
+       directives when a C program under GDB is not executing.
+
 2005-04-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/cperl-mode.el (cperl-mode): Don't precompile the

diff --git a/src/ChangeLog b/src/ChangeLog
index 0325981bf84cab5f58cbf1e7a5986285f7810451..9da42f6930436825ecefad71fc0f2bc5946ce2e6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-28  Nick Roberts  <nickrob@snap.net.nz>
+
+       * emacs.c (USAGE1): Add --basic-display and --quick options.
+
 2005-04-27  Kim F. Storm  <storm@cua.dk>
 
        * data.c (syms_of_data) Staticpro Qcyclic_variable_indirection.