[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.45 emacs/lisp/progmodes/gdb-ui.el:1.46
*** emacs/lisp/progmodes/gdb-ui.el:1.45 Tue Feb  8 11:53:43 2005
--- emacs/lisp/progmodes/gdb-ui.el      Wed Feb  9 15:50:36 2005
***************
*** 59,65 ****
  ;;    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 21.4 use '-var-list-children --all-values'
  ;;    and '-stack-list-locals 2' which need GDB 6.1 onwards.
  
  ;;; Code:
--- 59,65 ----
  ;;    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'
  ;;    and '-stack-list-locals 2' which need GDB 6.1 onwards.
  
  ;;; Code:
***************
*** 183,195 ****
    "Non-nil means record the process input and output in `gdb-debug-log'."
    :type 'boolean
    :group 'gud
!   :version "21.4")
  
  (defcustom gdb-use-inferior-io-buffer nil
    "Non-nil means display output from the inferior in a separate buffer."
    :type 'boolean
    :group 'gud
!   :version "21.4")
  
  (defun gdb-ann3 ()
    (setq gdb-debug-log nil)
--- 183,195 ----
    "Non-nil means record the process input and output in `gdb-debug-log'."
    :type 'boolean
    :group 'gud
!   :version "22.1")
  
  (defcustom gdb-use-inferior-io-buffer nil
    "Non-nil means display output from the inferior in a separate buffer."
    :type 'boolean
    :group 'gud
!   :version "22.1")
  
  (defun gdb-ann3 ()
    (setq gdb-debug-log nil)
***************
*** 268,274 ****
    "If non-nil use FUN::VAR format to display variables in the speedbar." ;
    :type 'boolean
    :group 'gud
!   :version "21.4")
  
  (defun gud-watch ()
    "Watch expression at point."
--- 268,274 ----
    "If non-nil use FUN::VAR format to display variables in the speedbar." ;
    :type 'boolean
    :group 'gud
!   :version "22.1")
  
  (defun gud-watch ()
    "Watch expression at point."
***************
*** 441,447 ****
  The highlighting is done with `font-lock-warning-face'."
    :type 'boolean
    :group 'gud
!   :version "21.4")
  
  (defun gdb-speedbar-expand-node (text token indent)
    "Expand the node the user clicked on.
--- 441,447 ----
  The highlighting is done with `font-lock-warning-face'."
    :type 'boolean
    :group 'gud
!   :version "22.1")
  
  (defun gdb-speedbar-expand-node (text token indent)
    "Expand the node the user clicked on.
***************
*** 491,497 ****
             (name (funcall (gdb-rules-name-maker rules)))
             (new (get-buffer-create name)))
        (with-current-buffer new
!         (let ((trigger))        
            (if (cdr (cdr rules))
                (setq trigger (funcall (car (cdr (cdr rules))))))
            (set (make-local-variable 'gdb-buffer-type) key)
--- 491,497 ----
             (name (funcall (gdb-rules-name-maker rules)))
             (new (get-buffer-create name)))
        (with-current-buffer new
!         (let ((trigger))
            (if (cdr (cdr rules))
                (setq trigger (funcall (car (cdr (cdr rules))))))
            (set (make-local-variable 'gdb-buffer-type) key)
***************
*** 691,697 ****
    "Default command to execute an executable under the GDB-UI debugger."
    :type 'string
    :group 'gud
!   :version "21.4")
  
  (defvar gdb-annotation-rules
    '(("pre-prompt" gdb-pre-prompt)
--- 691,697 ----
    "Default command to execute an executable under the GDB-UI debugger."
    :type 'string
    :group 'gud
!   :version "22.1")
  
  (defvar gdb-annotation-rules
    '(("pre-prompt" gdb-pre-prompt)
***************
*** 789,795 ****
        (setq gud-running t)
        (if gdb-use-inferior-io-buffer
            (setq gdb-output-sink 'inferior))))
!      (t 
        (gdb-resync)
        (error "Unexpected `starting' annotation")))))
  
--- 789,795 ----
        (setq gud-running t)
        (if gdb-use-inferior-io-buffer
            (setq gdb-output-sink 'inferior))))
!      (t
        (gdb-resync)
        (error "Unexpected `starting' annotation")))))
  
***************
*** 1205,1211 ****
        (with-selected-window (posn-window posn)
          (save-excursion
            (goto-char (posn-point posn))
!           (if 
  ;             (or
                 (posn-object posn)
  ;              (eq (car (fringe-bitmaps-at-pos (posn-point posn)))
--- 1205,1211 ----
        (with-selected-window (posn-window posn)
          (save-excursion
            (goto-char (posn-point posn))
!           (if
  ;             (or
                 (posn-object posn)
  ;              (eq (car (fringe-bitmaps-at-pos (posn-point posn)))
***************
*** 1544,1550 ****
    "Number of data items in memory window."
    :type 'integer
    :group 'gud
!   :version "21.4")
  
  (defcustom gdb-memory-format "x"
    "Display format of data items in memory window."
--- 1544,1550 ----
    "Number of data items in memory window."
    :type 'integer
    :group 'gud
!   :version "22.1")
  
  (defcustom gdb-memory-format "x"
    "Display format of data items in memory window."
***************
*** 1554,1560 ****
                 (const :tag "Octal" "o")
                 (const :tag "Binary" "t"))
    :group 'gud
!   :version "21.4")
  
  (defcustom gdb-memory-unit "w"
    "Unit size of data items in memory window."
--- 1554,1560 ----
                 (const :tag "Octal" "o")
                 (const :tag "Binary" "t"))
    :group 'gud
!   :version "22.1")
  
  (defcustom gdb-memory-unit "w"
    "Unit size of data items in memory window."
***************
*** 1563,1569 ****
                 (const :tag "Word" "w")
                 (const :tag "Giant word" "g"))
    :group 'gud
!   :version "21.4")
  
  (gdb-set-buffer-rules 'gdb-memory-buffer
                      'gdb-memory-buffer-name
--- 1563,1569 ----
                 (const :tag "Word" "w")
                 (const :tag "Giant word" "g"))
    :group 'gud
!   :version "22.1")
  
  (gdb-set-buffer-rules 'gdb-memory-buffer
                      'gdb-memory-buffer-name
***************
*** 1753,1759 ****
    (use-local-map gdb-memory-mode-map)
    (setq header-line-format
        '(:eval
!         (concat 
           "Read address: "
           (propertize gdb-memory-address
                       'face font-lock-warning-face
--- 1753,1759 ----
    (use-local-map gdb-memory-mode-map)
    (setq header-line-format
        '(:eval
!         (concat
           "Read address: "
           (propertize gdb-memory-address
                       'face font-lock-warning-face
***************
*** 1957,1963 ****
    "Nil means don't display source file containing the main routine."
    :type 'boolean
    :group 'gud
!   :version "21.4")
  
  (defun gdb-set-window-buffer (name)
    (set-window-buffer (selected-window) (get-buffer name))
--- 1957,1963 ----
    "Nil means don't display source file containing the main routine."
    :type 'boolean
    :group 'gud
!   :version "22.1")
  
  (defun gdb-set-window-buffer (name)
    (set-window-buffer (selected-window) (get-buffer name))
***************
*** 2001,2007 ****
  `gdba'."
    :type 'boolean
    :group 'gud
!   :version "21.4")
  
  (defun gdb-many-windows (arg)
    "Toggle the number of windows in the basic arrangement."
--- 2001,2007 ----
  `gdba'."
    :type 'boolean
    :group 'gud
!   :version "22.1")
  
  (defun gdb-many-windows (arg)
    "Toggle the number of windows in the basic arrangement."