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

11 files changed, 260 insertions, 68 deletions

diff --git a/src/COPYING b/src/COPYING
index d60c31a97a5..3912109b5cd 100644
--- a/src/COPYING
+++ b/src/COPYING
@@ -2,7 +2,7 @@
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
diff --git a/src/ChangeLog b/src/ChangeLog
index 046d1a321fe..3753d88a0e8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,81 @@
+2005-07-03  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (try_window): Fix previous change in how it handles
+        a partially-visible line or one only partly past the margin.
+
+        * window.c (window_scroll_pixel_based): Take account
+        of this_scroll_margin when finding point when scrolling up.
+
+2005-06-29  Ralf Angeli  <angeli@iwi.uni-sb.de>
+
+        * window.c (window_scroll_pixel_based, window_scroll_line_based):
+        Handle `scroll-preserve-screen-position' non-nil, non-t specially.
+        (syms_of_window): <scroll-preserve-screen-position>: Doc fix.
+
+2005-07-02  Juri Linkov  <juri@jurta.org>
+
+        * w32term.c (w32_draw_vertical_window_border): Use foreground of
+        VERTICAL_BORDER_FACE_ID for vertical border line.
+
+2005-07-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Fcopy_file): Rearrange the code that calls fchown and
+        fchmod so that chmod doesn't get called on MSDOS before the file
+        is closed.
+
+2005-07-01  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.c (cleartype_active): New flag for enabling sub-pixel
+        workaround.
+        (w32_initialize): Initialize it.
+        (w32_native_per_char_metric): Allow a couple of extra pixels when
+        Cleartype is active.
+
+        * w32term.c (w32_initialize): Move check for screen reader here
+        from syms_of_w32term.
+
+2005-06-30  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (handle_one_xevent): bzero compose_status when nbytes
+        is not zero.
+
+2005-07-01  Masatake YAMATO  <jet@gyve.org>
+
+        * emacs.c (main): Passing ADD_NO_RANDOMIZE to
+        `personality'.
+
+2005-06-30  Juri Linkov  <juri@jurta.org>
+
+        * xdisp.c (x_draw_vertical_border): If left fringe is not present
+        decrease x coord of vertical border by 1 pixel to not occupy text
+        area of the right window.
+
+        * xterm.c (x_draw_vertical_window_border): Use foreground of
+        VERTICAL_BORDER_FACE_ID for vertical border line.
+
+        * term.c (turn_on_face): In standout mode apply specified
+        fg to bg, and specified bg to fg (this makes the logic of
+        inversion on terminal consistent with X).
+
+2005-06-29  Juanma Barranquero  <lekktu@gmail.com>
+
+        * eval.c (user_variable_p_eh): New function.
+        (Fuser_variable_p): Use it.  Clarify docstring.
+        Return t for aliases of user options, nil for alias loops.
+
+2005-06-27  Richard M. Stallman  <rms@gnu.org>
+
+        * eval.c (Fdefvar): Improve error message.
+
+2005-06-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c [USE_CARBON_EVENTS] (mac_convert_event_ref): Fix last
+        change.
+
+2005-06-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * eval.c (Fdefvar): Don't try to set constant symbols.
+
 2005-06-25  Richard M. Stallman  <rms@gnu.org>
 
         * macfns.c (Fx_show_tip): Pass new arg to try_window.
@@ -46,17 +124,16 @@
         * xdisp.c (syms_of_xdisp) <nobreak-char-display>: Doc fix.
         (syms_of_xdisp) <void-text-area-pointer>: Doc fix.
 
-        * fileio.c (Frename_file)[!DOS_NT]: Don't call chown on
-        MSDOS/Windows.
+        * fileio.c (Frename_file)[!DOS_NT]: Don't call chown on MSDOS/Windows.
 
 2005-06-23  Richard M. Stallman  <rms@gnu.org>
 
         * xdisp.c (get_next_display_element): Finish reversing the tests of
         Vnobreak_char_display.
 
