* progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom): y/n

instead of on/off; do not highlight breakpoints without line
information.

2 files changed, 10 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6dd6c13c325..39b56a54c7f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -15,6 +15,8 @@
         (gdb-frame-handler): Match convention to for disassembly buffer
         mode name.
         (gdb-stack-list-frames-handler): Rewritten without regexps.
+        (gdb-breakpoints-list-handler-custom): y/n instead of on/off; do
+        not highlight breakpoints without line information.
 
         * progmodes/gdb-mi.el (gdb-init-1): Set mode name for disassembly
         buffer properly.
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 21e47b514bb..ae5f135c2a9 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -1556,8 +1556,8 @@ OUTPUT-HANDLER-NAME handler uses customization of CUSTOM-DEFUN."
         (gdb-get-field breakpoint 'disp) "\t"
         (let ((flag (gdb-get-field breakpoint 'enabled)))
           (if (string-equal flag "y")
-              (propertize "on" 'face  font-lock-warning-face)
-            (propertize "off" 'face  font-lock-type-face))) "\t"
+              (propertize "y" 'face  font-lock-warning-face)
+            (propertize "n" 'face  font-lock-type-face))) "\t"
         (gdb-get-field breakpoint 'times) "\t"
         (gdb-get-field breakpoint 'addr)))
       (let ((at (gdb-get-field breakpoint 'at)))
@@ -1567,14 +1567,16 @@ OUTPUT-HANDLER-NAME handler uses customization of CUSTOM-DEFUN."
                   (concat " in "
                           (propertize (gdb-get-field breakpoint 'func)
                                       'face font-lock-function-name-face)))
-                 (gdb-insert-frame-location breakpoint)))
+                 (gdb-insert-frame-location breakpoint)
+                 (add-text-properties (line-beginning-position)
+                                      (line-end-position)
+                                      '(mouse-face highlight
+                                        help-echo "mouse-2, RET: visit breakpoint"))))
               (at (insert (concat " " at)))
               (t (insert (gdb-get-field breakpoint 'original-location)))))
       (add-text-properties (line-beginning-position)
                            (line-end-position)
-                           `(gdb-breakpoint ,breakpoint
-                             mouse-face highlight
-                             help-echo "mouse-2, RET: visit breakpoint"))
+                           `(gdb-breakpoint ,breakpoint))
       (newline))
     (gdb-place-breakpoints)))