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

[Nick Roberts]

Index: emacs/lisp/tooltip.el
diff -c emacs/lisp/tooltip.el:1.47 emacs/lisp/tooltip.el:1.48
*** emacs/lisp/tooltip.el:1.47  Sat Apr 16 00:21:56 2005
--- emacs/lisp/tooltip.el       Mon Apr 18 00:29:45 2005
***************
*** 139,148 ****
    :tag "GUD buffers predicate"
    :group 'tooltip)
  
! (defcustom tooltip-use-echo-area nil
!   "Use the echo area instead of tooltip frames.
! This is only relevant GUD display, since otherwise it is equivalent to
! turning off Tooltip mode."
    :type 'boolean
    :tag "Use echo area"
    :group 'tooltip)
--- 139,146 ----
    :tag "GUD buffers predicate"
    :group 'tooltip)
  
! (defcustom tooltip-gud-echo-area nil
!   "Use the echo area instead of frames for GUD tooltips."
    :type 'boolean
    :tag "Use echo area"
    :group 'tooltip)
***************
*** 291,307 ****
        (push (cons key value) alist))
      alist))
  
! (defun tooltip-show (text)
    "Show a tooltip window displaying TEXT.
  
! Text larger than `x-max-tooltip-size' (which see) is clipped.
  
  If the alist in `tooltip-frame-parameters' includes `left' and `top'
  parameters, they determine the x and y position where the tooltip
  is displayed.  Otherwise, the tooltip pops at offsets specified by
  `tooltip-x-offset' and `tooltip-y-offset' from the current mouse
! position."
!   (if tooltip-use-echo-area
        (message "%s" text)
      (condition-case error
        (let ((params (copy-sequence tooltip-frame-parameters))
--- 289,307 ----
        (push (cons key value) alist))
      alist))
  
! (defun tooltip-show (text gud-tip)
    "Show a tooltip window displaying TEXT.
  
! Text larger than `x-max-tooltip-size' is clipped.
  
  If the alist in `tooltip-frame-parameters' includes `left' and `top'
  parameters, they determine the x and y position where the tooltip
  is displayed.  Otherwise, the tooltip pops at offsets specified by
  `tooltip-x-offset' and `tooltip-y-offset' from the current mouse
! position.
! 
! GUD-TIP is t if the tooltip is from a GUD session and nil otherwise."
!   (if (and gud-tip tooltip-gud-echo-area)
        (message "%s" text)
      (condition-case error
        (let ((params (copy-sequence tooltip-frame-parameters))
***************
*** 417,423 ****
  (defun tooltip-gud-process-output (process output)
    "Process debugger output and show it in a tooltip window."
    (set-process-filter process tooltip-gud-original-filter)
!   (tooltip-show (tooltip-strip-prompt process output)))
  
  (defun tooltip-gud-print-command (expr)
    "Return a suitable command to print the expression EXPR.
--- 417,423 ----
  (defun tooltip-gud-process-output (process output)
    "Process debugger output and show it in a tooltip window."
    (set-process-filter process tooltip-gud-original-filter)
!   (tooltip-show (tooltip-strip-prompt process output) t))
  
  (defun tooltip-gud-print-command (expr)
    "Return a suitable command to print the expression EXPR.
***************
*** 463,470 ****
    (tooltip-show
     (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
       (let ((string (buffer-string)))
!        ;; remove newline for tooltip-use-echo-area
!        (substring string 0 (- (length string) 1))))))
  
  
  ;;; Tooltip help.
--- 463,470 ----
    (tooltip-show
     (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
       (let ((string (buffer-string)))
!        ;; remove newline for tooltip-gud-echo-area
!        (substring string 0 (- (length string) 1)))) t))
  
  
  ;;; Tooltip help.
***************
*** 497,503 ****
  the timer with ID `tooltip-timeout-id' fires.
  Value is non-nil if this function handled the tip."
    (when (stringp tooltip-help-message)
!     (tooltip-show tooltip-help-message)
      t))
  
  (provide 'tooltip)
--- 497,503 ----
  the timer with ID `tooltip-timeout-id' fires.
  Value is non-nil if this function handled the tip."
    (when (stringp tooltip-help-message)
!     (tooltip-show tooltip-help-message nil)
      t))
  
  (provide 'tooltip)