-        * xdisp.c (Vnobreak_char_display): Renamed from Vshow_nonbreak_escape.
+        * xdisp.c (Vnobreak_char_display): Rename from Vshow_nonbreak_escape.
         All uses changed.
-        (Qnobreak_space): Renamed from Qno_break_space.  All uses changed.
+        (Qnobreak_space): Rename from Qno_break_space.  All uses changed.
         (syms_of_xdisp): Define nobreak-char-display and nobreak-space.
 
         * fileio.c (Frename_file): Preserve owner and group, if possible,
@@ -352,8 +429,7 @@
 
 2005-06-06  Eli Zaretskii  <eliz@gnu.org>
 
-        * w32heap.h (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_PTR):
-        Remove macros.
+        * w32heap.h (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_PTR): Remove macros.
 
         * unexw32.c (RVA_TO_PTR): Move here from w32heap.h.
 
diff --git a/src/emacs.c b/src/emacs.c
index c26dc9de9e3..5e0f42981f7 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -919,7 +919,13 @@ main (argc, argv
         {
           /* Set this so we only do this once.  */
           putenv("EMACS_HEAP_EXEC=true");
-          personality (PER_LINUX32);
+
+          /* A flag to turn off address randomization which is introduced
+           in linux kernel shipped with fedora core 4 */
+#define ADD_NO_RANDOMIZE 0x0040000
+          personality (PER_LINUX32 | ADD_NO_RANDOMIZE);
+#undef  ADD_NO_RANDOMIZE
+
           execvp (argv[0], argv);
 
           /* If the exec fails, try to dump anyway.  */
diff --git a/src/eval.c b/src/eval.c
index c33021da7b7..17e9f7f4360 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -806,6 +806,10 @@ usage: (defvar SYMBOL &optional INITVALUE DOCSTRING)  */)
   register Lisp_Object sym, tem, tail;
 
   sym = Fcar (args);
+  if (SYMBOL_CONSTANT_P (sym))
+    error ("Constant symbol `%s' specified in defvar",
+           SDATA (SYMBOL_NAME (sym)));
+
   tail = Fcdr (args);
   if (!NILP (Fcdr (Fcdr (tail))))
     error ("Too many arguments");
@@ -885,12 +889,24 @@ usage: (defconst SYMBOL INITVALUE [DOCSTRING])  */)
   return sym;
 }
 
