[PATCH] gdb-mi.el

[Nick Roberts <nickrob at snap dot net dot nz>]

Emacs 22 hasn't been released yet and so is still changing.  OK  to commit?

Nick


2005-10-27  Nick Roberts  <nickrob@snap.net.nz>

	* mi/gdb-mi.el: Update to reflect changes in Emacs 22.0.50


*** gdb-mi.el	10 Feb 2006 16:57:10 +1300	1.4
--- gdb-mi.el	09 Feb 2006 23:50:50 +1300	
***************
*** 43,50 ****
  ;; GUD buffer you must not use run, step, next or continue etc but their MI
  ;; counterparts through gud-run, gud-step etc, e.g clicking on the appropriate
  ;; icon in the toolbar.
- ;;
  ;; 2) Some commands send extra prompts to the GUD buffer.
  ;;
  ;; TODO:
  ;; 1) Prefix MI commands with a token instead of queueing commands.
--- 43,50 ----
  ;; GUD buffer you must not use run, step, next or continue etc but their MI
  ;; counterparts through gud-run, gud-step etc, e.g clicking on the appropriate
  ;; icon in the toolbar.
  ;; 2) Some commands send extra prompts to the GUD buffer.
+ ;; 3) Doesn't list catchpoints in breakpoints buffer.
  ;;
  ;; TODO:
  ;; 1) Prefix MI commands with a token instead of queueing commands.
***************
*** 216,221 ****
--- 216,222 ----
    (gdb-enqueue-input
     (list "-gdb-show prompt\n" 'gdb-get-prompt))
    ;;
+   (setq gdb-locals-font-lock-keywords gdb-locals-font-lock-keywords-2)
    (run-hooks 'gdbmi-mode-hook))
  
  ; Force nil till fixed.
***************
*** 467,473 ****
  
  (defconst gdb-break-list-regexp
  "number=\"\\(.*?\\)\",type=\"\\(.*?\\)\",disp=\"\\(.*?\\)\",enabled=\"\\(.\\)\",\
! addr=\"\\(.*?\\)\",func=\"\\(.*?\\)\",file=\"\\(.*?\\)\",line=\"\\(.*?\\)\"")
  
  (defun gdb-break-list-handler ()
    (setq gdb-pending-triggers (delq 'gdbmi-invalidate-breakpoints
--- 468,475 ----
  
  (defconst gdb-break-list-regexp
  "number=\"\\(.*?\\)\",type=\"\\(.*?\\)\",disp=\"\\(.*?\\)\",enabled=\"\\(.\\)\",\
! addr=\"\\(.*?\\)\",func=\"\\(.*?\\)\",file=\"\\(.*?\\)\",fullname=\".*?\",\
! line=\"\\(.*?\\)\"")
  
  (defun gdb-break-list-handler ()
    (setq gdb-pending-triggers (delq 'gdbmi-invalidate-breakpoints
***************
*** 553,566 ****
        (end-of-line)))
    (if (gdb-get-buffer 'gdb-assembler-buffer) (gdb-assembler-custom)))
  
! (defvar gdb-source-file-regexp "fullname=\"\\(.*?\\)\"")
  
  (defun gdbmi-get-location (bptno line flag)
    "Find the directory containing the relevant source file.
  Put in buffer and place breakpoint icon."
    (goto-char (point-min))
    (catch 'file-not-found
!     (if (re-search-forward gdb-source-file-regexp nil t)
  	(delete (cons bptno "File not found") gdb-location-alist)
  	(push (cons bptno (match-string 1)) gdb-location-alist)
        (gdb-resync)
--- 555,568 ----
        (end-of-line)))
    (if (gdb-get-buffer 'gdb-assembler-buffer) (gdb-assembler-custom)))
  
! (defvar gdbmi-source-file-regexp "fullname=\"\\(.*?\\)\"")
  
  (defun gdbmi-get-location (bptno line flag)
    "Find the directory containing the relevant source file.
  Put in buffer and place breakpoint icon."
    (goto-char (point-min))
    (catch 'file-not-found
!     (if (re-search-forward gdbmi-source-file-regexp nil t)
  	(delete (cons bptno "File not found") gdb-location-alist)
  	(push (cons bptno (match-string 1)) gdb-location-alist)
        (gdb-resync)
***************
*** 773,779 ****
    "Find the source file where the program starts and display it with related
  buffers, if required."
    (goto-char (point-min))
!   (if (re-search-forward gdb-source-file-regexp nil t)
        (setq gdb-main-file (match-string 1)))
   (if gdb-many-windows
        (gdb-setup-windows)
--- 775,781 ----
    "Find the source file where the program starts and display it with related
  buffers, if required."
    (goto-char (point-min))
!   (if (re-search-forward gdbmi-source-file-regexp nil t)
        (setq gdb-main-file (match-string 1)))
   (if gdb-many-windows
        (gdb-setup-windows)
***************
*** 785,791 ****
  (defun gdb-get-source-file-list ()
    "Create list of source files for current GDB session."
    (goto-char (point-min))
!   (while (re-search-forward gdb-source-file-regexp nil t)
      (push (match-string 1) gdb-source-file-list)))
  
  (defun gdbmi-get-selected-frame ()
--- 787,793 ----
  (defun gdb-get-source-file-list ()
    "Create list of source files for current GDB session."
    (goto-char (point-min))
!   (while (re-search-forward gdbmi-source-file-regexp nil t)
      (push (match-string 1) gdb-source-file-list)))
  
  (defun gdbmi-get-selected-frame ()