From: Karoly Lorentey <lorentey@elte.hu>
Date: Wed, 23 Mar 2005 10:40:00 +0000 (+0000)
Subject: Merged from miles@gnu.org--gnu-2005 (patch 192-203)
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~284
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=76acbdc50490034f233bc78d14a7cd5717d9432e;p=emacs.git

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
---

76acbdc50490034f233bc78d14a7cd5717d9432e
diff --cc lisp/progmodes/gdb-ui.el
index 86d0bfaaf4b,2a714e84b9a..c71f067ca2c
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@@ -1156,13 -1156,16 +1156,16 @@@ static char *magick[] = 
    "Icon for disabled breakpoint in display margin.")
  
  ;; Bitmap for breakpoint in fringe
 -(and (display-images-p)
 -     (define-fringe-bitmap 'breakpoint
 -       "\x3c\x7e\xff\xff\xff\xff\x7e\x3c"))
 +(when (fboundp 'define-fringe-bitmap)
 +  (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)
diff --cc src/frame.c
index 6c8f837bbd0,d86d29db289..40be7210787
--- a/src/frame.c
+++ b/src/frame.c
@@@ -4373,10 -4099,8 +4347,9 @@@ This variable is local to the current t
    defsubr (&Sactive_minibuffer_window);
    defsubr (&Sframep);
    defsubr (&Sframe_live_p);
 +  defsubr (&Swindow_system);
    defsubr (&Smake_terminal_frame);
    defsubr (&Shandle_switch_frame);
-   defsubr (&Signore_event);
    defsubr (&Sselect_frame);
    defsubr (&Sselected_frame);
    defsubr (&Swindow_frame);