+/* Error handler used in Fuser_variable_p.  */
+static Lisp_Object
+user_variable_p_eh (ignore)
+     Lisp_Object ignore;
+{
+  return Qnil;
+}
+
 DEFUN ("user-variable-p", Fuser_variable_p, Suser_variable_p, 1, 1, 0,
-       doc: /* Returns t if VARIABLE is intended to be set and modified by users.
+       doc: /* Return t if VARIABLE is intended to be set and modified by users.
 \(The alternative is a variable used internally in a Lisp program.)
-Determined by whether the first character of the documentation
-for the variable is `*' or if the variable is customizable (has a non-nil
-value of `standard-value' or of `custom-autoload' on its property list).  */)
+A variable is a user variable if
+\(1) the first character of its documentation is `*', or
+\(2) it is customizable (its property list contains a non-nil value
+    of `standard-value' or `custom-autoload'), or
+\(3) it is an alias for another user variable.
+Return nil if VARIABLE is an alias and there is a loop in the
+chain of symbols.  */)
      (variable)
      Lisp_Object variable;
 {
@@ -899,23 +915,37 @@ value of `standard-value' or of `custom-autoload' on its property list).  */)
   if (!SYMBOLP (variable))
       return Qnil;
 
-  documentation = Fget (variable, Qvariable_documentation);
-  if (INTEGERP (documentation) && XINT (documentation) < 0)
-    return Qt;
-  if (STRINGP (documentation)
-      && ((unsigned char) SREF (documentation, 0) == '*'))
-    return Qt;
-  /* If it is (STRING . INTEGER), a negative integer means a user variable.  */
-  if (CONSP (documentation)
-      && STRINGP (XCAR (documentation))
-      && INTEGERP (XCDR (documentation))
-      && XINT (XCDR (documentation)) < 0)
-    return Qt;
-  /* Customizable?  See `custom-variable-p'. */
-  if ((!NILP (Fget (variable, intern ("standard-value"))))
-      || (!NILP (Fget (variable, intern ("custom-autoload")))))
-    return Qt;
-  return Qnil;
+  /* If indirect and there's an alias loop, don't check anything else.  */
+  if (XSYMBOL (variable)->indirect_variable
+      && NILP (internal_condition_case_1 (indirect_variable, variable,
+                                          Qt, user_variable_p_eh)))
+    return Qnil;
+
+  while (1)
+    {
+      documentation = Fget (variable, Qvariable_documentation);
+      if (INTEGERP (documentation) && XINT (documentation) < 0)
+        return Qt;
+      if (STRINGP (documentation)
+          && ((unsigned char) SREF (documentation, 0) == '*'))
+        return Qt;
+      /* If it is (STRING . INTEGER), a negative integer means a user variable.  */
+      if (CONSP (documentation)
+          && STRINGP (XCAR (documentation))
+          && INTEGERP (XCDR (documentation))
+          && XINT (XCDR (documentation)) < 0)
+        return Qt;
+      /* Customizable?  See `custom-variable-p'.  */
+      if ((!NILP (Fget (variable, intern ("standard-value"))))
+          || (!NILP (Fget (variable, intern ("custom-autoload")))))
+        return Qt;
+
+      if (!XSYMBOL (variable)->indirect_variable)
+        return Qnil;
+
+      /* An indirect variable?  Let's follow the chain.  */
+      variable = XSYMBOL (variable)->value;
+    }
 }
 
 DEFUN ("let*", FletX, SletX, 1, UNEVALLED, 0,
diff --git a/src/fileio.c b/src/fileio.c
index ac81f73df16..24820f6d3f9 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2523,7 +2523,7 @@ uid and gid of FILE to NEWNAME.  */)
      copyable by us. */
   input_file_statable_p = (fstat (ifd, &st) >= 0);
 
-#if !defined (DOS_NT) || __DJGPP__ > 1
+#if !defined (MSDOS) || __DJGPP__ > 1
   if (out_st.st_mode != 0
       && st.st_dev == out_st.st_dev && st.st_ino == out_st.st_ino)
     {
@@ -2576,25 +2576,16 @@ uid and gid of FILE to NEWNAME.  */)
       report_file_error ("I/O error", Fcons (newname, Qnil));
   immediate_quit = 0;
 
-  /* Preserve the owner and group, if requested.  */
-  if (input_file_statable_p && ! NILP (preserve_uid_gid))
-    fchown (ofd, st.st_uid, st.st_gid);
-
+#ifndef MSDOS
+  /* Preserve the original file modes, and if requested, also its
+     owner and group.  */
   if (input_file_statable_p)
     {
-#ifndef MSDOS
+      if (! NILP (preserve_uid_gid))
+        fchown (ofd, st.st_uid, st.st_gid);
       fchmod (ofd, st.st_mode & 07777);
-#else /* MSDOS */
-#if defined (__DJGPP__) && __DJGPP__ > 1
-      /* In DJGPP v2.0 and later, fstat usually returns true file mode bits,
-         and if it can't, it tells so.  Otherwise, under MSDOS we usually
-         get only the READ bit, which will make the copied file read-only,
-         so it's better not to chmod at all.  */
-      if ((_djstat_flags & _STFAIL_WRITEBIT) == 0)
-        chmod (SDATA (encoded_newname), st.st_mode & 07777);
-#endif /* DJGPP version 2 or newer */
-#endif /* MSDOS */
     }
+#endif  /* not MSDOS */
 
   /* Closing the output clobbers the file times on some systems.  */
   if (emacs_close (ofd) < 0)
@@ -2616,7 +2607,19 @@ uid and gid of FILE to NEWNAME.  */)
     }
 
   emacs_close (ifd);
