[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.91 emacs/lisp/progmodes/gdb-ui.el:1.92
*** emacs/lisp/progmodes/gdb-ui.el:1.91 Wed Oct  5 17:20:03 2005
--- emacs/lisp/progmodes/gdb-ui.el      Thu Oct  6 03:42:24 2005
***************
*** 103,108 ****
--- 103,109 ----
  (defvar gdb-error "Non-nil when GDB is reporting an error.")
  (defvar gdb-macro-info nil
    "Non-nil if GDB knows that the inferior includes preprocessor macro info.")
+ (defvar gdb-fringe-width nil)
  
  (defvar gdb-buffer-type nil
    "One of the symbols bound in `gdb-buffer-rules'.")
***************
*** 377,383 ****
        gdb-location-alist nil
        gdb-find-file-unhook nil
        gdb-error nil
!       gdb-macro-info nil)
    ;;
    (setq gdb-buffer-type 'gdba)
    ;;
--- 378,385 ----
        gdb-location-alist nil
        gdb-find-file-unhook nil
        gdb-error nil
!       gdb-macro-info nil
!       gdb-buffer-fringe-width (car (window-fringes)))
    ;;
    (setq gdb-buffer-type 'gdba)
    ;;
***************
*** 2470,2476 ****
  (defun gdb-put-breakpoint-icon (enabled bptno)
    (let ((start (- (line-beginning-position) 1))
        (end (+ (line-end-position) 1))
!       (putstring (if enabled "B" "b")))
      (add-text-properties
       0 1 '(help-echo "mouse-1: set/clear bkpt, mouse-3: enable/disable bkpt")
       putstring)
--- 2472,2479 ----
  (defun gdb-put-breakpoint-icon (enabled bptno)
    (let ((start (- (line-beginning-position) 1))
        (end (+ (line-end-position) 1))
!       (putstring (if enabled "B" "b"))
!       (source-window (get-buffer-window (current-buffer) 0)))
      (add-text-properties
       0 1 '(help-echo "mouse-1: set/clear bkpt, mouse-3: enable/disable bkpt")
       putstring)
***************
*** 2480,2486 ****
         0 1 `(gdb-bptno ,bptno gdb-enabled nil) putstring))
      (gdb-remove-breakpoint-icons start end)
      (if (display-images-p)
!       (if (>= (car (window-fringes)) 8)
            (gdb-put-string
             nil (1+ start)
             `(left-fringe breakpoint
--- 2483,2491 ----
         0 1 `(gdb-bptno ,bptno gdb-enabled nil) putstring))
      (gdb-remove-breakpoint-icons start end)
      (if (display-images-p)
!       (if (>= (or left-fringe-width
!                  (if source-window (car (window-fringes source-window)))
!                  gdb-buffer-fringe-width) 8)
            (gdb-put-string
             nil (1+ start)
             `(left-fringe breakpoint
***************
*** 2490,2498 ****
          (when (< left-margin-width 2)
            (save-current-buffer
              (setq left-margin-width 2)
!             (if (get-buffer-window (current-buffer) 0)
                  (set-window-margins
!                  (get-buffer-window (current-buffer) 0)
                   left-margin-width right-margin-width))))
          (put-image
           (if enabled
--- 2495,2503 ----
          (when (< left-margin-width 2)
            (save-current-buffer
              (setq left-margin-width 2)
!             (if source-window
                  (set-window-margins
!                  source-window
                   left-margin-width right-margin-width))))
          (put-image
           (if enabled