2 files changed, 6 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a30583a9dc..1e09fe0850d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,3 @@
-2012-09-06  Chong Yidong  <cyd@gnu.org>
-
-        * progmodes/vhdl-mode.el 
-
 2012-09-06  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
         * progmodes/vhdl-mode.el (vhdl-speedbar-initialize): Don't use
@@ -14,6 +10,9 @@
 
         * frame.el (window-system-version): Mark as obsolete.
 
+        * speedbar.el (speedbar-update-flag, speedbar-mode): Remove uses
+        of obsolete variable speedbar-key-map.
+
 2012-09-06  Juri Linkov  <juri@jurta.org>
 
         * replace.el (replace-lax-whitespace): New defcustom.
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 16993ce1891..90cdea63e85 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -763,7 +763,7 @@ DIRECTORY-EXPRESSION to `speedbar-ignored-directory-expressions'."
   "Non-nil means to automatically update the display.
 When this is nil then speedbar will not follow the attached frame's directory.
 If you want to change this while speedbar is active, either use
-\\[customize] or call \\<speedbar-key-map> `\\[speedbar-toggle-updates]'."
+\\[customize] or call \\<speedbar-mode-map> `\\[speedbar-toggle-updates]'."
   :group 'speedbar
   :initialize 'custom-initialize-default
   :set (lambda (sym val)
@@ -1083,7 +1083,7 @@ Return nil if it doesn't exist."
 
 (define-derived-mode speedbar-mode fundamental-mode "Speedbar"
   "Major mode for managing a display of directories and tags.
-\\<speedbar-key-map>
+\\<speedbar-mode-map>
 The first line represents the default directory of the speedbar frame.
 Each directory segment is a button which jumps speedbar's default
 directory to that directory.  Buttons are activated by clicking `\\[speedbar-click]'.
@@ -1120,7 +1120,7 @@ category of tags.  Click the {+} to expand the category.  Jump-able
 tags start with >.  Click the name of the tag to go to that position
 in the selected file.
 
-\\{speedbar-key-map}"
+\\{speedbar-mode-map}"
   (save-excursion
     (setq font-lock-keywords nil) ;; no font-locking please
     (setq truncate-lines t)