-#endif /* WINDOWSNT */
+
+#if defined (__DJGPP__) && __DJGPP__ > 1
+  if (input_file_statable_p)
+    {
+      /* In DJGPP v2.0 and later, fstat usually returns true file mode bits,
+         and if it can't, it tells so.  Otherwise, under MSDOS we usually
+         get only the READ bit, which will make the copied file read-only,
+         so it's better not to chmod at all.  */
+      if ((_djstat_flags & _STFAIL_WRITEBIT) == 0)
+        chmod (SDATA (encoded_newname), st.st_mode & 07777);
+    }
+#endif /* DJGPP version 2 or newer */
+#endif /* not WINDOWSNT */
 
   /* Discard the unwind protects.  */
   specpdl_ptr = specpdl + count;
diff --git a/src/macterm.c b/src/macterm.c
index f5c71ab2c24..a97dc6203f6 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -7640,6 +7640,7 @@ static Boolean mac_convert_event_ref (EventRef eventRef, EventRecord *eventRec)
         default:
           break;
         }
+      break;
 
     case kEventClassKeyboard:
       switch (GetEventKind (eventRef))
@@ -7662,6 +7663,7 @@ static Boolean mac_convert_event_ref (EventRef eventRef, EventRecord *eventRec)
         default:
           break;
         }
+      break;
 
     default:
       break;
diff --git a/src/term.c b/src/term.c
index 1d165d36aca..4fbf87daba8 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1850,14 +1850,20 @@ turn_on_face (f, face_id)
 
       if (fg >= 0 && tty->TS_set_foreground)
         {
-          p = tparam (tty->TS_set_foreground, NULL, 0, (int) fg);
+          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 && tty->TS_set_background)
         {
-          p = tparam (tty->TS_set_background, NULL, 0, (int) bg);
+          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 --git a/src/w32term.c b/src/w32term.c
index 57f27d70e4d..9e6f50e9c21 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -138,6 +138,9 @@ int w32_use_visible_system_caret;
    for Far East languages.  */
 int w32_enable_unicode_output;
 
+/* Flag to enable Cleartype hack for font metrics.  */
+static int cleartype_active;
+
 DWORD dwWindowsThreadId = 0;
 HANDLE hWindowsThread = NULL;
 DWORD dwMainThreadId = 0;
@@ -507,6 +510,7 @@ w32_draw_vertical_window_border (w, x, y0, y1)
   struct frame *f = XFRAME (WINDOW_FRAME (w));
   RECT r;
   HDC hdc;
+  struct face *face;
 
   r.left = x;
   r.right = x + 1;
@@ -514,7 +518,12 @@ w32_draw_vertical_window_border (w, x, y0, y1)
   r.bottom = y1;
 
   hdc = get_frame_dc (f);
-  w32_fill_rect (f, hdc, FRAME_FOREGROUND_PIXEL (f), &r);
+  face = FACE_FROM_ID (f, VERTICAL_BORDER_FACE_ID);
+  if (face)
+    w32_fill_rect (f, hdc, face->foreground, &r);
+  else
+    w32_fill_rect (f, hdc, FRAME_FOREGROUND_PIXEL (f), &r);
+
   release_frame_dc (f, hdc);
 }
 
@@ -907,6 +916,16 @@ w32_native_per_char_metric (font, char2b, font_type, pcm)
           int real_width;
           GetCharWidth (hdc, *char2b, *char2b, &real_width);
 #endif
+          if (cleartype_active)
+            {
+              /* Cleartype antialiasing causes characters to overhang
+                 by a pixel on each side compared with what GetCharABCWidths
+                 reports.  */
+              char_widths.abcA -= 1;
+              char_widths.abcC -= 1;
+              char_widths.abcB += 2;
+            }
+
           pcm->width = char_widths.abcA + char_widths.abcB + char_widths.abcC;
 #if 0
           /* As far as I can tell, this is the best way to determine what
@@ -6404,6 +6423,12 @@ w32_initialize ()
   w32_system_caret_x = 0;
   w32_system_caret_y = 0;
 
+  /* Initialize w32_use_visible_system_caret based on whether a screen
+     reader is in use.  */
+  if (!SystemParametersInfo (SPI_GETSCREENREADER, 0,
+                             &w32_use_visible_system_caret, 0))
+    w32_use_visible_system_caret = 0;
+
   last_tool_bar_item = -1;
   any_help_event_p = 0;
 
