# HG changeset patch
# User Nick Roberts <nickrob@snap.net.nz>
# Date 1164582484 0
# Node ID b5b237361cae577839a372ea3dcab3b73c5fd677
# Parent  8e22ff91ccfa85486d5e1a4b0ff73bab9f314566
*** empty log message ***

diff -r 8e22ff91ccfa -r b5b237361cae lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Nov 26 22:16:49 2006 +0000
+++ b/lisp/ChangeLog	Sun Nov 26 23:08:04 2006 +0000
@@ -1,3 +1,11 @@
+2006-11-26  Nick Roberts  <nickrob@snap.net.nz>
+
+	* speedbar.el (speedbar-timer-fn): Revert to old behaviour when not
+	in GUD mode.
+
+	* progmodes/gud.el (gud-install-speedbar-variables): Remove bindings:
+	speedbar-expand-line-descendants, speedbar-contract-line-descendants.
+
 2006-11-26  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* progmodes/cc-vars.el (c-backslash-column): Add . at end of sentence.
diff -r 8e22ff91ccfa -r b5b237361cae man/ChangeLog
--- a/man/ChangeLog	Sun Nov 26 22:16:49 2006 +0000
+++ b/man/ChangeLog	Sun Nov 26 23:08:04 2006 +0000
@@ -1,3 +1,8 @@
+2006-11-26  Nick Roberts  <nickrob@snap.net.nz>
+
+	* building.texi (Watch Expressions): Mention SPC for expanding/
+	contracting watch expressions.
+
 2006-11-26  Kim F. Storm  <storm@cua.dk>
 
 	* kmacro.texi (Basic Keyboard Macro): Mention F3/F4 more.