[Emacs-diffs] trunk r114373: * progmodes/gud.el (gud-mode): Silence --without-x compilation.

[Glenn Morris]

------------------------------------------------------------
revno: 114373
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 22:19:28 -0700
message:
  * progmodes/gud.el (gud-mode): Silence --without-x compilation.
  (tooltip-mode): Declare.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/gud.el          gud.el-20091113204419-o5vbwnq5f7feedwu-2927

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-18 05:16:36 +0000
+++ b/lisp/ChangeLog    2013-09-18 05:19:28 +0000
@@ -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.

=== modified file 'lisp/progmodes/gud.el'
--- a/lisp/progmodes/gud.el     2013-09-18 05:16:36 +0000
+++ b/lisp/progmodes/gud.el     2013-09-18 05:19:28 +0000
@@ -321,7 +321,7 @@
       ;; 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 @@
   (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 @@
 
 ;;; Customizable settings
 
+(defvar tooltip-mode)
+
 ;;;###autoload
 (define-minor-mode gud-tooltip-mode
   "Toggle the display of GUD tooltips.