[Emacs-diffs] /srv/bzr/emacs/trunk r112702: Gud tooltip tweak

[Glenn Morris]

------------------------------------------------------------
revno: 112702
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-23 23:50:22 -0700
message:
  Gud tooltip tweak
  
  * tooltip.el (tooltip-use-echo-area): Warn only on 'set.
  * progmodes/gud.el (gud-gdb-completion-function): Move before use.
  (gud-tooltip-echo-area): Make obsolete.
  (gud-tooltip-process-output, gud-tooltip-tips): Also check tooltip-mode.
modified:
  lisp/ChangeLog
  lisp/progmodes/gud.el
  lisp/tooltip.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-24 03:50:31 +0000
+++ b/lisp/ChangeLog    2013-05-24 06:50:22 +0000
@@ -1,5 +1,10 @@
 2013-05-24  Glenn Morris  <address@hidden>
 
+       * tooltip.el (tooltip-use-echo-area): Warn only on 'set.
+       * progmodes/gud.el (gud-gdb-completion-function): Move before use.
+       (gud-tooltip-echo-area): Make obsolete.
+       (gud-tooltip-process-output, gud-tooltip-tips): Also check tooltip-mode.
+
        * progmodes/js.el (js--optimize-arglist): Declare.
 
        * progmodes/ruby-mode.el (ruby-syntax-propertize-expansion): Declare.

=== modified file 'lisp/progmodes/gud.el'
--- a/lisp/progmodes/gud.el     2013-05-22 03:13:56 +0000
+++ b/lisp/progmodes/gud.el     2013-05-24 06:50:22 +0000
@@ -716,6 +716,16 @@
 (defvar gud-filter-pending-text nil
   "Non-nil means this is text that has been saved for later in `gud-filter'.")
 
+;; One of the nice features of GDB is its impressive support for
+;; context-sensitive command completion.  We preserve that feature
+;; in the GUD buffer by using a GDB command designed just for Emacs.
+
+(defvar gud-gdb-completion-function nil
+  "Completion function for GDB commands.
+It receives two arguments: COMMAND, the prefix for which we seek
+completion; and CONTEXT, the text before COMMAND on the line.
+It should return a list of completion strings.")
+
 ;; If in gdb mode, gdb-mi is loaded.
 (declare-function gdb-restore-windows "gdb-mi" ())
 
@@ -776,16 +786,6 @@
   (setq gud-filter-pending-text nil)
   (run-hooks 'gud-gdb-mode-hook))
 
-;; One of the nice features of GDB is its impressive support for
-;; context-sensitive command completion.  We preserve that feature
-;; in the GUD buffer by using a GDB command designed just for Emacs.
-
-(defvar gud-gdb-completion-function nil
-  "Completion function for GDB commands.
-It receives two arguments: COMMAND, the prefix for which we seek
-completion; and CONTEXT, the text before COMMAND on the line.
-It should return a list of completion strings.")
-
 ;; The completion process filter indicates when it is finished.
 (defvar gud-gdb-fetch-lines-in-progress)
 
@@ -3352,6 +3352,9 @@
   :group 'gud
   :group 'tooltip)
 
+(make-obsolete-variable 'gud-tooltip-echo-area
+                       "disable Tooltip mode instead" "24.4" 'set)
+
 ;;; Reacting on mouse movements
 
 (defun gud-tooltip-change-major-mode ()
@@ -3438,7 +3441,8 @@
   "Process debugger output and show it in a tooltip window."
   (remove-function (process-filter process) #'gud-tooltip-process-output)
   (tooltip-show (tooltip-strip-prompt process output)
-               (or gud-tooltip-echo-area tooltip-use-echo-area)))
+               (or gud-tooltip-echo-area tooltip-use-echo-area
+                    (not tooltip-mode))))
 
 (defun gud-tooltip-print-command (expr)
   "Return a suitable command to print the expression EXPR."
@@ -3481,7 +3485,8 @@
                    (unless (null define-elt)
                      (tooltip-show
                       (cdr define-elt)
-                      (or gud-tooltip-echo-area tooltip-use-echo-area))
+                      (or gud-tooltip-echo-area tooltip-use-echo-area
+                           (not tooltip-mode)))
                      expr))))
            (when gud-tooltip-dereference
              (setq expr (concat "*" expr)))

=== modified file 'lisp/tooltip.el'
--- a/lisp/tooltip.el   2013-01-01 09:11:05 +0000
+++ b/lisp/tooltip.el   2013-05-24 06:50:22 +0000
@@ -151,7 +151,7 @@
   :group 'tooltip)
 
 (make-obsolete-variable 'tooltip-use-echo-area
-                       "disable Tooltip mode instead" "24.1")
+                       "disable Tooltip mode instead" "24.1" 'set)
 
 
 ;;; Variables that are not customizable.