(breakpoint): Define as fringe bitmap.

(gdb-mouse-toggle-breakpoint): Fix fringe-bitmaps-at-pos usage.
(gdb-put-breakpoint-icon): Use breakpoint bitmap.

diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 1972074fdb1a7235cab8aa567297145cb2d0e0d9..612a2034e00ec5ba3fca59958e23c595469c5ca5 100644 (file)
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1069,8 +1069,9 @@ static char *magick[] = {
 (defvar breakpoint-disabled-icon nil
   "Icon for disabled breakpoint in display margin")
 
-(defvar breakpoint-bitmap nil
-  "Bitmap for breakpoint in fringe")
+;; Bitmap for breakpoint in fringe
+(define-fringe-bitmap 'breakpoint
+  "\x3c\x7e\xff\xff\xff\xff\x7e\x3c")
 
 (defface breakpoint-enabled-bitmap-face
   '((t
@@ -1140,9 +1141,8 @@ static char *magick[] = {
          (save-excursion
            (goto-char (posn-point posn))
            (if (or (posn-object posn)
-                   (and breakpoint-bitmap
-                        (eq (car (fringe-bitmaps-at-pos (posn-point posn)))
-                            breakpoint-bitmap)))
+                   (eq (car (fringe-bitmaps-at-pos (posn-point posn)))
+                       'breakpoint))
                (gud-remove nil)
              (gud-break nil)))))))
 
@@ -1831,11 +1831,7 @@ BUFFER nil or omitted means use the current buffer."
        (if (>= (car (window-fringes)) 8)
            (gdb-put-string
             nil (1+ start)
-            `(left-fringe
-              ,(or breakpoint-bitmap
-                   (setq breakpoint-bitmap
-                         (define-fringe-bitmap
-                           "\x3c\x7e\xff\xff\xff\xff\x7e\x3c")))
+            `(left-fringe breakpoint
               ,(if enabled
                    'breakpoint-enabled-bitmap-face
                  'breakpoint-disabled-bitmap-face)))