Changeset 1695

Timestamp:

02/17/98 01:45:18 (11 years ago)

Author:

himi

Message:

Emacs20.3.8 import

Files:

• branches/GNU/src/window.c (modified) (2 diffs)
• branches/GNU/src/xfns.c (modified) (3 diffs)
• branches/GNU/src/xterm.c (modified) (7 diffs)

branches/GNU/src/window.c

@@ -1782 +1782 @@
-  check_min_window_sizes ();
-
-  /* If the window has been "too small" at one point,
-     don't delete it for being "too small" in the future.
-     Preserve it as long as that is at all possible.  */
-  if (oheight < window_min_height)
-    w->too_small_ok = Qt;
-
-  if (!nodelete
-      && ! NILP (w->parent)
-      && (MINI_WINDOW_P (w)
-          ? height < 1
-          : ! NILP (w->too_small_ok)
-          ? height < MIN_SAFE_WINDOW_HEIGHT
-          : height < window_min_height))
-    {
@@ -1859 +1851 @@
-  Lisp_Object child;
-
-
-
-
-
-
-
-
-
-
-
+
-    {
-      delete_window (window);

branches/GNU/src/xfns.c

@@ -136 +136 @@
-/* Regexp matching a font name whose width is the same as `PIXEL_SIZE'.  */
-Lisp_Object Vx_pixel_size_width_font_regexp;
+
+/* A flag to control how to display unibyte 8-bit character.  */
+int unibyte_display_via_language_environment;
-
-/* Evaluate this expression to rebuild the section of syms_of_xfns
@@ -3183 +3186 @@
-    = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                 (GCFont | GCForeground | GCBackground
-/* | GCStipple */
+| GCStipple
-                 &gc_values);
-
@@ -5406 +5409 @@
-  Vx_pixel_size_width_font_regexp = Qnil;
-
+  DEFVAR_BOOL ("unibyte-display-via-language-environment",
+               &unibyte_display_via_language_environment,
+   "*Non-nil means display unibyte text according to language environment.\n\
+Specifically this means that unibyte non-ASCII characters\n\
+are displayed by converting them to the equivalent multibyte characters\n\
+according to the current language environment.  As a result, they are\n\
+displayed according to the current fontset.");
+  unibyte_display_via_language_environment = 0;
+
-#ifdef USE_X_TOOLKIT
-  Fprovide (intern ("x-toolkit"));

branches/GNU/src/xterm.c

@@ -4829 +4829 @@
-           ? current_glyphs->glyphs[y][x]
-           : SPACEGLYPH);
-
-      {
-        XGCValues xgcv;
-        unsigned long mask;
-
-        xgcv.background = f->output_data.x->cursor_pixel;
-        xgcv.foreground = f->output_data.x->cursor_pixel;
-        xgcv.graphics_exposures = 0;
-        mask = GCForeground | GCBackground | GCGraphicsExposures;
-
-        if (FRAME_X_DISPLAY_INFO (f)->scratch_cursor_gc)
-          XChangeGC (FRAME_X_DISPLAY (f),
-                     FRAME_X_DISPLAY_INFO (f)->scratch_cursor_gc,
-                     mask, &xgcv);
-        else
-          FRAME_X_DISPLAY_INFO (f)->scratch_cursor_gc
-            = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), mask, &xgcv);
-      }
-
-      XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-FRAME_X_DISPLAY_INFO (f)->scratch_
+f->output_data.x->
-                      CHAR_TO_PIXEL_COL (f, x),
-                      CHAR_TO_PIXEL_ROW (f, y),
@@ -6494 +6475 @@
-  Display *dpy = f != NULL ? FRAME_X_DISPLAY (f) : x_display_list->display;
-  int try_XLoadQueryFont = 0;
-  int count;
-
-  patterns = Fassoc (pattern, Valternate_fontname_alist);
@@ -6526 +6506 @@
-
-      BLOCK_INPUT;
-      count = x_catch_errors (dpy);
-
-      if (try_XLoadQueryFont)
-        {
@@ -6534 +6512 @@
-
-          font = XLoadQueryFont (dpy, XSTRING (pattern)->data);
-          if (x_had_errors_p (dpy))
-            {
-              /* This error is perhaps due to insufficient memory on X
-                 server.  Let's just ignore it.  */
-              font = NULL;
-              x_clear_errors (dpy);
-            }
-
-          if (font
-              && XGetFontProperty (font, XA_FONT, &value))
@@ -6573 +6543 @@
-
-      if (!try_XLoadQueryFont)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-      UNBLOCK_INPUT;
-
@@ -6669 +6628 @@
-
-              BLOCK_INPUT;
-              count = x_catch_errors (dpy);
-              thisinfo = XLoadQueryFont (dpy,
-                                         XSTRING (XCONS (tem)->car)->data);
-              if (x_had_errors_p (dpy))
-                {
-                  /* This error is perhaps due to insufficient memory on X
-                     server.  Let's just ignore it.  */
-                  thisinfo = NULL;
-                  x_clear_errors (dpy);
-                }
-              x_uncatch_errors (dpy, count);
-              UNBLOCK_INPUT;
-
@@ -6863 +6813 @@
-      int max_height = font->max_bounds.ascent + font->max_bounds.descent;
-      if (max_height > fontp->height)
-=
+>
-    }
-