(gdba): Use the default for gud-find-file.

(def-gdb-variable): Remove: fold into def-gdb-var.
(def-gdb-var): Use buffer-local-value and with-current-buffer.

diff --git a/lisp/gdb-ui.el b/lisp/gdb-ui.el
index 28ceda510521209a7120782762cd516fa5496bd8..e7d5b55a3bcb914bb2728337d694c42b4014a14c 100644 (file)
--- a/lisp/gdb-ui.el
+++ b/lisp/gdb-ui.el
@@ -96,8 +96,7 @@ The following interactive lisp functions help control operation :
 
   (interactive (list (gud-query-cmdline 'gdba)))
 
-  (gdba-common-init command-line nil
-                  'gdba-marker-filter 'gud-gdb-find-file)
+  (gdba-common-init command-line nil 'gdba-marker-filter)
 
   (set (make-local-variable 'gud-minor-mode) 'gdba)
 
@@ -293,32 +292,24 @@ with a gdb instance.")
 ;;; DEF-GDB-VARIABLE
 ;;;
 
-(defmacro def-gdb-variable (name accessor setter &optional default doc)
-  `(progn
-     (defvar ,name ,default ,doc)
-     (if (not (memq ',name gdb-instance-variables))
-        (push ',name gdb-instance-variables))
-     ,(and accessor
-            `(defun ,accessor ()
-               (let ((buffer (gdb-get-instance-buffer 'gdba)))
-                 (and buffer (save-excursion
-                               (set-buffer buffer)
-                               ,name)))))
-     ,(and setter
-            `(defun ,setter (val)
-               (let ((buffer (gdb-get-instance-buffer 'gdba)))
-                 (and buffer (save-excursion
-                               (set-buffer buffer)
-                               (setq ,name val))))))))
-
 (defmacro def-gdb-var (root-symbol &optional default doc)
   (let* ((root (symbol-name root-symbol))
         (accessor (intern (concat "gdb-instance-" root)))
         (setter (intern (concat "set-gdb-instance-" root)))
-        (var-name (intern (concat "gdb-" root))))
-    `(def-gdb-variable
-        ,var-name ,accessor ,setter
-        ,default ,doc)))
+        (name (intern (concat "gdb-" root))))
+    `(progn
+       (defvar ,name ,default ,doc)
+       (if (not (memq ',name gdb-instance-variables))
+          (push ',name gdb-instance-variables))
+       ,(and accessor
+            `(defun ,accessor ()
+               (let ((buffer (gdb-get-instance-buffer 'gdba)))
+                 (and buffer (buffer-local-value ',name buffer)))))
+       ,(and setter
+            `(defun ,setter (val)
+               (let ((buffer (gdb-get-instance-buffer 'gdba)))
+                 (and buffer (with-current-buffer buffer
+                               (setq ,name val)))))))))
 
 (def-gdb-var buffer-type nil
   "One of the symbols bound in gdb-instance-buffer-rules")