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

[Nick Roberts]

Index: emacs/lisp/progmodes/gdb-ui.el
diff -c emacs/lisp/progmodes/gdb-ui.el:1.101 
emacs/lisp/progmodes/gdb-ui.el:1.102
*** emacs/lisp/progmodes/gdb-ui.el:1.101        Tue Oct 25 02:30:39 2005
--- emacs/lisp/progmodes/gdb-ui.el      Wed Oct 26 01:01:34 2005
***************
*** 1200,1206 ****
  (defmacro def-gdb-auto-update-trigger (name demand-predicate gdb-command
                                            output-handler)
    `(defun ,name (&optional ignored)
!      (if (and (,demand-predicate)
              (not (member ',name
                           gdb-pending-triggers)))
         (progn
--- 1200,1206 ----
  (defmacro def-gdb-auto-update-trigger (name demand-predicate gdb-command
                                            output-handler)
    `(defun ,name (&optional ignored)
!      (if (and ,demand-predicate
              (not (member ',name
                           gdb-pending-triggers)))
         (progn
***************
*** 1232,1238 ****
    `(progn
       (def-gdb-auto-update-trigger ,trigger-name
         ;; The demand predicate:
!        (lambda () (gdb-get-buffer ',buffer-key))
         ,gdb-command
         ,output-handler-name)
       (def-gdb-auto-update-handler ,output-handler-name
--- 1232,1238 ----
    `(progn
       (def-gdb-auto-update-trigger ,trigger-name
         ;; The demand predicate:
!        (gdb-get-buffer ',buffer-key)
         ,gdb-command
         ,output-handler-name)
       (def-gdb-auto-update-handler ,output-handler-name
***************
*** 2153,2163 ****
                      'gdb-locals-buffer-name
                      'gdb-locals-mode)
  
! (def-gdb-auto-updated-buffer gdb-locals-buffer
!   gdb-invalidate-locals
    "server info locals\n"
!   gdb-info-locals-handler
!   gdb-info-locals-custom)
  
  ;; Abbreviate for arrays and structures.
  ;; These can be expanded using gud-display.
--- 2153,2162 ----
                      'gdb-locals-buffer-name
                      'gdb-locals-mode)
  
! (def-gdb-auto-update-trigger gdb-invalidate-locals
!   (gdb-get-buffer 'gdb-locals-buffer)
    "server info locals\n"
!   gdb-info-locals-handler)
  
  ;; Abbreviate for arrays and structures.
  ;; These can be expanded using gud-display.
***************
*** 2187,2195 ****
                (set-window-point window p)))))
    (run-hooks 'gdb-info-locals-hook))
  
- (defun gdb-info-locals-custom ()
-   nil)
- 
  (defvar gdb-locals-mode-map
    (let ((map (make-sparse-keymap)))
      (suppress-keymap map)
--- 2186,2191 ----
***************
*** 2614,2625 ****
                      'gdb-assembler-buffer-name
                      'gdb-assembler-mode)
  
! (def-gdb-auto-updated-buffer gdb-assembler-buffer
    gdb-invalidate-assembler
!   (concat gdb-server-prefix "disassemble "
!         (if (member gdb-frame-address '(nil "main")) nil "0x")
!         gdb-frame-address "\n")
!   gdb-assembler-handler
    gdb-assembler-custom)
  
  (defun gdb-assembler-custom ()
--- 2610,2618 ----
                      'gdb-assembler-buffer-name
                      'gdb-assembler-mode)
  
! (def-gdb-auto-update-handler gdb-assembler-handler
    gdb-invalidate-assembler
!   gdb-assembler-buffer
    gdb-assembler-custom)
  
  (defun gdb-assembler-custom ()