(gdb-gud-context-call): Does not need to be a macro.

(gdb-registers-handler-custom): Do not fail when register names
are unavailable.

2 files changed, 14 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b6213ebcab2..58a607bc505 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-09  Dmitry Dzhus  <dima@sphinx.net.ru>
+
+        * progmodes/gdb-mi.el (gdb-gud-context-call): Does not need to be
+        a macro.
+        (gdb-registers-handler-custom): Do not fail when register names
+        are unavailable.
+
 2009-08-08  Dmitry Dzhus  <dima@sphinx.net.ru>
 
         * progmodes/gdb-mi.el (gdb-control-all-threads)
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 5a8fde8203e..975908f2166 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -566,11 +566,11 @@ When `gdb-non-stop' is nil, return COMMAND unchanged."
     command))
 
 ;; TODO Document this. We use noarg when not in gud-def
-(defmacro gdb-gud-context-call (cmd1 &optional cmd2 noall noarg)
-  `(gud-call
-    (concat
-     (gdb-gud-context-command ,cmd1 ,noall)
-     ,cmd2) ,(when (not noarg) 'arg)))
+(defun gdb-gud-context-call (cmd1 &optional cmd2 noall noarg)
+  (gud-call
+   (concat
+    (gdb-gud-context-command cmd1 noall)
+    cmd2) (when (not noarg) 'arg)))
 
 ;;;###autoload
 (defun gdb (command-line)
@@ -3550,6 +3550,7 @@ member."
              (value (gdb-get-field register 'value))
              (register-name (nth (string-to-number register-number) 
                                  gdb-register-names)))
+        (when register-name
         (gdb-table-add-row
          table
          (list
@@ -3559,7 +3560,7 @@ member."
             value))
          `(mouse-face highlight
            help-echo "mouse-2: edit value"
-           gdb-register-name ,register-name))))
+           gdb-register-name ,register-name)))))
     (insert (gdb-table-string table " "))
     (setq mode-name
           (gdb-current-context-mode-name "Registers"))))