@@ -6448,6 +6473,8 @@ w32_initialize ()
   /* Dynamically link to optional system components. */
   {
     HANDLE user_lib = LoadLibrary ("user32.dll");
+    UINT smoothing_type;
+    BOOL smoothing_enabled;
 
 #define LOAD_PROC(fn) pfn##fn = (void *) GetProcAddress (user_lib, #fn)
 
@@ -6468,6 +6495,28 @@ w32_initialize ()
        effectively form the border of the main scroll bar range.  */
     vertical_scroll_bar_top_border = vertical_scroll_bar_bottom_border
       = GetSystemMetrics (SM_CYVSCROLL);
+
+    /* Constants that are not always defined by the system headers
+       since they only exist on certain versions of Windows.  */
+#ifndef SPI_GETFONTSMOOTHING
+#define SPI_GETFONTSMOOTHING 0x4A
+#endif
+#ifndef SPI_GETFONTSMOOTHINGTYPE
+#define SPI_GETFONTSMOOTHINGTYPE 0x0200A
+#endif
+#ifndef FE_FONTSMOOTHINGCLEARTYPE
+#define FE_FONTSMOOTHINGCLEARTYPE 0x2
+#endif
+
+    /* Determine if Cleartype is in use.  Used to enable a hack in
+       the char metric calculations which adds extra pixels to
+       compensate for the "sub-pixels" that are not counted by the
+       system APIs. */
+    cleartype_active =
+      SystemParametersInfo (SPI_GETFONTSMOOTHING, 0, &smoothing_enabled, 0)
+      && smoothing_enabled
+      && SystemParametersInfo (SPI_GETFONTSMOOTHINGTYPE, 0, &smoothing_type, 0)
+      && smoothing_type == FE_FONTSMOOTHINGCLEARTYPE;
   }
 }
 
@@ -6537,11 +6586,7 @@ software is running as it starts up.
 When this variable is set, other variables affecting the appearance of
 the cursor have no effect.  */);
 
-  /* Initialize w32_use_visible_system_caret based on whether a screen
-     reader is in use.  */
-  if (!SystemParametersInfo (SPI_GETSCREENREADER, 0,
-                             &w32_use_visible_system_caret, 0))
-    w32_use_visible_system_caret = 0;
+  w32_use_visible_system_caret = 0;
 
   /* We don't yet support this, but defining this here avoids whining
      from cus-start.el and other places, like "M-x set-variable".  */
diff --git a/src/window.c b/src/window.c
index df284420ddf..38d680fbc72 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4785,7 +4785,9 @@ window_scroll_pixel_based (window, n, whole, noerror)
       /* We moved the window start towards ZV, so PT may be now
          in the scroll margin at the top.  */
       move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
-      if (IT_CHARPOS (it) == PT && it.current_y >= this_scroll_margin)
+      if (IT_CHARPOS (it) == PT && it.current_y >= this_scroll_margin
+          && (NILP (Vscroll_preserve_screen_position)
+              || EQ (Vscroll_preserve_screen_position, Qt)))
         /* We found PT at a legitimate height.  Leave it alone.  */
         ;
       else if (preserve_y >= 0)
@@ -4822,7 +4824,9 @@ window_scroll_pixel_based (window, n, whole, noerror)
       /* We moved the window start towards BEGV, so PT may be now
          in the scroll margin at the bottom.  */
       move_it_to (&it, PT, -1,
-                  it.last_visible_y - this_scroll_margin - 1, -1,
+                  (it.last_visible_y - CURRENT_HEADER_LINE_HEIGHT (w)
+                   - this_scroll_margin - 1),
+                  -1,
                   MOVE_TO_POS | MOVE_TO_Y);
 
       /* Save our position, in case it's correct.  */
@@ -4838,7 +4842,9 @@ window_scroll_pixel_based (window, n, whole, noerror)
           partial_p = it.current_y > it.last_visible_y;
         }
 
