diff options
| author | Nick Roberts | 2005-06-14 21:14:12 +0000 |
|---|---|---|
| committer | Nick Roberts | 2005-06-14 21:14:12 +0000 |
| commit | dce4ed29ce717896f40f521858706a0ce3b006ae (patch) | |
| tree | 0dd327329e425b21e8a2d4313b1c467b73603747 | |
| parent | 90aff7c61e0237008eba184ef01e06c8026cecfe (diff) | |
| download | emacs-dce4ed29ce717896f40f521858706a0ce3b006ae.tar.gz emacs-dce4ed29ce717896f40f521858706a0ce3b006ae.zip | |
* progmodes/gud.el (tooltip-use-echo-area): Remove alias.
Define in tooltip.el.
(gud-tooltip-process-output): Respect tooltip-use-echo-area.
(gud-tooltip-tips): Respect tooltip-use-echo-area and
gud-tooltip-echo-area.
| -rw-r--r-- | lisp/progmodes/gud.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 0737d1aed62..7d4fc00cd56 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el | |||
| @@ -3139,8 +3139,6 @@ only tooltips in the buffer containing the overlay arrow." | |||
| 3139 | 'gud-tooltip-modes "22.1") | 3139 | 'gud-tooltip-modes "22.1") |
| 3140 | (define-obsolete-variable-alias 'tooltip-gud-display | 3140 | (define-obsolete-variable-alias 'tooltip-gud-display |
| 3141 | 'gud-tooltip-display "22.1") | 3141 | 'gud-tooltip-display "22.1") |
| 3142 | (define-obsolete-variable-alias 'tooltip-use-echo-area | ||
| 3143 | 'gud-tooltip-echo-area "22.1") | ||
| 3144 | 3142 | ||
| 3145 | ;;; Reacting on mouse movements | 3143 | ;;; Reacting on mouse movements |
| 3146 | 3144 | ||
| @@ -3242,7 +3240,7 @@ This event can be examined by forms in GUD-TOOLTIP-DISPLAY.") | |||
| 3242 | 3240 | ||
| 3243 | ; This will only display data that comes in one chunk. | 3241 | ; This will only display data that comes in one chunk. |
| 3244 | ; Larger arrays (say 400 elements) are displayed in | 3242 | ; Larger arrays (say 400 elements) are displayed in |
| 3245 | ; the tootip incompletely and spill over into the gud buffer. | 3243 | ; the tooltip incompletely and spill over into the gud buffer. |
| 3246 | ; Switching the process-filter creates timing problems and | 3244 | ; Switching the process-filter creates timing problems and |
| 3247 | ; it may be difficult to do better. Using annotations as in | 3245 | ; it may be difficult to do better. Using annotations as in |
| 3248 | ; gdb-ui.el gets round this problem. | 3246 | ; gdb-ui.el gets round this problem. |
| @@ -3250,7 +3248,7 @@ This event can be examined by forms in GUD-TOOLTIP-DISPLAY.") | |||
| 3250 | "Process debugger output and show it in a tooltip window." | 3248 | "Process debugger output and show it in a tooltip window." |
| 3251 | (set-process-filter process gud-tooltip-original-filter) | 3249 | (set-process-filter process gud-tooltip-original-filter) |
| 3252 | (tooltip-show (tooltip-strip-prompt process output) | 3250 | (tooltip-show (tooltip-strip-prompt process output) |
| 3253 | gud-tooltip-echo-area)) | 3251 | (or gud-tooltip-echo-area tooltip-use-echo-area))) |
| 3254 | 3252 | ||
| 3255 | (defun gud-tooltip-print-command (expr) | 3253 | (defun gud-tooltip-print-command (expr) |
| 3256 | "Return a suitable command to print the expression EXPR. | 3254 | "Return a suitable command to print the expression EXPR. |
| @@ -3295,7 +3293,9 @@ This function must return nil if it doesn't handle EVENT." | |||
| 3295 | (cddr mouse)))) | 3293 | (cddr mouse)))) |
| 3296 | (let ((define-elt (assoc expr gdb-define-alist))) | 3294 | (let ((define-elt (assoc expr gdb-define-alist))) |
| 3297 | (unless (null define-elt) | 3295 | (unless (null define-elt) |
| 3298 | (tooltip-show (cdr define-elt)) | 3296 | (tooltip-show |
| 3297 | (cdr define-elt) | ||
| 3298 | (or gud-tooltip-echo-area tooltip-use-echo-area)) | ||
| 3299 | expr)))) | 3299 | expr)))) |
| 3300 | (let ((cmd (gud-tooltip-print-command expr))) | 3300 | (let ((cmd (gud-tooltip-print-command expr))) |
| 3301 | (when (and gud-tooltip-mode (eq gud-minor-mode 'gdb)) | 3301 | (when (and gud-tooltip-mode (eq gud-minor-mode 'gdb)) |