aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Roberts2009-09-19 11:45:57 +0000
committerNick Roberts2009-09-19 11:45:57 +0000
commitd443acd9b1e99cfbc9e56862670cfdc134870281 (patch)
treec2ee5de0db98d4df48286284e9f1bd15e7b39e22
parent9b94c32e390f9a213699ca66cfbe7656aa3e4cff (diff)
downloademacs-d443acd9b1e99cfbc9e56862670cfdc134870281.tar.gz
emacs-d443acd9b1e99cfbc9e56862670cfdc134870281.zip
(gdb-var-update-handler-1): Include case of
older GDB where there is no has_more field.
-rw-r--r--lisp/progmodes/gdb-mi.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 5c8dc7f304a..831c6fdb0f8 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -1149,15 +1149,16 @@ With arg, enter name of variable to be watched in the minibuffer."
1149 (var (assoc varnum gdb-var-list)) 1149 (var (assoc varnum gdb-var-list))
1150 (new-num (bindat-get-field change 'new_num_children))) 1150 (new-num (bindat-get-field change 'new_num_children)))
1151 (when var 1151 (when var
1152 (let ((scope (bindat-get-field change 'in_scope))) 1152 (let ((scope (bindat-get-field change 'in_scope))
1153 (has-more (bindat-get-field change 'has_more)))
1153 (cond ((string-equal scope "false") 1154 (cond ((string-equal scope "false")
1154 (if gdb-delete-out-of-scope 1155 (if gdb-delete-out-of-scope
1155 (gdb-var-delete-1 var varnum) 1156 (gdb-var-delete-1 var varnum)
1156 (setcar (nthcdr 5 var) 'out-of-scope))) 1157 (setcar (nthcdr 5 var) 'out-of-scope)))
1157 ((string-equal scope "true") 1158 ((string-equal scope "true")
1158 (setcar (nthcdr 6 var) 1159 (setcar (nthcdr 6 var) has-more)
1159 (bindat-get-field change 'has_more)) 1160 (when (and (or (not has-more)
1160 (when (and (string-equal (nth 6 var) "0") 1161 (string-equal has-more "0"))
1161 (not new-num) 1162 (not new-num)
1162 (string-equal (nth 2 var) "0")) 1163 (string-equal (nth 2 var) "0"))
1163 (setcar (nthcdr 4 var) 1164 (setcar (nthcdr 4 var)