[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.122 
emacs/lisp/progmodes/gdb-ui.el:1.123
*** emacs/lisp/progmodes/gdb-ui.el:1.122        Thu Dec  1 02:17:15 2005
--- emacs/lisp/progmodes/gdb-ui.el      Sun Dec  4 09:12:07 2005
***************
*** 78,84 ****
  ;; 1) Use MI command -data-read-memory for memory window.
  ;; 2) Highlight changed register values (use MI commands
  ;;    -data-list-register-values and -data-list-changed-registers instead
! ;;    of 'info registers'.
  ;; 3) Use tree-widget.el instead of the speedbar for watch-expressions?
  ;; 4) Mark breakpoint locations on scroll-bar of source buffer?
  ;; 5) After release of 22.1, use "-var-list-children --all-values"
--- 78,84 ----
  ;; 1) Use MI command -data-read-memory for memory window.
  ;; 2) Highlight changed register values (use MI commands
  ;;    -data-list-register-values and -data-list-changed-registers instead
! ;;    of 'info registers' after release of 22.1.
  ;; 3) Use tree-widget.el instead of the speedbar for watch-expressions?
  ;; 4) Mark breakpoint locations on scroll-bar of source buffer?
  ;; 5) After release of 22.1, use "-var-list-children --all-values"
***************
*** 263,268 ****
--- 263,270 ----
        (if (null arg)
            (not gdb-use-inferior-io-buffer)
          (> (prefix-numeric-value arg) 0)))
+   (message (format "Separate inferior IO %sabled"
+                  (if gdb-use-inferior-io-buffer "en" "dis")))
    (if (and gud-comint-buffer
           (buffer-name gud-comint-buffer))
        (condition-case nil
***************
*** 376,386 ****
           "\C-d" "Remove breakpoint at current line or address.")
    ;;
    (gud-def gud-until (if (not (string-match "Machine" mode-name))
!                         (gud-call "until %f:%l" arg)
!                       (save-excursion
!                         (beginning-of-line)
!                         (forward-char 2)
!                         (gud-call "until *%a" arg)))
           "\C-u" "Continue to current line or address.")
    ;;
    (gud-def gud-go (gud-call (if gdb-active-process "continue" "run") arg)
--- 378,388 ----
           "\C-d" "Remove breakpoint at current line or address.")
    ;;
    (gud-def gud-until (if (not (string-match "Machine" mode-name))
!                        (gud-call "until %f:%l" arg)
!                      (save-excursion
!                        (beginning-of-line)
!                        (forward-char 2)
!                        (gud-call "until *%a" arg)))
           "\C-u" "Continue to current line or address.")
    ;;
    (gud-def gud-go (gud-call (if gdb-active-process "continue" "run") arg)
***************
*** 492,498 ****
    (setq gdb-speedbar-auto-raise
        (if (null arg)
            (not gdb-speedbar-auto-raise)
!         (> (prefix-numeric-value arg) 0))))
  
  (defcustom gdb-use-colon-colon-notation nil
    "If non-nil use FUN::VAR format to display variables in the speedbar."
--- 494,502 ----
    (setq gdb-speedbar-auto-raise
        (if (null arg)
            (not gdb-speedbar-auto-raise)
!         (> (prefix-numeric-value arg) 0)))
!   (message (format "Auto raising %sabled"
!                  (if gdb-speedbar-auto-raise "en" "dis"))))
  
  (defcustom gdb-use-colon-colon-notation nil
    "If non-nil use FUN::VAR format to display variables in the speedbar."
***************
*** 547,553 ****
            `(lambda () (gdb-var-evaluate-expression-handler
                         ,(nth 1 var) nil))))
            (setq gdb-var-changed t))
!       (if (re-search-forward "Undefined command" nil t)
          (message-box "Watching expressions requires gdb 6.0 onwards")
        (message "No symbol \"%s\" in current context." expr)))))
  
--- 551,557 ----
            `(lambda () (gdb-var-evaluate-expression-handler
                         ,(nth 1 var) nil))))
            (setq gdb-var-changed t))
!       (if (search-forward "Undefined command" nil t)
          (message-box "Watching expressions requires gdb 6.0 onwards")
        (message "No symbol \"%s\" in current context." expr)))))
  
***************
*** 1736,1742 ****
    (setq mode-name "Frames")
    (setq buffer-read-only t)
    (use-local-map gdb-frames-mode-map)
