]> git.eshelyaron.com Git - emacs.git/commitdiff
Merged from miles@gnu.org--gnu-2005 (patch 192-203)
authorKaroly Lorentey <lorentey@elte.hu>
Wed, 23 Mar 2005 10:40:00 +0000 (10:40 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Wed, 23 Mar 2005 10:40:00 +0000 (10:40 +0000)
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

14 files changed:
1  2 
etc/TODO
lisp/bindings.el
lisp/files.el
lisp/font-lock.el
lisp/progmodes/gdb-ui.el
lisp/simple.el
lisp/subr.el
src/dispextern.h
src/frame.c
src/fringe.c
src/keyboard.c
src/msdos.c
src/xdisp.c
src/xfaces.c

diff --cc etc/TODO
Simple merge
Simple merge
diff --cc lisp/files.el
Simple merge
Simple merge
index 86d0bfaaf4bb0c1988b072c865e3f9a6fbef2500,2a714e84b9a099c66ad448dfc400e4e0605d29cd..c71f067ca2c2c49b76158528fed2e96c5fc8ed29
@@@ -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 lisp/simple.el
Simple merge
diff --cc lisp/subr.el
Simple merge
Simple merge
diff --cc src/frame.c
index 6c8f837bbd026674386c862ba08b90af60264cf1,d86d29db289b9b1ae8f5f875f6af33c13fd04fee..40be721078752ac6ae484725836f98ba42c89f39
@@@ -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);
diff --cc src/fringe.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/msdos.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfaces.c
Simple merge