[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.102 
emacs/lisp/progmodes/gdb-ui.el:1.103
*** emacs/lisp/progmodes/gdb-ui.el:1.102        Wed Oct 26 01:01:34 2005
--- emacs/lisp/progmodes/gdb-ui.el      Sun Oct 30 12:10:14 2005
***************
*** 50,55 ****
--- 50,58 ----
  ;; still under development and is part of a process to migrate Emacs from
  ;; annotations to GDB/MI.
  ;;
+ ;; This mode SHOULD WORK WITH GDB 5.0 ONWARDS but you will NEED GDB 6.0
+ ;; ONWARDS TO USE WATCH EXPRESSIONS.
+ ;;
  ;; Windows Platforms:
  ;;
  ;; If you are using Emacs and GDB on Windows you will need to flush the buffer
***************
*** 277,283 ****
    (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
      (goto-char (point-min))
      (if (search-forward "expands to: " nil t)
!       (unless (looking-at "\\S+.*(.*).*")
          (gdb-enqueue-input
           (list  (concat gdb-server-prefix "print " expr "\n")
                  'gdb-tooltip-print))))))
--- 280,286 ----
    (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
      (goto-char (point-min))
      (if (search-forward "expands to: " nil t)
!       (unless (looking-at "\\S-+.*(.*).*")
          (gdb-enqueue-input
           (list  (concat gdb-server-prefix "print " expr "\n")
                  'gdb-tooltip-print))))))
***************
*** 1777,1783 ****
    gdb-info-registers-handler
    gdb-info-registers-custom)
  
! (defun gdb-info-registers-custom ())
  
  (defvar gdb-registers-mode-map
    (let ((map (make-sparse-keymap)))
--- 1780,1797 ----
    gdb-info-registers-handler
    gdb-info-registers-custom)
  
! (defun gdb-info-registers-custom ()
!   (with-current-buffer (gdb-get-buffer 'gdb-registers-buffer)
!     (save-excursion
!       (let ((buffer-read-only nil)
!           bl)
!       (goto-char (point-min))
!       (while (< (point) (point-max))
!         (setq bl (line-beginning-position))
!         (when (looking-at "^[^ ]+")
!           (put-text-property bl (match-end 0)
!                              'face font-lock-variable-name-face))
!         (forward-line 1))))))
  
  (defvar gdb-registers-mode-map
    (let ((map (make-sparse-keymap)))
***************
*** 1786,1797 ****
      (define-key map "q" 'kill-this-buffer)
       map))
  
- (defvar gdb-registers-font-lock-keywords
-   '(
-     ("^[^ ]+" . font-lock-variable-name-face)
-     )
-   "Font lock keywords used in `gdb-registers-mode'.")
- 
  (defun gdb-registers-mode ()
    "Major mode for gdb registers.
  
--- 1800,1805 ----
***************
*** 1801,1808 ****
    (setq mode-name "Registers:")
    (setq buffer-read-only t)
    (use-local-map gdb-registers-mode-map)
-   (set (make-local-variable 'font-lock-defaults)
-        '(gdb-registers-font-lock-keywords))
    (run-mode-hooks 'gdb-registers-mode-hook)
    (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
        'gdb-invalidate-registers
--- 1809,1814 ----
***************
*** 2160,2166 ****
  
  ;; Abbreviate for arrays and structures.
  ;; These can be expanded using gud-display.
! (defun gdb-info-locals-handler nil
    (setq gdb-pending-triggers (delq 'gdb-invalidate-locals
                                  gdb-pending-triggers))
    (let ((buf (gdb-get-buffer 'gdb-partial-output-buffer)))
--- 2166,2172 ----
  
  ;; Abbreviate for arrays and structures.
  ;; These can be expanded using gud-display.
! (defun gdb-info-locals-handler ()
    (setq gdb-pending-triggers (delq 'gdb-invalidate-locals
                                  gdb-pending-triggers))
    (let ((buf (gdb-get-buffer 'gdb-partial-output-buffer)))
***************
*** 2192,2198 ****
      (define-key map "q" 'kill-this-buffer)
       map))
  
! (defvar gdb-local-font-lock-keywords
    '(
      ;; var = (struct struct_tag) value
      ( "\\(^\\(\\sw\\|[_.]\\)+\\) += +(\\(struct\\) \\(\\(\\sw\\|[_.]\\)+\\)"
--- 2198,2204 ----
      (define-key map "q" 'kill-this-buffer)
       map))
  
! (defvar gdb-locals-font-lock-keywords
    '(
      ;; var = (struct struct_tag) value
      ( "\\(^\\(\\sw\\|[_.]\\)+\\) += +(\\(struct\\) \\(\\(\\sw\\|[_.]\\)+\\)"
***************
*** 2219,2225 ****
    (setq buffer-read-only t)
    (use-local-map gdb-locals-mode-map)
    (set (make-local-variable 'font-lock-defaults)
!        '(gdb-local-font-lock-keywords))
    (run-mode-hooks 'gdb-locals-mode-hook)
    (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
        'gdb-invalidate-locals
--- 2225,2231 ----
    (setq buffer-read-only t)
    (use-local-map gdb-locals-mode-map)
    (set (make-local-variable 'font-lock-defaults)
!        '(gdb-locals-font-lock-keywords))
    (run-mode-hooks 'gdb-locals-mode-hook)
    (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
        'gdb-invalidate-locals