aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Steingold2011-02-03 14:59:17 -0500
committerSam Steingold2011-02-03 14:59:17 -0500
commitc1b4afacf54d7f0226da7e62b45f0ec7ebeb744b (patch)
treeb3fae2ac727d2f58104ed6637f061dea43ca472c
parent67342916c9fd6fffe142539a3aba4601d005e839 (diff)
downloademacs-c1b4afacf54d7f0226da7e62b45f0ec7ebeb744b.tar.gz
emacs-c1b4afacf54d7f0226da7e62b45f0ec7ebeb744b.zip
* lisp/progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom):
Do not error out when `func' is nil.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/gdb-mi.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12c2603e35f..794faaa0ec8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-02-03 Sam Steingold <sds@gnu.org>
2
3 * progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom):
4 Do not error out when `func' is nil.
5
12011-02-03 Michael Albinus <michael.albinus@gmx.de> 62011-02-03 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp-sh.el (tramp-remote-path): Add default settings for 8 * net/tramp-sh.el (tramp-remote-path): Add default settings for
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index ce7de946b5e..bbe9722f548 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -2347,7 +2347,8 @@ HANDLER-NAME handler uses customization of CUSTOM-DEFUN. See
2347 (bindat-get-field breakpoint 'what) 2347 (bindat-get-field breakpoint 'what)
2348 (or pending at 2348 (or pending at
2349 (concat "in " 2349 (concat "in "
2350 (propertize func 'font-lock-face font-lock-function-name-face) 2350 (propertize (or func "unknown")
2351 'font-lock-face font-lock-function-name-face)
2351 (gdb-frame-location breakpoint))))) 2352 (gdb-frame-location breakpoint)))))
2352 ;; Add clickable properties only for breakpoints with file:line 2353 ;; Add clickable properties only for breakpoints with file:line
2353 ;; information 2354 ;; information