Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-153
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-154
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-155
   Remove nick-abbrevs stuff from rcirc.el

 * emacs@sv.gnu.org/emacs--devo--0--patch-156
   rcirc.el update from Ryan Yeske

 * emacs@sv.gnu.org/emacs--devo--0--patch-157
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-158
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-159
   Update from CVS

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

3 files changed, 25 insertions, 2 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index eb85856cdb0..ae722f53ecb 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-15  Nick Roberts  <nickrob@snap.net.nz>
+
+        * DEBUG (Note): Describe features for debugging with GDB in Emacs.
+
 2006-03-11  Miles Bader  <miles@gnu.org>
 
         * images/mail: New directory.
diff --git a/etc/DEBUG b/etc/DEBUG
index 1695c6e7f07..5b4ccc0f964 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -245,6 +245,25 @@ and, assuming that "xtype" says that args[0] is a symbol:
 
    xsymbol
 
+** Using GDB in Emacs
+
+Debugging with GDB in Emacs offers some advantages over the command line (See
+the GDB Graphical Interface node of the Emacs manual).  There are also some
+features available just for debugging Emacs:
+
+1) The command gud-pp isavailable on the tool bar (the `pp' icon) and allows
+   the user to print the s-expression of the variable at point, in the GUD
+   buffer.
+
+2) Pressing `p' on a component of a watch expression that is a lisp object
+   in the speedbar prints its s-expression in the GUD buffer.
+
+3) The STOP button on the tool bar is adjusted so that it sends SIGTSTP
+   instead of the usual SIGINT.
+
+4) The command gud-pv has the global binding 'C-x C-a C-v' and prints the
+   value of the lisp variable at point.
+
 ** Debugging what happens while preloading and dumping Emacs
 
 Type `gdb temacs' and start it with `r -batch -l loadup dump'.
diff --git a/etc/orgcard.tex b/etc/orgcard.tex
index 39508baf873..1f520df353d 100644
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@@ -1,4 +1,4 @@
-% Reference Card for Org Mode 4.08
+% Reference Card for Org Mode 4.09
 %
 %**start of header
 \newcount\columnsperpage
@@ -58,7 +58,7 @@
 % Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
 % for their many good ideas.
 
-\def\orgversionnumber{4.08}
+\def\orgversionnumber{4.09}
 \def\year{2006}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill