Merged from miles@gnu.org--gnu-2005 (patch 470-473)

Patches applied:

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

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

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

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

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

4 files changed, 128 insertions, 29 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3753d88a0e8..e13ffe8fc66 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,29 @@
+2005-07-06  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (Frecenter): When arg is inside the scroll margin,
+        move it out of the margin.
+
+2005-07-06  Jason Rumney  <jasonr@gnu.org>
+
+        * w32console.c (initialize_w32_display): Detect when the console
+        dimensions are insane, and default to 80x25 instead.
+        (w32_use_full_screen_buffer): default to NIL.
+
+2005-07-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (mac_draw_vertical_window_border): Use foreground of
+        VERTICAL_BORDER_FACE_ID for vertical border line.
+        (mac_encode_char): Call check_ccl_update in advance.
+        (mac_to_x_fontname, x_font_name_to_mac_font_name)
+        (init_font_name_table, mac_do_list_fonts, XLoadQueryFont): Don't
+        assume that font family length is less than 32.
+        (x_compute_min_glyph_bounds): Make static.
+        (x_load_font): Never set fonts_changed_p to zero.
+        
+2005-07-04  Lute Kamstra  <lute@gnu.org>
+
+        * Update FSF's address in GPL notices.
+
 2005-07-03  Richard M. Stallman  <rms@gnu.org>
 
         * xdisp.c (try_window): Fix previous change in how it handles
diff --git a/src/macterm.c b/src/macterm.c
index ab43a7bda43..303557daca1 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -1334,6 +1334,12 @@ mac_draw_vertical_window_border (w, x, y0, y1)
      int x, y0, y1;
 {
   struct frame *f = XFRAME (WINDOW_FRAME (w));
+  struct face *face;
+
+  face = FACE_FROM_ID (f, VERTICAL_BORDER_FACE_ID);
+  if (face)
+    XSetForeground (FRAME_MAC_DISPLAY (f), f->output_data.mac->normal_gc,
+                    face->foreground);
 
   XDrawLine (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f),
              f->output_data.mac->normal_gc, x, y0, x, y1);
@@ -1721,10 +1727,12 @@ mac_encode_char (c, char2b, font_info, two_byte_p)
       /* It's a program.  */
       struct ccl_program *ccl = font_info->font_encoder;
 