-      if (charpos == PT && !partial_p)
+      if (charpos == PT && !partial_p
+          && (NILP (Vscroll_preserve_screen_position)
+              || EQ (Vscroll_preserve_screen_position, Qt)))
         /* We found PT before we found the display margin, so PT is ok.  */
         ;
       else if (preserve_y >= 0)
@@ -4953,7 +4959,8 @@ window_scroll_line_based (window, n, whole, noerror)
          the window-scroll-functions.  */
       w->force_start = Qt;
 
-      if (whole && !NILP (Vscroll_preserve_screen_position))
+      if (!NILP (Vscroll_preserve_screen_position)
+          && (whole || !EQ (Vscroll_preserve_screen_position, Qt)))
         {
           SET_PT_BOTH (pos, pos_byte);
           Fvertical_motion (make_number (original_vpos), window);
@@ -6916,9 +6923,13 @@ If there is only one window, it is split regardless of this value.  */);
 
   DEFVAR_LISP ("scroll-preserve-screen-position",
                &Vscroll_preserve_screen_position,
-               doc: /* *Non-nil means scroll commands move point to keep its screen line unchanged.
-This is only when it is impossible to keep point fixed and still
-scroll as specified.  */);
+               doc: /* *Controls if scroll commands move point to keep its screen line unchanged.
+A value of nil means point does not keep its screen position except
+at the scroll margin or window boundary respectively.
+A value of t means point keeps its screen position if the scroll
+command moved it vertically out of the window, e.g. when scrolling
+by full screens.
+Any other value means point always keeps its screen position.  */);
   Vscroll_preserve_screen_position = Qnil;
 
   DEFVAR_LISP ("window-configuration-change-hook",
diff --git a/src/xdisp.c b/src/xdisp.c
index 1fc5a8b277c..40eaaa46779 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12748,11 +12748,11 @@ try_window (window, pos, check_margins)
 
       if ((w->cursor.y < this_scroll_margin
            && CHARPOS (pos) > BEGV)
-          /* Old redisplay didn't take scroll margin into account at the bottom,
-             but then global-hl-line-mode doesn't scroll.  KFS 2004-06-14 */
-          || (w->cursor.y + (make_cursor_line_fully_visible_p
-                             ? cursor_height + this_scroll_margin
-                             : 1)) > it.last_visible_y)
+          /* rms: considering make_cursor_line_fully_visible_p here
+             seems to give wrong results.  We don't want to recenter
+             when the last line is partly visible, we want to allow
+             that case to be handled in the usual way.  */
+          || (w->cursor.y + 1) > it.last_visible_y)
         {
           w->cursor.vpos = -1;
           clear_glyph_matrix (w->desired_matrix);
@@ -22409,6 +22409,9 @@ x_draw_vertical_border (w)
       window_box_edges (w, -1, &x0, &y0, &x1, &y1);
       y1 -= 1;
 
+      if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0)
+        x1 -= 1;
+
       FRAME_RIF (f)->draw_vertical_window_border (w, x1, y0, y1);
     }
   else if (!WINDOW_LEFTMOST_P (w)
@@ -22419,6 +22422,9 @@ x_draw_vertical_border (w)
       window_box_edges (w, -1, &x0, &y0, &x1, &y1);
       y1 -= 1;
 
+      if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0)
+        x0 -= 1;
+
       FRAME_RIF (f)->draw_vertical_window_border (w, x0, y0, y1);
     }
 }
diff --git a/src/xterm.c b/src/xterm.c
index 68d2e46cc77..1a52e0e5893 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -546,6 +546,12 @@ x_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_X_DISPLAY (f), f->output_data.x->normal_gc,
+                    face->foreground);
 
   XDrawLine (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
              f->output_data.x->normal_gc, x, y0, x, y1);
@@ -6294,6 +6300,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
           if (compose_status.chars_matched > 0 && nbytes == 0)
             break;
 
+          bzero (&compose_status, sizeof (compose_status));
           orig_keysym = keysym;
 
           /* Common for all keysym input events.  */