From 133b8e1120761af85822cfcf3dd8fe440ec058cf Mon Sep 17 00:00:00 2001 From: Kaushik Srenevasan Date: Tue, 6 Mar 2012 00:37:38 -0800 Subject: [PATCH] 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". --- lisp/ChangeLog | 5 +++++ lisp/progmodes/gdb-mi.el | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e9dce6280a6..7d7d250712f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-03-06 Kaushik Srenevasan (tiny change) + + * progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom): + Handle breakpoints with no "type". + 2012-03-06 Glenn Morris * files.el (locate-dominating-file): Add optional predicate argument. diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 0c45c3f5e5d..8ea255e49dd 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -2397,15 +2397,15 @@ HANDLER-NAME handler uses customization of CUSTOM-DEFUN. See (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 " -- 2.11.4.GIT