Merged from miles@gnu.org--gnu-2005 (patch 192-203)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-192
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-193
   Use gdb-ui breakpoint faces on ttys too

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-194
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-195
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-196
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-197
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-198
   Tweak gdb-ui breakpoint faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-199
   Tweak gdb-ui breakpoint faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-200
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-201
   Tweak info/.arch-inventory to identify info/.cvsignore as source

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-202
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-203
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-316

1 files changed, 29 insertions, 12 deletions

diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 86d0bfaaf4b..c71f067ca2c 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1160,20 +1160,34 @@ static char *magick[] = {
   (define-fringe-bitmap 'breakpoint
     "\x3c\x7e\xff\xff\xff\xff\x7e\x3c"))
 
-(defface breakpoint-enabled-bitmap-face
-  '((t
-     :inherit fringe
+(defface breakpoint-enabled
+  '((((type tty))
+     :weight bold
+     :foreground "red")
+    (t
+     :weight bold
      :foreground "red"))
   "Face for enabled breakpoint icon in fringe."
   :group 'gud)
-
-(defface breakpoint-disabled-bitmap-face
-  '((t
-     :inherit fringe
-     :foreground "grey60"))
+;; compatibility alias for old name
+(put 'breakpoint-enabled-bitmap-face 'face-alias 'breakpoint-enabled)
+
+(defface breakpoint-disabled
+  ;; We use different values of grey for different background types,
+  ;; so that on low-color displays it will end up as something visible
+  ;; if it has to be approximated.
+  '((((type tty)  (background dark))
+     :foreground "grey60")
+    (((type tty) (background light))
+     :foreground "grey40")
+    (((background dark))
+     :foreground "grey60")
+    (((background light))
+     :foreground "grey40"))
   "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 +2208,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 +2246,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)