[Emacs-diffs] /srv/bzr/emacs/trunk r107518: Small gdb-breakpoints fix (tiny change)

[Glenn Morris]

------------------------------------------------------------
revno: 107518
author: Kaushik Srenevasan <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-03-06 00:37:38 -0800
message:
  Small gdb-breakpoints fix (tiny change)
  Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00753.html
  
  * lisp/progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom):
  Handle breakpoints with no "type".
modified:
  lisp/ChangeLog
  lisp/progmodes/gdb-mi.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-06 08:22:42 +0000
+++ b/lisp/ChangeLog    2012-03-06 08:37:38 +0000
@@ -1,3 +1,8 @@
+2012-03-06  Kaushik Srenevasan  <address@hidden>  (tiny change)
+
+       * progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom):
+       Handle breakpoints with no "type".
+
 2012-03-06  Glenn Morris  <address@hidden>
 
        * files.el (locate-dominating-file): Add optional predicate argument.

=== modified file 'lisp/progmodes/gdb-mi.el'
--- a/lisp/progmodes/gdb-mi.el  2012-02-26 09:38:45 +0000
+++ b/lisp/progmodes/gdb-mi.el  2012-03-06 08:37:38 +0000
@@ -2397,15 +2397,15 @@
         (gdb-table-add-row table
                            (list
                             (bindat-get-field breakpoint 'number)
-                            type
-                            (bindat-get-field breakpoint 'disp)
+                            (or type "")
+                            (or (bindat-get-field breakpoint 'disp) "")
                             (let ((flag (bindat-get-field breakpoint 
'enabled)))
                               (if (string-equal flag "y")
                                   (propertize "y" 'font-lock-face  
font-lock-warning-face)
                                 (propertize "n" 'font-lock-face  
font-lock-comment-face)))
                             (bindat-get-field breakpoint 'addr)
-                            (bindat-get-field breakpoint 'times)
-                            (if (string-match ".*watchpoint" type)
+                            (or (bindat-get-field breakpoint 'times) "")
+                            (if (and type (string-match ".*watchpoint" type))
                                 (bindat-get-field breakpoint 'what)
                               (or pending at
                                   (concat "in "