* progmodes/gud.el (gud-mode): Silence --without-x compilation.

(tooltip-mode): Declare.

2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c9d400f438..abe2ed75ad0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -20,7 +20,9 @@
         * mail/rmailmm.el (rmail-mime-set-bulk-data):
         Silence --without-x compilation.
 
-        * progmodes/gud.el (gud-find-file): Silence --without-x compilation.
+        * progmodes/gud.el (gud-find-file, gud-mode):
+        Silence --without-x compilation.
+        (tooltip-mode): Declare.
 
         * wdired.el (dired-backup-overwrite): Remove declaration.
         (wdired-mode-map): Add doc string.
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index c03c64b21ad..14f6aa154d7 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -321,7 +321,7 @@ Uses `gud-<MINOR-MODE>-directories' to find the source files."
       ;; Copy `gud-minor-mode' to the found buffer to turn on the menu.
       (with-current-buffer buf
         (setq-local gud-minor-mode minor-mode)
-        (if (boundp 'tool-bar-map)
+        (if (boundp 'tool-bar-map)      ; not --without-x
             (setq-local tool-bar-map gud-tool-bar-map))
         (when (and gud-tooltip-mode
                    (eq gud-minor-mode 'gdbmi))
@@ -2482,7 +2482,8 @@ comint mode, which see."
   (setq mode-line-process '(":%s"))
   (define-key (current-local-map) "\C-c\C-l" 'gud-refresh)
   (set (make-local-variable 'gud-last-frame) nil)
-  (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
+  (if (boundp 'tool-bar-map)            ; not --without-x
+      (setq-local tool-bar-map gud-tool-bar-map))
   (make-local-variable 'comint-prompt-regexp)
   ;; Don't put repeated commands in command history many times.
   (set (make-local-variable 'comint-input-ignoredups) t)
@@ -3282,6 +3283,8 @@ Treats actions as defuns."
 
 ;;; Customizable settings
 
+(defvar tooltip-mode)
+
 ;;;###autoload
 (define-minor-mode gud-tooltip-mode
   "Toggle the display of GUD tooltips.