Merged in changes from CVS head

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-4
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-22

1 files changed, 24 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c737c003eb9..56587ae22ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2003-12-28  Sam Steingold  <sds@gnu.org>
+
+        * net/ange-ftp.el (ange-ftp-file-attributes): Add new optional
+        parameter ID-FORMAT to conform with the 2003-11-30 patch.
+
+2003-12-28  Nick Roberts  <nick@nick.uklinux.net>
+
+        * progmodes/gud.el (gud-gdb-command-name): Set default to
+        "gdb --annotate=3".
+        (gud-gdb-marker-filter): Look out for annotations.
+        (gdb-first-pre-prompt): New variable.
+        Remove trailing white space.
+
+        * gdb-ui.el (gdb-prompt): Change filter for level 3 annotations,
+        if necessary.
+        (gdb-ann3): New function. Initialise M-x gdb as for M-x gdba if
+        annotations are detected.
+        (gud-gdba-marker-filter): Use global variable gud-marker-acc
+        instead of a local one to allow transition from
+        gud-gdb-marker-filter.
+        Remove trailing white space.
+
 2003-12-27  Kim F. Storm  <storm@cua.dk>
 
         * ido.el: Handle non-readable directories.
@@ -112,7 +134,7 @@
         (group, documentation-string): Removed redundant (per 2003-10-25
         change) calls to `widget-children-value-delete'.
         (widget-choice-value-get, widget-choice-value-inline): Removed
-        functions. 
+        functions.
         (menu-choice): Updated widget.
 
 2003-12-03  Kenichi Handa  <handa@m17n.org>
@@ -1888,7 +1910,7 @@
         which does not exist in LaTeX.
         (reftex-cite-format-builtin): Added amsrefs support.
         (reftex-toc-confirm-promotion): New option
-        
+
         * reftex-toc.el
         (reftex-toc): Use `reftex-toc-split-windows-fraction'.
         (reftex-toc-demote, reftex-toc-promote)