From: Karoly Lorentey <lorentey@elte.hu>
Date: Wed, 24 May 2006 09:13:31 +0000 (+0000)
Subject: Merged from emacs@sv.gnu.org
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~38
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=40a1b46245c1a8786324f5a06d6cb8d4bd9d5b74;p=emacs.git

Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-289
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-290
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-291
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-292
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-293
   Update from CVS

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

40a1b46245c1a8786324f5a06d6cb8d4bd9d5b74
diff --cc src/xfaces.c
index 0a77a24189f,df303e401fd..1b9a9c079f1
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@@ -7091,8 -7073,8 +7091,8 @@@ realize_default_face (f
    face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID);
  
  #ifdef HAVE_WINDOW_SYSTEM
- #ifdef HAVE_X_WINDOWS  
+ #ifdef HAVE_X_WINDOWS
 -  if (face->font != FRAME_FONT (f))
 +  if (FRAME_X_P (f) && face->font != FRAME_FONT (f))
      /* As the font specified for the frame was not acceptable as a
         font for the default face (perhaps because auto-scaled fonts
         are rejected), we must adjust the frame font.  */
diff --cc src/xterm.c
index 356ee3b963b,f14f281a634..cc06c48df33
--- a/src/xterm.c
+++ b/src/xterm.c
@@@ -324,22 -321,8 +324,10 @@@ static int x_alloc_nearest_color_1 P_ (
  static void x_set_window_size_1 P_ ((struct frame *, int, int, int));
  static const XColor *x_color_cells P_ ((Display *, int *));
  static void x_update_window_end P_ ((struct window *, int, int));
- void x_delete_display P_ ((struct x_display_info *));
  
  static int x_io_error_quitter P_ ((Display *));
- void x_catch_errors P_ ((Display *));
- void x_uncatch_errors P_ ((void));
- void x_lower_frame P_ ((struct frame *));
- void x_scroll_bar_clear P_ ((struct frame *));
- int x_had_errors_p P_ ((Display *));
- void x_wm_set_size_hint P_ ((struct frame *, long, int));
- void x_raise_frame P_ ((struct frame *));
- void x_set_window_size P_ ((struct frame *, int, int, int));
- void x_wm_set_window_state P_ ((struct frame *, int));
- void x_wm_set_icon_pixmap P_ ((struct frame *, int));
 +static struct terminal *x_create_terminal P_ ((struct x_display_info *));
 +void x_delete_terminal P_ ((struct terminal *));
- void x_initialize P_ ((void));
  static void x_font_min_bounds P_ ((XFontStruct *, int *, int *));
  static int x_compute_min_glyph_bounds P_ ((struct frame *));
  static void x_update_end P_ ((struct frame *));