(tool-bar-map): Add defvar.

(gdb-frame-parameters): Declare before use.

1 files changed, 9 insertions, 7 deletions

diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index a1c6f0a80b0..6c960c4c5d5 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -79,6 +79,8 @@
 
 (require 'gud)
 
+(defvar tool-bar-map)
+
 (defvar gdb-frame-address "main" "Initialization for Assembler buffer.")
 (defvar gdb-previous-frame-address nil)
 (defvar gdb-memory-address "main")
@@ -704,6 +706,13 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
       (gdb-display-buffer
        (gdb-get-create-buffer 'gdb-inferior-io))))
 
+(defconst gdb-frame-parameters
+  '((height . 14) (width . 80)
+    (unsplittable . t)
+    (tool-bar-lines . nil)
+    (menu-bar-lines . nil)
+    (minibuffer . nil)))
+
 (defun gdb-frame-inferior-io-buffer ()
   "Display IO of inferior in a new frame."
   (interactive)
@@ -1410,13 +1419,6 @@ static char *magick[] = {
   (gdb-display-buffer
    (gdb-get-create-buffer 'gdb-breakpoints-buffer)))
 
-(defconst gdb-frame-parameters
-  '((height . 14) (width . 80)
-    (unsplittable . t)
-    (tool-bar-lines . nil)
-    (menu-bar-lines . nil)
-    (minibuffer . nil)))
-
 (defun gdb-frame-breakpoints-buffer ()
   "Display status of user-settable breakpoints in a new frame."
   (interactive)