[Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el,v

[Nick Roberts]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Nick Roberts <nickrob>  07/01/30 22:07:12

Index: gdb-ui.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/gdb-ui.el,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -b -r1.199 -r1.200
--- gdb-ui.el   28 Jan 2007 09:42:23 -0000      1.199
+++ gdb-ui.el   30 Jan 2007 22:07:12 -0000      1.200
@@ -848,15 +848,7 @@
   (setq gdb-pending-triggers
        (delq 'gdb-var-update gdb-pending-triggers)))
 
-(defun gdb-var-delete ()
-  "Delete watch expression at point from the speedbar."
-  (interactive)
-  (if (memq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
-           '(gdbmi gdba))
-      (let* ((var (nth (- (count-lines (point-min) (point)) 2) gdb-var-list))
-            (varnum (car var)))
-       (if (string-match "\\." (car var))
-           (message-box "Can only delete a root expression")
+(defun gdb-var-delete-1 (varnum)
          (gdb-enqueue-input
           (list
            (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
@@ -867,7 +859,18 @@
          (setq gdb-var-list (delq var gdb-var-list))
          (dolist (varchild gdb-var-list)
            (if (string-match (concat (car var) "\\.") (car varchild))
-               (setq gdb-var-list (delq varchild gdb-var-list))))))))
+       (setq gdb-var-list (delq varchild gdb-var-list)))))
+
+(defun gdb-var-delete ()
+  "Delete watch expression at point from the speedbar."
+  (interactive)
+  (if (memq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
+           '(gdbmi gdba))
+      (let* ((var (nth (- (count-lines (point-min) (point)) 2) gdb-var-list))
+            (varnum (car var)))
+       (if (string-match "\\." (car var))
+           (message-box "Can only delete a root expression")
+         (gdb-var-delete-1 varnum)))))
 
 (defun gdb-var-delete-children (varnum)
   "Delete children of variable object at point from the speedbar."
@@ -3443,16 +3446,8 @@
                 (setcar (nthcdr 5 var) 'changed)
                 (setcar (nthcdr 4 var)
                         (read (match-string 2))))
-;;             ((string-equal match "invalid")
-;;              (gdb-enqueue-input
-;;               (list
-;;                (if (eq (buffer-local-value
-;;                         'gud-minor-mode gud-comint-buffer) 'gdba)
-;;                    (concat "server interpreter mi \"-var-delete "
-;;                            varnum "\"\n")
-;;                  (concat "-var-delete " varnum "\n"))
-;;                'ignore)))
-               )))))
+               ((string-equal match "invalid")
+                (gdb-var-delete-1 varnum)))))))
       (setq gdb-pending-triggers
            (delq 'gdb-var-update gdb-pending-triggers))
       (gdb-speedbar-update))