[Emacs-diffs] Changes to emacs/lisp/progmodes/gud.el

[Nick Roberts]

Index: emacs/lisp/progmodes/gud.el
diff -c emacs/lisp/progmodes/gud.el:1.37 emacs/lisp/progmodes/gud.el:1.38
*** emacs/lisp/progmodes/gud.el:1.37    Mon May  9 21:55:33 2005
--- emacs/lisp/progmodes/gud.el Mon May 16 06:42:37 2005
***************
*** 3215,3221 ****
        (add-hook 'tooltip-hook 'gud-tooltip-tips)
        (define-key global-map [mouse-movement] 'gud-tooltip-mouse-motion))
      (unless tooltip-mode (remove-hook 'pre-command-hook 'tooltip-hide)
!     (remove-hook 'change-major-mode-hook 'tooltip-change-major-mode)
      (remove-hook 'tooltip-hook 'gud-tooltip-tips)
      (define-key global-map [mouse-movement] 'ignore)))
    (gud-tooltip-activate-mouse-motions-if-enabled)
--- 3215,3221 ----
        (add-hook 'tooltip-hook 'gud-tooltip-tips)
        (define-key global-map [mouse-movement] 'gud-tooltip-mouse-motion))
      (unless tooltip-mode (remove-hook 'pre-command-hook 'tooltip-hide)
!     (remove-hook 'change-major-mode-hook 'gud-tooltip-change-major-mode)
      (remove-hook 'tooltip-hook 'gud-tooltip-tips)
      (define-key global-map [mouse-movement] 'ignore)))
    (gud-tooltip-activate-mouse-motions-if-enabled)
***************
*** 3253,3259 ****
    (when gud-tooltip-dereference
      (setq expr (concat "*" expr)))
    (case gud-minor-mode
!     ((gdb gdba) (concat "server print " expr))
      ((dbx gdbmi) (concat "print " expr))
      (xdb (concat "p " expr))
      (sdb (concat expr "/"))
--- 3253,3259 ----
    (when gud-tooltip-dereference
      (setq expr (concat "*" expr)))
    (case gud-minor-mode
!     (gdba (concat "server print " expr))
      ((dbx gdbmi) (concat "print " expr))
      (xdb (concat "p " expr))
      (sdb (concat expr "/"))
***************
*** 3293,3298 ****
--- 3293,3302 ----
                      (tooltip-show (cdr define-elt))
                      expr))))
            (let ((cmd (gud-tooltip-print-command expr)))
+             (when (and gud-tooltip-mode (eq gud-minor-mode 'gdb))
+               (gud-tooltip-mode -1)
+               (message-box "Using GUD tooltips in this mode is unsafe\n\
+ so they have been disabled."))
              (unless (null cmd) ; CMD can be nil if unknown debugger
                (if (memq gud-minor-mode '(gdba gdbmi))
                      (if gdb-macro-info