+      check_ccl_update (ccl);
       if (CHARSET_DIMENSION (charset) == 1)
         {
           ccl->reg[0] = charset;
           ccl->reg[1] = char2b->byte2;
+          ccl->reg[2] = -1;
         }
       else
         {
@@ -6249,10 +6257,11 @@ mac_to_x_fontname (name, size, style, charset)
      Style style;
      char *charset;
 {
-  char foundry[32], family[32], cs[32];
+  Str31 foundry, cs;
+  Str255 family;
   char xf[256], *result, *p;
 
-  if (sscanf (name, "%31[^-]-%31[^-]-%31s", foundry, family, cs) == 3)
+  if (sscanf (name, "%31[^-]-%255[^-]-%31s", foundry, family, cs) == 3)
     charset = cs;
   else
     {
@@ -6260,13 +6269,12 @@ mac_to_x_fontname (name, size, style, charset)
       strcpy(family, name);
     }
 
-  sprintf(xf, "-%s-%s-%s-%c-normal--%d-%d-%d-%d-m-%d-%s",
-          foundry, family, style & bold ? "bold" : "medium",
-          style & italic ? 'i' : 'r', size, size * 10,
-          size ? 75 : 0, size ? 75 : 0, size * 10, charset);
+  sprintf (xf, "%s-%c-normal--%d-%d-%d-%d-m-%d-%s",
+           style & bold ? "bold" : "medium", style & italic ? 'i' : 'r',
+           size, size * 10, size ? 75 : 0, size ? 75 : 0, size * 10, charset);
 
-  result = (char *) xmalloc (strlen (xf) + 1);
-  strcpy (result, xf);
+  result = xmalloc (strlen (foundry) + strlen (family) + strlen (xf) + 3 + 1);
+  sprintf (result, "-%s-%s-%s", foundry, family, xf);
   for (p = result; *p; p++)
     *p = tolower(*p);
   return result;
@@ -6286,15 +6294,17 @@ x_font_name_to_mac_font_name (xf, mf, mf_decoded, style, cs)
      Style *style;
      char *cs;
 {
-  char foundry[32], family[32], weight[20], slant[2], *p;
+  Str31 foundry;
+  Str255 family;
+  char weight[20], slant[2], *p;
   Lisp_Object charset_info, coding_system = Qnil;
   struct coding_system coding;
 
   strcpy (mf, "");
 
-  if (sscanf (xf, "-%31[^-]-%31[^-]-%19[^-]-%1[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s",
+  if (sscanf (xf, "-%31[^-]-%255[^-]-%19[^-]-%1[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s",
               foundry, family, weight, slant, cs) != 5 &&
-      sscanf (xf, "-%31[^-]-%31[^-]-%19[^-]-%1[^-]-%*[^-]--%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s",
+      sscanf (xf, "-%31[^-]-%255[^-]-%19[^-]-%1[^-]-%*[^-]--%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s",
               foundry, family, weight, slant, cs) != 5)
     return;
 
@@ -6327,7 +6337,7 @@ x_font_name_to_mac_font_name (xf, mf, mf_decoded, style, cs)
       coding.dst_multibyte = 1;
       coding.mode |= CODING_MODE_LAST_BLOCK;
       encode_coding (&coding, mf_decoded, mf,
-                     strlen (mf_decoded), sizeof (Str32) - 1);
+                     strlen (mf_decoded), sizeof (Str255) - 1);
       mf[coding.produced] = '\0';
     }
 }
@@ -6459,7 +6469,7 @@ init_font_name_table ()
   Handle font_handle, font_handle_2;
   short id, scriptcode;
   ResType type;
-  Str32 name;
+  Str255 name;
   struct FontAssoc *fat;
   struct AsscEntry *assc_entry;
   Lisp_Object text_encoding_info_alist, text_encoding_info;
@@ -6598,8 +6608,7 @@ mac_do_list_fonts (pattern, maxnames)
   int i, n_fonts = 0;
   Lisp_Object font_list = Qnil, pattern_regex, fontname;
   char *regex = (char *) alloca (strlen (pattern) * 2 + 3);
-  char scaled[256];
-  char *ptr;
+  char *scaled, *ptr;
   int scl_val[XLFD_SCL_LAST], *field, *val;
   char *longest_start, *cur_start, *nonspecial;
   int longest_len, exact;
@@ -6723,6 +6732,7 @@ mac_do_list_fonts (pattern, maxnames)
         {
           int former_len = ptr - font_name_table[i];
 
+          scaled = xmalloc (strlen (font_name_table[i]) + 20 + 1);
           memcpy (scaled, font_name_table[i], former_len);
           sprintf (scaled + former_len,
                    "-%d-%d-75-75-m-%d-%s",
@@ -6732,6 +6742,7 @@ mac_do_list_fonts (pattern, maxnames)
                    ptr + sizeof ("-0-0-0-0-m-0-") - 1);
           fontname = mac_c_string_match (pattern_regex, scaled,
                                          nonspecial, exact);
+          xfree (scaled);
           if (!NILP (fontname))
             {
               font_list = Fcons (fontname, font_list);
@@ -6852,7 +6863,7 @@ x_font_min_bounds (font, w, h)
    the values computed.  Value is non-zero if smallest_font_height or
    smallest_char_width become smaller than they were before.  */
 
-int
+static int
 x_compute_min_glyph_bounds (f)
      struct frame *f;
 {
@@ -6937,7 +6948,8 @@ XLoadQueryFont (Display *dpy, char *fontname)
   GrafPtr port;
   SInt16 old_fontnum, old_fontsize;
   Style old_fontface;
-  Str32 mfontname, mfontname_decoded, charset;
+  Str255 mfontname, mfontname_decoded;
+  Str31 charset;
   SInt16 fontnum;
   Style fontface;
 #if TARGET_API_MAC_CARBON
@@ -7329,7 +7341,7 @@ x_load_font (f, fontname, size)
        before, or if the font loaded has a smalle>r height than any
        other font loaded before.  If this happens, it will make a
        glyph matrix reallocation necessary.  */
-    fonts_changed_p = x_compute_min_glyph_bounds (f);
+    fonts_changed_p |= x_compute_min_glyph_bounds (f);
     UNBLOCK_INPUT;
     return fontp;
   }
diff --git a/src/w32console.c b/src/w32console.c
index 70578f58c6b..0ebda179667 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -635,7 +635,24 @@ initialize_w32_display (void)
   meta_key = 1;
   char_attr_normal = info.wAttributes;
 
-  if (w32_use_full_screen_buffer)
+  /* Determine if the info returned by GetConsoleScreenBufferInfo
+     is realistic.  Old MS Telnet servers used to only fill out
+     the dwSize portion, even modern one fill the whole struct with
+     garbage when using non-MS telnet clients.  */
+  if ((w32_use_full_screen_buffer
+       && (info.dwSize.Y < 20 || info.dwSize.Y > 100
+           || info.dwSize.X < 40 || info.dwSize.X > 200))
+      || (!w32_use_full_screen_buffer
+          && (info.srWindow.Bottom - info.srWindow.Top < 20
+              || info.srWindow.Bottom - info.srWindow.Top > 100
+              || info.srWindow.Right - info.srWindow.Left < 40
+              || info.srWindow.Right - info.srWindow.Left > 100)))
+    {
+      FRAME_LINES (SELECTED_FRAME ()) = 25;
+      SET_FRAME_COLS (SELECTED_FRAME (), 80);
+    }
+
+  else if (w32_use_full_screen_buffer)
     {
       FRAME_LINES (SELECTED_FRAME ()) = info.dwSize.Y;  /* lines per page */
       SET_FRAME_COLS (SELECTED_FRAME (), info.dwSize.X);  /* characters per line */
@@ -691,7 +708,7 @@ This is desirable when running Emacs over telnet, and is the default.
 A value of nil means use the current console window dimensions; this
 may be preferrable when working directly at the console with a large
 scroll-back buffer.  */);
-  w32_use_full_screen_buffer = 1;
+  w32_use_full_screen_buffer = 0;
 
   defsubr (&Sset_screen_color);
   defsubr (&Sset_cursor_size);
diff --git a/src/window.c b/src/window.c
index 68b2d4f89c7..d9af9ba72ac 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5335,6 +5335,8 @@ and redisplay normally--don't erase and redraw the frame.  */)
   struct buffer *obuf = current_buffer;
   int center_p = 0;
   int charpos, bytepos;
+  int iarg;
+  int this_scroll_margin;
 
   /* If redisplay is suppressed due to an error, try again.  */
   obuf->display_error_modiff = 0;
@@ -5361,6 +5363,12 @@ and redisplay normally--don't erase and redraw the frame.  */)
 
   set_buffer_internal (buf);
 
+  /* Do this after making BUF current
+     in case scroll_margin is buffer-local.  */
+  this_scroll_margin = max (0, scroll_margin);
+  this_scroll_margin = min (this_scroll_margin,
+                            XFASTINT (w->total_lines) / 4);
+
   /* Handle centering on a graphical frame specially.  Such frames can
      have variable-height lines and centering point on the basis of
      line counts would lead to strange effects.  */
@@ -5377,14 +5385,17 @@ and redisplay normally--don't erase and redraw the frame.  */)
           charpos = IT_CHARPOS (it);
           bytepos = IT_BYTEPOS (it);
         }
-      else if (XINT (arg) < 0)
+      else if (iarg < 0)
         {
           struct it it;
           struct text_pos pt;
-          int nlines = - XINT (arg);
+          int nlines = -iarg;
           int extra_line_spacing;
           int h = window_box_height (w);
 
+          iarg = XINT (arg);
+          iarg = - max (-iarg, this_scroll_margin);
+
           SET_TEXT_POS (pt, PT, PT_BYTE);
           start_display (&it, w, pt);
 
@@ -5443,7 +5454,11 @@ and redisplay normally--don't erase and redraw the frame.  */)
       else
         {
           struct position pos;
-          pos = *vmotion (PT, - XINT (arg), w);
+
+          iarg = XINT (arg);
+          iarg = max (iarg, this_scroll_margin);
+
+          pos = *vmotion (PT, -iarg, w);
           charpos = pos.bufpos;
           bytepos = pos.bytepos;
         }
@@ -5454,11 +5469,17 @@ and redisplay normally--don't erase and redraw the frame.  */)
       int ht = window_internal_height (w);
 
       if (center_p)
-        arg = make_number (ht / 2);
+        iarg = make_number (ht / 2);
       else if (XINT (arg) < 0)
-        arg = make_number (XINT (arg) + ht);
+        iarg = XINT (arg) + ht;
+      else
+        iarg = XINT (arg);
+
+      /* Don't let it get into the margin at either top or bottom.  */
+      iarg = max (iarg, this_scroll_margin);
+      iarg = min (iarg, ht - this_scroll_margin - 1);
 
-      pos = *vmotion (PT, - XINT (arg), w);
+      pos = *vmotion (PT, - iarg, w);
       charpos = pos.bufpos;
       bytepos = pos.bytepos;
     }
@@ -5507,6 +5528,9 @@ zero means top of window, negative means relative to bottom of window.  */)
   struct window *w = XWINDOW (selected_window);
   int lines, start;
   Lisp_Object window;
+#if 0
+  int this_scroll_margin;
+#endif
 
   window = selected_window;
   start = marker_position (w->start);
@@ -5522,13 +5546,33 @@ zero means top of window, negative means relative to bottom of window.  */)
     Fgoto_char (w->start);
 
   lines = displayed_window_lines (w);
+
+#if 0
+  this_scroll_margin = max (0, scroll_margin);
+  this_scroll_margin = min (this_scroll_margin, lines / 4);
+#endif
+
   if (NILP (arg))
     XSETFASTINT (arg, lines / 2);
   else
     {
-      arg = Fprefix_numeric_value (arg);
-      if (XINT (arg) < 0)
-        XSETINT (arg, XINT (arg) + lines);
+      int iarg = XINT (Fprefix_numeric_value (arg));
+
+      if (iarg < 0)
+        iarg = iarg + lines;
+
+#if 0  /* This code would prevent move-to-window-line from moving point
+          to a place inside the scroll margins (which would cause the
+          next redisplay to scroll).  I wrote this code, but then concluded
+          it is probably better not to install it.  However, it is here
+          inside #if 0 so as not to lose it.  -- rms.  */
+
+      /* Don't let it get into the margin at either top or bottom.  */
+      iarg = max (iarg, this_scroll_margin);
+      iarg = min (iarg, lines - this_scroll_margin - 1);
+#endif
+
+      arg = make_number (iarg);
     }
 
   /* Skip past a partially visible first line.  */