Merge from trunk.

3 files changed, 10 insertions, 51 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c519100b2f0..b0913ab983c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -156,6 +156,14 @@
         Use EMACS_INT, not EMACS_UINT, for sizes.  The code works equally
         well either way, and we prefer signed to unsigned.
 
+2011-07-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * xdisp.c (syms_of_xdisp): Make it explicit that the mini-windows
+        are the mini-buffer and the echo area (bug#3320).
+
+        * term.c (init_tty): Remove support for supdup, c10 and perq
+        terminals, which are no longer supported (bug#1482).
+
 2011-07-10  Johan Bockgård  <bojohan@gnu.org>
 
         * xdisp.c (Ftool_bar_lines_needed): Fix WINDOWP check.
diff --git a/src/term.c b/src/term.c
index be23e547514..b9f10b122a7 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3505,55 +3505,6 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\
       Down (tty) = 0;
     }
 
-  /* Special handling for certain terminal types known to need it */
-
-  if (!strcmp (terminal_type, "supdup"))
-    {
-      terminal->memory_below_frame = 1;
-      tty->Wcm->cm_losewrap = 1;
-    }
-  if (!strncmp (terminal_type, "c10", 3)
-      || !strcmp (terminal_type, "perq"))
-    {
-      /* Supply a makeshift :wi string.
-         This string is not valid in general since it works only
-         for windows starting at the upper left corner;
-         but that is all Emacs uses.
-
-         This string works only if the frame is using
-         the top of the video memory, because addressing is memory-relative.
-         So first check the :ti string to see if that is true.
-
-         It would be simpler if the :wi string could go in the termcap
-         entry, but it can't because it is not fully valid.
-         If it were in the termcap entry, it would confuse other programs.  */
-      if (!tty->TS_set_window)
-        {
-          const char *m = tty->TS_termcap_modes;
-          while (*m && strcmp (m, "\033v  "))
-            m++;
-          if (*m)
-            tty->TS_set_window = "\033v%C %C %C %C ";
-        }
-      /* Termcap entry often fails to have :in: flag */
-      terminal->must_write_spaces = 1;
-      /* :ti string typically fails to have \E^G! in it */
-      /* This limits scope of insert-char to one line.  */
-      strcpy (area, tty->TS_termcap_modes);
-      strcat (area, "\033\007!");
-      tty->TS_termcap_modes = area;
-      area += strlen (area) + 1;
-      p = AbsPosition (tty);
-      /* Change all %+ parameters to %C, to handle
-         values above 96 correctly for the C100.  */
-      while (*p)
-        {
-          if (p[0] == '%' && p[1] == '+')
-            p[1] = 'C';
-          p++;
-        }
-    }
-
   tty->specified_window = FrameRows (tty);
 
   if (Wcm_init (tty) == -1)     /* can't do cursor motion */
diff --git a/src/xdisp.c b/src/xdisp.c
index a4a9e236a9e..490b23891af 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26846,13 +26846,13 @@ but does not change the fact they are interpreted as raw bytes.  */);
   unibyte_display_via_language_environment = 0;
 
   DEFVAR_LISP ("max-mini-window-height", Vmax_mini_window_height,
-    doc: /* *Maximum height for resizing mini-windows.
+    doc: /* *Maximum height for resizing mini-windows (the minibuffer and the echo area).
 If a float, it specifies a fraction of the mini-window frame's height.
 If an integer, it specifies a number of lines.  */);
   Vmax_mini_window_height = make_float (0.25);
 
   DEFVAR_LISP ("resize-mini-windows", Vresize_mini_windows,
-    doc: /* *How to resize mini-windows.
+    doc: /* *How to resize mini-windows (the minibuffer and the echo area).
 A value of nil means don't automatically resize mini-windows.
 A value of t means resize them to fit the text displayed in them.
 A value of `grow-only', the default, means let mini-windows grow