-   (font-lock-mode -1)
    (run-mode-hooks 'gdb-frames-mode-hook)
    (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
        'gdb-invalidate-frames
--- 1740,1745 ----
***************
*** 1899,1905 ****
      (suppress-keymap map)
      (define-key map "\r" 'gdb-edit-register-value)
      (define-key map [mouse-2] 'gdb-edit-register-value)
!     (define-key map " " 'toggle-gdb-all-registers)
      (define-key map "q" 'kill-this-buffer)
       map))
  
--- 1902,1908 ----
      (suppress-keymap map)
      (define-key map "\r" 'gdb-edit-register-value)
      (define-key map [mouse-2] 'gdb-edit-register-value)
!     (define-key map " " 'gdb-all-registers)
      (define-key map "q" 'kill-this-buffer)
       map))
  
***************
*** 1909,1915 ****
  \\{gdb-registers-mode-map}"
    (kill-all-local-variables)
    (setq major-mode 'gdb-registers-mode)
!   (setq mode-name "Registers:")
    (setq buffer-read-only t)
    (use-local-map gdb-registers-mode-map)
    (run-mode-hooks 'gdb-registers-mode-hook)
--- 1912,1918 ----
  \\{gdb-registers-mode-map}"
    (kill-all-local-variables)
    (setq major-mode 'gdb-registers-mode)
!   (setq mode-name (if gdb-all-registers "Registers:All" "Registers:"))
    (setq buffer-read-only t)
    (use-local-map gdb-registers-mode-map)
    (run-mode-hooks 'gdb-registers-mode-hook)
***************
*** 1934,1950 ****
        (special-display-frame-alist gdb-frame-parameters))
      (display-buffer (gdb-get-create-buffer 'gdb-registers-buffer))))
  
! (defun toggle-gdb-all-registers ()
    "Toggle the display of floating-point registers."
    (interactive)
    (if gdb-all-registers
        (progn
        (setq gdb-all-registers nil)
!       (with-current-buffer (gdb-get-buffer 'gdb-registers-buffer)
          (setq mode-name "Registers:")))
      (setq gdb-all-registers t)
!     (with-current-buffer (gdb-get-buffer 'gdb-registers-buffer)
        (setq mode-name "Registers:All")))
    (gdb-invalidate-registers))
  
  
--- 1937,1955 ----
        (special-display-frame-alist gdb-frame-parameters))
      (display-buffer (gdb-get-create-buffer 'gdb-registers-buffer))))
  
! (defun gdb-all-registers ()
    "Toggle the display of floating-point registers."
    (interactive)
    (if gdb-all-registers
        (progn
        (setq gdb-all-registers nil)
!       (with-current-buffer (gdb-get-create-buffer 'gdb-registers-buffer)
          (setq mode-name "Registers:")))
      (setq gdb-all-registers t)
!     (with-current-buffer (gdb-get-create-buffer 'gdb-registers-buffer)
        (setq mode-name "Registers:All")))
+   (message (format "Display of floating-point registers %sabled"
+                  (if gdb-all-registers "en" "dis")))
    (gdb-invalidate-registers))
  
  
***************
*** 2758,2764 ****
            (progn
              (goto-char (point-min))
              (if (and gdb-frame-address
!                      (re-search-forward gdb-frame-address nil t))
                  (progn
                    (setq pos (point))
                    (beginning-of-line)
--- 2763,2769 ----
            (progn
              (goto-char (point-min))
              (if (and gdb-frame-address
!                      (search-forward gdb-frame-address nil t))
                  (progn
                    (setq pos (point))
                    (beginning-of-line)
***************
*** 2782,2788 ****
              (with-current-buffer buffer
                (save-excursion
                  (goto-char (point-min))
!                 (if (re-search-forward address nil t)
                      (gdb-put-breakpoint-icon (eq flag ?y) bptno))))))))
      (if (not (equal gdb-frame-address "main"))
        (with-current-buffer buffer
--- 2787,2793 ----
              (with-current-buffer buffer
                (save-excursion
                  (goto-char (point-min))
!                 (if (search-forward address nil t)
                      (gdb-put-breakpoint-icon (eq flag ?y) bptno))))))))
      (if (not (equal gdb-frame-address "main"))
        (with-current-buffer buffer