diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-05-16 15:49:27 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-05-16 15:49:27 +0000 |
| commit | 35bc5d82600f330082298823f09f53259a90ea81 (patch) | |
| tree | 328e8f1df7bcd3cb68f4dfa7de371543da885c89 /lisp/progmodes/gud.el | |
| parent | 133fe4c8a2d944324dc2c9a42b01ab1d258ad49d (diff) | |
| parent | cc211a0ff8145e0814413e237bb5674d615968b7 (diff) | |
| download | emacs-35bc5d82600f330082298823f09f53259a90ea81.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 307-312)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-307
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-308
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-309
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-310
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-311
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-312
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-346
Diffstat (limited to 'lisp/progmodes/gud.el')
| -rw-r--r-- | lisp/progmodes/gud.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 5c81ba7f6f9..4c95fc65d58 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -3215,7 +3215,7 @@ This event can be examined by forms in GUD-TOOLTIP-DISPLAY.") (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 '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,7 +3253,7 @@ If GUD-TOOLTIP-DEREFERENCE is t, also prepend a `*' to EXPR." (when gud-tooltip-dereference (setq expr (concat "*" expr))) (case gud-minor-mode - ((gdb gdba) (concat "server print " expr)) + (gdba (concat "server print " expr)) ((dbx gdbmi) (concat "print " expr)) (xdb (concat "p " expr)) (sdb (concat expr "/")) @@ -3293,6 +3293,10 @@ This function must return nil if it doesn't handle EVENT." (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 |