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

[Kim F . Storm]

Index: emacs/lisp/progmodes/gdb-ui.el
diff -c emacs/lisp/progmodes/gdb-ui.el:1.20 emacs/lisp/progmodes/gdb-ui.el:1.21
*** emacs/lisp/progmodes/gdb-ui.el:1.20 Sat Jun 26 13:12:28 2004
--- emacs/lisp/progmodes/gdb-ui.el      Tue Jun 29 13:01:27 2004
***************
*** 39,45 ****
  ;; Kingdon and uses GDB's annotation interface. You don't need to know about
  ;; annotations to use this mode as a debugger, but if you are interested
  ;; developing the mode itself, then see the Annotations section in the GDB
! ;; info manual. 
  ;;
  ;; GDB developers plan to make the annotation interface obsolete. A new
  ;; interface called GDB/MI (machine interface) has been designed to replace
--- 39,45 ----
  ;; Kingdon and uses GDB's annotation interface. You don't need to know about
  ;; annotations to use this mode as a debugger, but if you are interested
  ;; developing the mode itself, then see the Annotations section in the GDB
! ;; info manual.
  ;;
  ;; GDB developers plan to make the annotation interface obsolete. A new
  ;; interface called GDB/MI (machine interface) has been designed to replace
***************
*** 70,76 ****
  (defvar gdb-variables '()
    "A list of variables that are local to the GUD buffer.")
  (defvar gdb-server-prefix nil)
!  
  ;;;###autoload
  (defun gdba (command-line)
    "Run gdb on program FILE in buffer *gud-FILE*.
--- 70,76 ----
  (defvar gdb-variables '()
    "A list of variables that are local to the GUD buffer.")
  (defvar gdb-server-prefix nil)
! 
  ;;;###autoload
  (defun gdba (command-line)
    "Run gdb on program FILE in buffer *gud-FILE*.
***************
*** 227,233 ****
        (if (string-equal expr (car var)) (throw 'already-watched nil)))
        (set-text-properties 0 (length expr) nil expr)
        (gdb-enqueue-input
!        (list 
        (if (eq gud-minor-mode 'gdba)
            (concat "server interpreter mi \"-var-create - * "  expr "\"\n")
          (concat"-var-create - * "  expr "\n"))
--- 227,233 ----
        (if (string-equal expr (car var)) (throw 'already-watched nil)))
        (set-text-properties 0 (length expr) nil expr)
        (gdb-enqueue-input
!        (list
        (if (eq gud-minor-mode 'gdba)
            (concat "server interpreter mi \"-var-create - * "  expr "\"\n")
          (concat"-var-create - * "  expr "\n"))
***************
*** 326,332 ****
    (if (not (member 'gdb-var-update gdb-pending-triggers))
        (progn
        (gdb-enqueue-input
!        (list 
          (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
              "server interpreter mi \"-var-update *\"\n"
            "-var-update *\n")
--- 326,332 ----
    (if (not (member 'gdb-var-update gdb-pending-triggers))
        (progn
        (gdb-enqueue-input
!        (list
          (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
              "server interpreter mi \"-var-update *\"\n"
            "-var-update *\n")
***************
*** 362,368 ****
               (varnum (cadr var)))
          (unless (string-match "\\." varnum)
            (gdb-enqueue-input
!            (list 
              (if (with-current-buffer gud-comint-buffer
                    (eq gud-minor-mode 'gdba))
                  (concat "server interpreter mi \"-var-delete " varnum "\"\n")
--- 362,368 ----
               (varnum (cadr var)))
          (unless (string-match "\\." varnum)
            (gdb-enqueue-input
!            (list
              (if (with-current-buffer gud-comint-buffer
                    (eq gud-minor-mode 'gdba))
                  (concat "server interpreter mi \"-var-delete " varnum "\"\n")
***************
*** 486,492 ****
          (set (make-local-variable 'gdb-buffer-type) key)
          (if (cdr (cdr rules))
              (funcall (car (cdr (cdr rules)))))
!         (set (make-local-variable 'gud-minor-mode) 
               (with-current-buffer gud-comint-buffer gud-minor-mode))
          (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
          new))))
--- 486,492 ----
          (set (make-local-variable 'gdb-buffer-type) key)
          (if (cdr (cdr rules))
              (funcall (car (cdr (cdr rules)))))
!         (set (make-local-variable 'gud-minor-mode)
               (with-current-buffer gud-comint-buffer gud-minor-mode))
          (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
          new))))
***************
*** 1076,1088 ****
    '((t
       :inherit fringe
       :foreground "red"))
!   "Face for enabled breakpoint icon in fringe.")
  
  (defface breakpoint-disabled-bitmap-face
    '((t
       :inherit fringe
       :foreground "grey60"))
!   "Face for disabled breakpoint icon in fringe.")
  
  
  ;;-put breakpoint icons in relevant margins (even those set in the GUD buffer)
--- 1076,1090 ----
    '((t
       :inherit fringe
       :foreground "red"))
!   "Face for enabled breakpoint icon in fringe."
!   :group 'gud)
  
  (defface breakpoint-disabled-bitmap-face
    '((t
       :inherit fringe
       :foreground "grey60"))
!   "Face for disabled breakpoint icon in fringe."
!   :group 'gud)
  
  
  ;;-put breakpoint icons in relevant margins (even those set in the GUD buffer)
***************
*** 1837,1843 ****
            (save-current-buffer
              (setq left-margin-width 2)
              (if (get-buffer-window (current-buffer) 'visible)
!                 (set-window-margins 
                   (get-buffer-window (current-buffer) 'visible)
                   left-margin-width right-margin-width))))
          (put-image
--- 1839,1845 ----
            (save-current-buffer
              (setq left-margin-width 2)
              (if (get-buffer-window (current-buffer) 'visible)
!                 (set-window-margins
                   (get-buffer-window (current-buffer) 'visible)
                   left-margin-width right-margin-width))))
          (put-image
***************
*** 1864,1870 ****
        (save-current-buffer
          (setq left-margin-width 2)
          (if (get-buffer-window (current-buffer) 'visible)
!             (set-window-margins 
               (get-buffer-window (current-buffer) 'visible)
               left-margin-width right-margin-width))))
        (gdb-put-string (if enabled "B" "b") (1+ start)))))
--- 1866,1872 ----
        (save-current-buffer
          (setq left-margin-width 2)
          (if (get-buffer-window (current-buffer) 'visible)
!             (set-window-margins
               (get-buffer-window (current-buffer) 'visible)
               left-margin-width right-margin-width))))
        (gdb-put-string (if enabled "B" "b") (1+ start)))))
***************
*** 1876,1882 ****
    (when remove-margin
      (setq left-margin-width 0)
      (if (get-buffer-window (current-buffer) 'visible)
!       (set-window-margins 
         (get-buffer-window (current-buffer) 'visible)
         left-margin-width right-margin-width))))
  
--- 1878,1884 ----
    (when remove-margin
      (setq left-margin-width 0)
      (if (get-buffer-window (current-buffer) 'visible)
!       (set-window-margins
         (get-buffer-window (current-buffer) 'visible)
         left-margin-width right-margin-width))))