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

[Kim F . Storm]

Index: emacs/lisp/tooltip.el
diff -c emacs/lisp/tooltip.el:1.49 emacs/lisp/tooltip.el:1.50
*** emacs/lisp/tooltip.el:1.49  Mon Apr 18 07:43:59 2005
--- emacs/lisp/tooltip.el       Mon Apr 18 10:23:10 2005
***************
*** 290,296 ****
        (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.
--- 290,296 ----
        (push (cons key value) alist))
      alist))
  
! (defun tooltip-show (text &optional use-echo-area)
    "Show a tooltip window displaying TEXT.
  
  Text larger than `x-max-tooltip-size' is clipped.
***************
*** 301,308 ****
  `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))
--- 301,309 ----
  `tooltip-x-offset' and `tooltip-y-offset' from the current mouse
  position.
  
! Optional second arg USE-ECHO-AREA non-nil means to show tooltip
! in echo area."
!   (if use-echo-area
        (message "%s" text)
      (condition-case error
        (let ((params (copy-sequence tooltip-frame-parameters))
***************
*** 418,424 ****
  (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.
--- 419,426 ----
  (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)
!               tooltip-gud-echo-area))
  
  (defun tooltip-gud-print-command (expr)
    "Return a suitable command to print the expression EXPR.
***************
*** 465,471 ****
     (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.
--- 467,474 ----
     (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))))
!    tooltip-gud-echo-area))
  
  
  ;;; Tooltip help.
***************
*** 498,504 ****
  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)
--- 501,507 ----
  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)