Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-193

Use gdb-ui breakpoint faces on ttys too

2005-03-20  Miles Bader  <miles@gnu.org>

   * lisp/progmodes/gdb-ui.el (gdb-put-breakpoint-icon): Use breakpoint faces
   in text-mode too.  Change to new face names.
   (breakpoint-enabled): Renamed from `breakpoint-enabled-bitmap-face'.
   Add `:weight bold' attribute.
   (breakpoint-disabled): Renamed from `breakpoint-disabled-bitmap-face'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a756e8cf475a4faad75256bdef08101de6ef1de1..84b7191ac0ab393fefabe01f1d87f469e7b45f47 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-20  Miles Bader  <miles@gnu.org>
+
+       * progmodes/gdb-ui.el (gdb-put-breakpoint-icon): Use breakpoint faces
+       in text-mode too.  Change to new face names.
+       (breakpoint-enabled): Renamed from `breakpoint-enabled-bitmap-face'.
+       Add `:weight bold' attribute.
+       (breakpoint-disabled): Renamed from `breakpoint-disabled-bitmap-face'.
+
 2005-03-19  Juri Linkov  <juri@jurta.org>
 
        * files.el (auto-mode-alist): Add comment.  Optimize jar/ear/war.

diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index fea1bbce69a58d1f72da2f1e2ad1906926539ada..e339dbc3b191d60dc08668b523640dcd1bf5ca97 100644 (file)
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1160,20 +1160,24 @@ static char *magick[] = {
      (define-fringe-bitmap 'breakpoint
        "\x3c\x7e\xff\xff\xff\xff\x7e\x3c"))
 
-(defface breakpoint-enabled-bitmap-face
+(defface breakpoint-enabled
   '((t
      :inherit fringe
+     :weight bold
      :foreground "red"))
   "Face for enabled breakpoint icon in fringe."
   :group 'gud)
+;; compatibility alias for old name
+(put 'breakpoint-enabled-bitmap-face 'face-alias 'breakpoint-enabled)
 
-(defface breakpoint-disabled-bitmap-face
+(defface breakpoint-disabled
   '((t
      :inherit fringe
      :foreground "grey60"))
   "Face for disabled breakpoint icon in fringe."
   :group 'gud)
-
+;; compatibility alias for old name
+(put 'breakpoint-disabled-bitmap-face 'face-alias 'breakpoint-disabled)
 
 ;;-put breakpoint icons in relevant margins (even those set in the GUD buffer)
 (defun gdb-info-breakpoints-custom ()
@@ -2194,8 +2198,8 @@ BUFFER nil or omitted means use the current buffer."
             nil (1+ start)
             `(left-fringe breakpoint
                           ,(if enabled
-                               'breakpoint-enabled-bitmap-face
-                             'breakpoint-disabled-bitmap-face)))
+                               'breakpoint-enabled
+                             'breakpoint-disabled)))
          (when (< left-margin-width 2)
            (save-current-buffer
              (setq left-margin-width 2)
@@ -2232,7 +2236,10 @@ BUFFER nil or omitted means use the current buffer."
              (set-window-margins
               (get-buffer-window (current-buffer) 0)
               left-margin-width right-margin-width))))
-      (gdb-put-string putstring (1+ start)))))
+      (gdb-put-string
+       (propertize putstring
+                  'face (if enabled 'breakpoint-enabled 'breakpoint-disabled))
+       (1+ start)))))
 
 (defun gdb-remove-breakpoint-icons (start end &optional remove-margin)
   (gdb-remove-strings start end)