Merged from miles@gnu.org--gnu-2005 (patch 83-87, 449-468)

Patches applied:

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-453
   Update from CVS: lisp/subr.el (add-to-ordered-list): Doc fix.

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-458
   Merge from gnus--rel--5.10

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-461
   Merge from gnus--rel--5.10

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-464
   Merge from gnus--rel--5.10

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-83
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-84
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-85
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-86
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-87
   Update from CVS

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

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/cus-face.el
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/help-fns.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
index f1cce03,0b3f5dd..1f7076b
--- 1/lisp/startup.el
--- 2/lisp/startup.el
+++ b/lisp/startup.el
@@@ -36,15 -36,8 +36,15 @@@
  (defvar command-line-processed nil
    "Non-nil once command line has been processed.")
  
 +(defvar window-system initial-window-system
 +  "Name of window system the selected frame is displaying through.
 +The value is a symbol--for instance, `x' for X windows.
 +The value is nil if the selected frame is on a text-only-terminal.")
 +
 +(make-variable-frame-local 'window-system)
 +
  (defgroup initialization nil
-   "Emacs start-up procedure"
+   "Emacs start-up procedure."
    :group 'internal)
  
  (defcustom inhibit-startup-message nil

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/term/rxvt.el
index f593770,a47b678..6e45cce
--- 1/lisp/term/rxvt.el
--- 2/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@@ -158,9 -148,9 +158,9 @@@ for the currently selected frame.
  ;; intelligent way than the default guesswork in startup.el.
  (defun rxvt-set-background-mode ()
    "Set background mode as appropriate for the default rxvt colors."
 -  (let ((fgbg (getenv "COLORFGBG"))
 +  (let ((fgbg (server-getenv "COLORFGBG"))
        bg rgb)
-     (setq frame-background-mode 'light)       ; default
+     (setq default-frame-background-mode 'light)
      (when (and fgbg
               (string-match ".*;\\([0-9][0-9]?\\)\\'" fgbg))
        (setq bg (string-to-number (substring fgbg (match-beginning 1))))

diff --cc lisp/term/xterm.el
index af4e065,2a2df25..6465b08
--- 1/lisp/term/xterm.el
--- 2/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@@ -374,9 -364,9 +374,9 @@@ versions of xterm.
  ;; intelligent way than the default guesswork in startup.el.
  (defun xterm-rxvt-set-background-mode ()
    "Set background mode as appropriate for the default rxvt colors."
 -  (let ((fgbg (getenv "COLORFGBG"))
 +  (let ((fgbg (server-getenv "COLORFGBG"))
        bg rgb)
-     (setq frame-background-mode 'light)       ; default
+     (setq default-frame-background-mode 'light)
      (when (and fgbg
               (string-match ".*;\\([0-9][0-9]?\\)\\'" fgbg))
        (setq bg (string-to-number (substring fgbg (match-beginning 1))))

diff --cc src/emacs.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/term.c
index 1d165d3,452427f..4fbf87d
--- 1/src/term.c
--- 2/src/term.c
+++ b/src/term.c
@@@ -1848,17 -2003,23 +1848,23 @@@ turn_on_face (f, face_id
      {
        char *p;
  
 -      if (fg >= 0 && TS_set_foreground)
 +      if (fg >= 0 && tty->TS_set_foreground)
        {
-         p = tparam (tty->TS_set_foreground, NULL, 0, (int) fg);
 -        if (standout_mode)
 -          p = tparam (TS_set_background, NULL, 0, (int) fg);
 -        else
 -          p = tparam (TS_set_foreground, NULL, 0, (int) fg);
 -        OUTPUT (p);
++          if (tty->standout_mode)
++            p = tparam (tty->TS_set_background, NULL, 0, (int) fg);
++          else
++            p = tparam (tty->TS_set_foreground, NULL, 0, (int) fg);
 +        OUTPUT (tty, p);
          xfree (p);
        }
  
 -      if (bg >= 0 && TS_set_background)
 +      if (bg >= 0 && tty->TS_set_background)
        {
-         p = tparam (tty->TS_set_background, NULL, 0, (int) bg);
 -        if (standout_mode)
 -          p = tparam (TS_set_foreground, NULL, 0, (int) bg);
 -        else
 -          p = tparam (TS_set_background, NULL, 0, (int) bg);
 -        OUTPUT (p);
++          if (tty->standout_mode)
++            p = tparam (tty->TS_set_foreground, NULL, 0, (int) bg);
++          else
++            p = tparam (tty->TS_set_background, NULL, 0, (int) bg);
 +        OUTPUT (tty, p);
          xfree (p);
        }
      }

diff --cc src/w32term.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
index 1fc5a8b,988aab3..40eaaa4
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -22409,7 -22400,10 +22409,10 @@@ x_draw_vertical_border (w
        window_box_edges (w, -1, &x0, &y0, &x1, &y1);
        y1 -= 1;
  
 -      x1 -= 1;
+       if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0)
 -      rif->draw_vertical_window_border (w, x1, y0, y1);
++        x1 -= 1;
+ 
 +      FRAME_RIF (f)->draw_vertical_window_border (w, x1, y0, y1);
      }
    else if (!WINDOW_LEFTMOST_P (w)
           && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
@@@ -22419,7 -22413,10 +22422,10 @@@
        window_box_edges (w, -1, &x0, &y0, &x1, &y1);
        y1 -= 1;
  
 -      x0 -= 1;
+       if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0)
 -      rif->draw_vertical_window_border (w, x0, y0, y1);
++        x0 -= 1;
+ 
 +      FRAME_RIF (f)->draw_vertical_window_border (w, x0, y0, y1);
      }
  }
  

diff --cc src/xterm.c
index 68d2e46,ab299d1..1a52e0e
--- 1/src/xterm.c
--- 2/src/xterm.c
+++ b/src/xterm.c
@@@ -6294,39 -6287,40 +6300,40 @@@ handle_one_xevent (dpyinfo, eventp, fin
            if (compose_status.chars_matched > 0 && nbytes == 0)
              break;
  
+           bzero (&compose_status, sizeof (compose_status));
            orig_keysym = keysym;
  
 -        /* Common for all keysym input events.  */
 -        XSETFRAME (inev.ie.frame_or_window, f);
 -        inev.ie.modifiers
 -          = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), modifiers);
 -        inev.ie.timestamp = event.xkey.time;
 -
 -        /* First deal with keysyms which have defined
 -           translations to characters.  */
 -        if (keysym >= 32 && keysym < 128)
 -          /* Avoid explicitly decoding each ASCII character.  */
 -          {
 -            inev.ie.kind = ASCII_KEYSTROKE_EVENT;
 -            inev.ie.code = keysym;
 -            goto done_keysym;
 -          }
 -
 -        /* Now non-ASCII.  */
 -        if (HASH_TABLE_P (Vx_keysym_table)
 -            && (NATNUMP (c = Fgethash (make_number (keysym),
 -                                       Vx_keysym_table,
 -                                       Qnil))))
 -          {
 -            inev.ie.kind = (SINGLE_BYTE_CHAR_P (XFASTINT (c))
 -                            ? ASCII_KEYSTROKE_EVENT
 -                            : MULTIBYTE_CHAR_KEYSTROKE_EVENT);
 -            inev.ie.code = XFASTINT (c);
 -            goto done_keysym;
 -          }
 -
 -        /* Random non-modifier sorts of keysyms.  */
 -        if (((keysym >= XK_BackSpace && keysym <= XK_Escape)
 +        /* Common for all keysym input events.  */
 +        XSETFRAME (inev.ie.frame_or_window, f);
 +        inev.ie.modifiers
 +          = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), modifiers);
 +        inev.ie.timestamp = event.xkey.time;
 +
 +        /* First deal with keysyms which have defined
 +           translations to characters.  */
 +        if (keysym >= 32 && keysym < 128)
 +          /* Avoid explicitly decoding each ASCII character.  */
 +          {
 +            inev.ie.kind = ASCII_KEYSTROKE_EVENT;
 +            inev.ie.code = keysym;
 +            goto done_keysym;
 +          }
 + 
 +        /* Now non-ASCII.  */
 +        if (HASH_TABLE_P (Vx_keysym_table)
 +            && (NATNUMP (c = Fgethash (make_number (keysym),
 +                                       Vx_keysym_table,
 +                                       Qnil))))
 +          {
 +            inev.ie.kind = (SINGLE_BYTE_CHAR_P (XFASTINT (c))
 +                              ? ASCII_KEYSTROKE_EVENT
 +                              : MULTIBYTE_CHAR_KEYSTROKE_EVENT);
 +            inev.ie.code = XFASTINT (c);
 +            goto done_keysym;
 +          }
 + 
 +        /* Random non-modifier sorts of keysyms.  */
 +        if (((keysym >= XK_BackSpace && keysym <= XK_Escape)
                          || keysym == XK_Delete
  #ifdef XK_ISO_Left_Tab
                          || (keysym >= XK_ISO_Left_Tab