Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-4

Merge from emacs--cvs-trunk--0

Patches applied:

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-5
   Update from CVS: exi/gnus-faq.texi ([4.1]): Typo.

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

22 files changed, 455 insertions, 170 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 1f179fb6d64..e0e8535186e 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -35,20 +35,23 @@ handle 2 noprint pass
 # debugging.
 handle SIGALRM ignore
 
-# Set up a mask to use.
-# This should be EMACS_INT, but in some cases that is a macro.
-# long ought to work in all cases right now.
+# $valmask and $tagmask are mask values set up by the xreload macro below.
 
+# Use $bugfix so that the value isn't a constant.
+# Using a constant runs into GDB bugs sometimes.
 define xgetptr
-  set $ptr = (gdb_use_union ? $arg0.u.val : $arg0 & $valmask) | gdb_data_seg_bits
+  set $bugfix = $arg0
+  set $ptr = (gdb_use_union ? $bugfix.u.val : $bugfix & $valmask) | gdb_data_seg_bits
 end
 
 define xgetint
-  set $int = gdb_use_union ? $arg0.s.val : (gdb_use_lsb ? $arg0 : $arg0 << gdb_gctypebits) >> gdb_gctypebits
+  set $bugfix = $arg0
+  set $int = gdb_use_union ? $bugfix.s.val : (gdb_use_lsb ? $bugfix : $bugfix << gdb_gctypebits) >> gdb_gctypebits
 end
 
 define xgettype
-  set $type = gdb_use_union ? $arg0.s.type : (enum Lisp_Type) (gdb_use_lsb ? $arg0 & $tagmask : $arg0 >> gdb_valbits)
+  set $bugfix = $arg0
+  set $type = gdb_use_union ? $bugfix.s.type : (enum Lisp_Type) (gdb_use_lsb ? $bugfix & $tagmask : $bugfix >> gdb_valbits)
 end
 
 # Set up something to print out s-expressions.
diff --git a/src/ChangeLog b/src/ChangeLog
index 1debb8b5ef6..dbadb42b3ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -9,11 +9,161 @@
         some possibly unnecessary fontset checking code that crashed
         when creating a new frame
 
+2005-01-22  Steven Tamm  <steventamm@mac.com>
+
+        * s/darwin.h: Removed PTY_ITERATION from here.
+        (DARWIN): Defined.
+        * process.c (init_process): Default process-connection-type to
+        nil on darwin 6 or less, t if it is 7 or higher.  This way the
+        broken pty behavior is still allowed on darwin 6 for interactive
+        processes for people that know what they are doing.
+
+2005-01-22  Kim F. Storm  <storm@cua.dk>
+
+        * window.c (auto_window_vscroll_p): New boolean.
+        (syms_of_window): DEFVAR_BOOL it.
+        (Fpos_visible_in_window_p): Extend return value to include RTOP
+        and RBOT values if FULLY is nil.
+        (window_scroll_pixel_based): Adjust vscroll for partially visible
+        rows if auto_window_vscroll_p is set.
+        (Fset_window_vscroll): Do nothing if vscroll is not modified.
+
+        * xdisp.c (pos_visible_p): Replace FULLY arg by RTOP and RBOT args
+        to return number of partially invisible pixels at top and bottom
+        of the dislay row at POS.
+
+        * lisp.h (pos_visible_p): Fix prototype.
+
+2005-01-21  Richard M. Stallman  <rms@gnu.org>
+
+        * fileio.c (Fcopy_file): Doc fix.
+
+2005-01-21  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_tool_bar_detach_callback): Remove unused variable bw.
+        (xg_get_file_name): Move declaration ofx_use_old_gtk_file_dialog to
+        start of function for older compilers.
+
+2005-01-20  Richard M. Stallman  <rms@gnu.org>
+
+        * editfns.c (Fmessage): If arg is "", return "" (as before).
+
+        * keymap.c (access_keymap): Protect from bad value of meta_prefix_char.
+
+        * .gdbinit (xgetptr, xgetint, xgettype): Copy $arg0 into a temp
+        variable.
+
+2005-01-20  Steven Tamm  <steventamm@mac.com>
+
+        * editfns.c (Voperating_system_release): Added.
+        (init_editfns): Assign new variable operating-system-release
+        based on call to uname if available.
+        (get_operating_system_release): Added function to
+        allow c-level access to operating system release.
+
+        * config.h: Regenerated.
+
+        * s/darwin.h (PTY_ITERATION): Don't allow PTYs on darwin 6 or
+        less.
+        (MIN_PTY_KERNEL_VERSION): Defined minimum kernel version for
+        using ptys as '7'.
+
+2005-01-20  Kim F. Storm  <storm@cua.dk>
+
+        * alloc.c (STRING_MARKED_P, VECTOR_MARKED_P): Return boolean.
+
+        * xterm.c (x_draw_glyph_string_box): Fix last_x for full width rows.
+        Thanks to Chong Yidong <cyd@stupidchicken.com> for debugging this.
+
+        * macterm.c (x_draw_glyph_string_box): Likewise.
+
+        * w32term.c (x_draw_glyph_string_box): Likewise.
+
+        * indent.c (Fvertical_motion): Temporarily disable selective display.
+
+2005-01-19  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (note_mode_line_or_margin_highlight): Fix :pointer
+        image property.
+
+        * fns.c (sweep_weak_table): Advance prev pointer when we keep a pair.
+
+2005-01-18  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (fast_find_position): Backtrack to find first row if
+        charpos is inside a display overlay that spans multiple lines.
+
+2005-01-18  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (decode_coding_iso2022): Translate invalid codes if
+        translation-table is specified.
+
+2005-01-18  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (back_to_previous_visible_line_start): Undo 2004-12-28
+        change.  If handle_display_prop indicates newline is replaced by
+        image or text, move back to start of relevant overlay or interval
+        and continue scan from there.  Simplify.
+
+2005-01-17  Kim F. Storm  <storm@cua.dk>
+
+        * dispnew.c (mode_line_string, marginal_area_string): Fix
+        off-by-one error in search for glyph.
+
+2005-01-16  Kim F. Storm  <storm@cua.dk>
+
+        * macterm.c (syms_of_macterm) <mac-allow-anti-aliasing>: Doc fix.
+
+2005-01-16  Steven Tamm  <steventamm@mac.com>
+
+        * macterm.c (mac_to_x_fontname): Removed spurious argument.
+
+2005-01-16  Andreas Schwab  <schwab@suse.de>
+
+        * macterm.c (mac_draw_string_common): Fix compilation on OSX 10.1.
+
+2005-01-16  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning
+        fringe_faces, cast result from xmalloc/xrealloc to Lisp_Object *.
+
+2005-01-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
+        (READABLE_EVENTS_FILTER_EVENTS, READABLE_EVENTS_IGNORE_SQUEEZABLES):
+        New flags for readable_events.
+        (get_filtered_input_pending, readable_filtered_events): Removed.
+        (tracking_off): Call readable_events and get_input_pending with
+        flag READABLE_EVENTS_DO_TIMERS_NOW.
+        (readable_events): Move code from old readable_filtered_events here,
+        but check new READABLE_EVENTS_* in argument flags instead of previous
+        two boolean arguments do_timers_now and filter_events.
+        If we are doing mouse tracking and the mouse moved, return only if
+        READABLE_EVENTS_IGNORE_SQUEEZABLES is not set in flags.
+        (swallow_events): Call get_input_pending with flag
+        READABLE_EVENTS_DO_TIMERS_NOW.
+        (get_input_pending): Move code from old get_filtered_input_pending
+        here.  Replace boolean arguments do_timers_now, filter_events with
+        flags, and pass flags to readable_events.  Document new
+        READABLE_EVENTS_* flags.
+        (detect_input_pending_ignore_squeezables): New function.
+        (detect_input_pending_run_timers): Call get_input_pending with flag
+        READABLE_EVENTS_DO_TIMERS_NOW.
+        (Finput_pending_p): Call get_input_pending with flags
+        READABLE_EVENTS_DO_TIMERS_NOW and READABLE_EVENTS_FILTER_EVENTS.
+
+        * dispnew.c (update_window, update_frame_1): Replace calls to
+        detect_input_pending with detect_input_pending_ignore_squeezables
+        so that redisplay is not paused if the event queue contains only
+        mouse movements.
+
+        * lisp.h: Declare detect_input_pending_ignore_squeezables.
+
 2005-01-15  Steven Tamm  <steventamm@mac.com>
 
-        * macterm.c (Vmac_use_core_graphics): defined for
-        mac-allow-anti-aliasing
-        (syms_of_macterm): Added mac-allow-anti-aliasing
+        * macterm.c (Vmac_use_core_graphics): Declare variable for
+        mac-allow-anti-aliasing.
+        (syms_of_macterm): DEFVAR_LISP and initialize it.
         (mac_draw_string_common): Use core graphics text rendering if
         mac-allow-anti-aliasing is enabled.
 
diff --git a/src/alloc.c b/src/alloc.c
index 998f736b9c5..2fac07bdf85 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -143,11 +143,11 @@ static __malloc_size_t bytes_used_when_full;
 
 #define MARK_STRING(S)          ((S)->size |= ARRAY_MARK_FLAG)
 #define UNMARK_STRING(S)        ((S)->size &= ~ARRAY_MARK_FLAG)
-#define STRING_MARKED_P(S)      ((S)->size & ARRAY_MARK_FLAG)
+#define STRING_MARKED_P(S)      (((S)->size & ARRAY_MARK_FLAG) != 0)
 
 #define VECTOR_MARK(V)          ((V)->size |= ARRAY_MARK_FLAG)
 #define VECTOR_UNMARK(V)        ((V)->size &= ~ARRAY_MARK_FLAG)
-#define VECTOR_MARKED_P(V)      ((V)->size & ARRAY_MARK_FLAG)
+#define VECTOR_MARKED_P(V)      (((V)->size & ARRAY_MARK_FLAG) != 0)
 
 /* Value is the number of bytes/chars of S, a pointer to a struct
    Lisp_String.  This must be used instead of STRING_BYTES (S) or
diff --git a/src/config.in b/src/config.in
index 87e37e65ef2..34ba3a061df 100644
--- a/src/config.in
+++ b/src/config.in
@@ -598,6 +598,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the <sys/un.h> header file. */
 #undef HAVE_SYS_UN_H
 
+/* Define to 1 if you have the <sys/utsname.h> header file. */
+#undef HAVE_SYS_UTSNAME_H
+
 /* Define to 1 if you have the <sys/vlimit.h> header file. */
 #undef HAVE_SYS_VLIMIT_H
 
diff --git a/src/dispnew.c b/src/dispnew.c
index f04e806b368..c07a4cf8395 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4061,7 +4061,7 @@ update_window (w, force_p)
   if (redisplay_dont_pause)
     force_p = 1;
   else
-    detect_input_pending ();
+    detect_input_pending_ignore_squeezables ();
 
   /* If forced to complete the update, or if no input is pending, do
      the update.  */
@@ -4135,7 +4135,7 @@ update_window (w, force_p)
                scrolling large windows with repeated scroll-up
                commands will too quickly pause redisplay.  */
             if (!force_p && ++n_updated % preempt_count == 0)
-              detect_input_pending ();
+              detect_input_pending_ignore_squeezables ();
 
             changed_p |= update_window_line (w, vpos,
                                              &mouse_face_overwritten_p);
@@ -5079,7 +5079,7 @@ update_frame_1 (f, force_p, inhibit_id_p)
 
   if (redisplay_dont_pause)
     force_p = 1;
-  else if (!force_p && detect_input_pending ())
+  else if (!force_p && detect_input_pending_ignore_squeezables ())
     {
       pause = 1;
       goto do_pause;
@@ -5135,7 +5135,7 @@ update_frame_1 (f, force_p, inhibit_id_p)
             }
 
           if ((i - 1) % preempt_count == 0)
-            detect_input_pending ();
+            detect_input_pending_ignore_squeezables ();
 
           update_frame_line (f, i);
         }
@@ -5828,7 +5828,7 @@ mode_line_string (w, part, x, y, charpos, object, dx, dy, width, height)
          it's the one we were looking for.  */
       glyph = row->glyphs[TEXT_AREA];
       end = glyph + row->used[TEXT_AREA];
-      for (x0 = *x; glyph < end && x0 > glyph->pixel_width; ++glyph)
+      for (x0 = *x; glyph < end && x0 >= glyph->pixel_width; ++glyph)
         x0 -= glyph->pixel_width;
       *x = glyph - row->glyphs[TEXT_AREA];
       if (glyph < end)
@@ -5920,7 +5920,7 @@ marginal_area_string (w, part, x, y, charpos, object, dx, dy, width, height)
 
       glyph = row->glyphs[area];
       end = glyph + row->used[area];
-      for (x0 = *x - x0; glyph < end && x0 > glyph->pixel_width; ++glyph)
+      for (x0 = *x - x0; glyph < end && x0 >= glyph->pixel_width; ++glyph)
         x0 -= glyph->pixel_width;
       *x = glyph - row->glyphs[area];
       if (glyph < end)
diff --git a/src/editfns.c b/src/editfns.c
index 2adc43e3a04..59e57565d49 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -34,6 +34,10 @@ Boston, MA 02111-1307, USA.  */
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
+
 /* systime.h includes <sys/time.h> which, on some systems, is required
    for <sys/resource.h>; thus systime.h must be included before
    <sys/resource.h> */
@@ -106,6 +110,7 @@ Lisp_Object Vsystem_name;
 Lisp_Object Vuser_real_login_name;      /* login name of current user ID */
 Lisp_Object Vuser_full_name;            /* full name of current user */
 Lisp_Object Vuser_login_name;           /* user name from LOGNAME or USER */
+Lisp_Object Voperating_system_release;  /* Operating System Release */
 
 /* Symbol for the text property used to mark fields.  */
 
@@ -170,6 +175,16 @@ init_editfns ()
     Vuser_full_name = build_string (p);
   else if (NILP (Vuser_full_name))
     Vuser_full_name = build_string ("unknown");
+
+#ifdef HAVE_SYS_UTSNAME_H
+  {
+    struct utsname uts;
+    uname (&uts);
+    Voperating_system_release = build_string (uts.release);
+  }
+#else
+  Voperating_system_release = Qnil;
+#endif
 }
 
 DEFUN ("char-to-string", Fchar_to_string, Schar_to_string, 1, 1, 0,
@@ -1344,6 +1359,15 @@ get_system_name ()
     return "";
 }
 
+char *
+get_operating_system_release()
+{
+  if (STRINGP (Voperating_system_release))
+    return (char *) SDATA (Voperating_system_release);
+  else
+    return "";
+}
+
 DEFUN ("emacs-pid", Femacs_pid, Semacs_pid, 0, 0, 0,
        doc: /* Return the process ID of Emacs, as an integer.  */)
      ()
@@ -3240,7 +3264,7 @@ usage: (message STRING &rest ARGS)  */)
           && SBYTES (args[0]) == 0))
     {
       message (0);
-      return Qnil;
+      return args[0];
     }
   else
     {
@@ -4434,6 +4458,9 @@ functions if all the text being accessed has this property.  */);
   DEFVAR_LISP ("user-real-login-name", &Vuser_real_login_name,
                doc: /* The user's name, based upon the real uid only.  */);
 
+  DEFVAR_LISP ("operating-system-release", &Voperating_system_release,
+               doc: /* The release of the operating system Emacs is running on.  */);
+
   defsubr (&Spropertize);
   defsubr (&Schar_equal);
   defsubr (&Sgoto_char);
diff --git a/src/emacs.c b/src/emacs.c
index 2deb6606fec..becab72ccdd 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1,6 +1,6 @@
 /* Fully extensible Emacs, running on Unix, intended for GNU.
-   Copyright (C) 1985,86,87,93,94,95,97,98,1999,2001,02,03,2004
-      Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001,
+     2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2438,7 +2438,16 @@ syms_of_emacs ()
 Many arguments are deleted from the list as they are processed.  */);
 
   DEFVAR_LISP ("system-type", &Vsystem_type,
-               doc: /* Value is symbol indicating type of operating system you are using.  */);
++              doc: /* Value is symbol indicating type of operating system you are using.
++Special values:
++  `gnu/linux'   compiled for a GNU/Linux system.
++  `darwin'      compiled for Darwin (GNU-Darwin, Mac OS X, ...).
++  `macos'       compiled for Mac OS 9.
++  `ms-dos'      compiled as an MS-DOS application.
++  `windows-nt'  compiled as a native W32 application.
++  `cygwin'      compiled using the Cygwin library.
++  `vax-vms' or `axp-vms': compiled for a (Open)VMS system.
++Anything else indicates some sort of Unix system.  */);
   Vsystem_type = intern (SYSTEM_TYPE);
 
   DEFVAR_LISP ("system-configuration", &Vsystem_configuration,
diff --git a/src/fileio.c b/src/fileio.c
index 4a5d878d532..c21cdcec675 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2395,10 +2395,10 @@ Signals a `file-already-exists' error if file NEWNAME already exists,
 unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil.
 A number as third arg means request confirmation if NEWNAME already exists.
 This is what happens in interactive use with M-x.
-Fourth arg KEEP-TIME non-nil means give the new file the same
+Always sets the file modes of the output file to match the input file.
+Fourth arg KEEP-TIME non-nil means give the output file the same
 last-modified time as the old one.  (This works on only some systems.)
-A prefix arg makes KEEP-TIME non-nil.
-Also set the file modes of the target file to match the source file.  */)
+A prefix arg makes KEEP-TIME non-nil.  */)
      (file, newname, ok_if_already_exists, keep_time)
      Lisp_Object file, newname, ok_if_already_exists, keep_time;
 {
diff --git a/src/fns.c b/src/fns.c
index 542d0344fcb..52e258a3590 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -4305,6 +4305,10 @@ sweep_weak_table (h, remove_entries_p)
 
                   h->count = make_number (XFASTINT (h->count) - 1);
                 }
+              else
+                {
+                  prev = idx;
+                }
             }
           else
             {
diff --git a/src/fringe.c b/src/fringe.c
index 76908907a03..771e7d4787c 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1301,7 +1301,7 @@ If BITMAP already exists, the existing definition is replaced.  */)
                 = ((struct fringe_bitmap **)
                    xrealloc (fringe_bitmaps, max_fringe_bitmaps * sizeof (struct fringe_bitmap *)));
               fringe_faces
-                = (unsigned *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (Lisp_Object));
+                = (Lisp_Object *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (Lisp_Object));
 
               for (; i < max_fringe_bitmaps; i++)
                 {
@@ -1472,7 +1472,7 @@ init_fringe ()
   fringe_bitmaps
     = (struct fringe_bitmap **) xmalloc (max_fringe_bitmaps * sizeof (struct fringe_bitmap *));
   fringe_faces
-    = (unsigned *) xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object));
+    = (Lisp_Object *) xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object));
 
   for (i = 0; i < max_fringe_bitmaps; i++)
     {
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 39d5e768dda..aecc4e2eaea 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1312,6 +1312,7 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p)
   char *fn = 0;
   int filesel_done = 0;
   xg_get_file_func func;
+  extern int x_use_old_gtk_file_dialog;
 
 #if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN)
   /* I really don't know why this is needed, but without this the GLIBC add on
@@ -1321,7 +1322,6 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p)
 #endif /* HAVE_GTK_AND_PTHREAD */
 
 #ifdef HAVE_GTK_FILE_BOTH
-  extern int x_use_old_gtk_file_dialog;
 
   if (x_use_old_gtk_file_dialog)
     w = xg_get_file_with_selection (f, prompt, default_filename,
@@ -3161,7 +3161,6 @@ xg_tool_bar_detach_callback (wbox, w, client_data)
       /* When detaching a tool bar, not everything dissapear.  There are
          a few pixels left that are used to drop the tool bar back into
          place.  */
-      int bw = gtk_container_get_border_width (GTK_CONTAINER (wbox));
       FRAME_TOOLBAR_HEIGHT (f) = 2;
 
       /* The height has changed, resize outer widget and set columns
diff --git a/src/indent.c b/src/indent.c
index 24645b104cf..1d69d346f92 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2071,6 +2071,7 @@ whether or not it is currently displayed in some window.  */)
   else
     {
       int it_start;
+      int oselective;
 
       SET_TEXT_POS (pt, PT, PT_BYTE);
       start_display (&it, w, pt);
@@ -2084,7 +2085,11 @@ whether or not it is currently displayed in some window.  */)
       it_start = IT_CHARPOS (it);
       reseat_at_previous_visible_line_start (&it);
       it.current_x = it.hpos = 0;
+      /* Temporarily disable selective display so we don't move too far */
+      oselective = it.selective;
+      it.selective = 0;
       move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
+      it.selective = oselective;
 
       /* Move back if we got too far.  This may happen if
          truncate-lines is on and PT is beyond right margin.  */
diff --git a/src/keyboard.c b/src/keyboard.c
index 7efea38121e..8abc38b1072 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -646,14 +646,17 @@ static EMACS_TIME timer_last_idleness_start_time;
 
 /* Global variable declarations.  */
 
+/* Flags for readable_events.  */
+#define READABLE_EVENTS_DO_TIMERS_NOW           (1 << 0)
+#define READABLE_EVENTS_FILTER_EVENTS           (1 << 1)
+#define READABLE_EVENTS_IGNORE_SQUEEZABLES      (1 << 2)
+
 /* Function for init_keyboard to call with no args (if nonzero).  */
 void (*keyboard_init_hook) ();
 
 static int read_avail_input P_ ((int));
 static void get_input_pending P_ ((int *, int));
-static void get_filtered_input_pending P_ ((int *, int, int));
 static int readable_events P_ ((int));
-static int readable_filtered_events P_ ((int, int));
 static Lisp_Object read_char_x_menu_prompt P_ ((int, Lisp_Object *,
                                                 Lisp_Object, int *));
 static Lisp_Object read_char_x_menu_prompt ();
@@ -3440,10 +3443,11 @@ tracking_off (old_value)
          input has been processed.  If the only input available was
          the sort that we have just disabled, then we need to call
          redisplay.  */
-      if (!readable_events (1))
+      if (!readable_events (READABLE_EVENTS_DO_TIMERS_NOW))
         {
           redisplay_preserve_echo_area (6);
-          get_input_pending (&input_pending, 1);
+          get_input_pending (&input_pending,
+                             READABLE_EVENTS_DO_TIMERS_NOW);
         }
     }
   return Qnil;
@@ -3495,20 +3499,19 @@ some_mouse_moved ()
 /* Return true iff there are any events in the queue that read-char
    would return.  If this returns false, a read-char would block.  */
 static int
-readable_filtered_events (do_timers_now, filter_events)
-     int do_timers_now;
-     int filter_events;
+readable_events (flags)
+     int flags;
 {
-  if (do_timers_now)
-    timer_check (do_timers_now);
+  if (flags & READABLE_EVENTS_DO_TIMERS_NOW)
+    timer_check (1);
 
-  /* If the buffer contains only FOCUS_IN_EVENT events,
-     and FILTER_EVENTS is nonzero, report it as empty.  */
+  /* If the buffer contains only FOCUS_IN_EVENT events, and
+     READABLE_EVENTS_FILTER_EVENTS is set, report it as empty.  */
   if (kbd_fetch_ptr != kbd_store_ptr)
     {
       int have_live_event = 1;
 
-      if (filter_events)
+      if (flags & READABLE_EVENTS_FILTER_EVENTS)
         {
           struct input_event *event;
 
@@ -3529,7 +3532,8 @@ readable_filtered_events (do_timers_now, filter_events)
     }
 
 #ifdef HAVE_MOUSE
-  if (!NILP (do_mouse_tracking) && some_mouse_moved ())
+  if (!(flags & READABLE_EVENTS_IGNORE_SQUEEZABLES)
+      && !NILP (do_mouse_tracking) && some_mouse_moved ())
     return 1;
 #endif
   if (single_kboard)
@@ -3547,15 +3551,6 @@ readable_filtered_events (do_timers_now, filter_events)
   return 0;
 }
 
-/* Return true iff there are any events in the queue that read-char
-   would return.  If this returns false, a read-char would block.  */
-static int
-readable_events (do_timers_now)
-     int do_timers_now;
-{
-  return readable_filtered_events (do_timers_now, 0);
-}
-
 /* Set this for debugging, to have a way to get out */
 int stop_character;
 
@@ -4226,7 +4221,7 @@ swallow_events (do_display)
     }
 
   old_timers_run = timers_run;
-  get_input_pending (&input_pending, 1);
+  get_input_pending (&input_pending, READABLE_EVENTS_DO_TIMERS_NOW);
 
   if (timers_run != old_timers_run && do_display)
     redisplay_preserve_echo_area (7);
@@ -6518,18 +6513,20 @@ lucid_event_type_list_p (object)
    but works even if FIONREAD does not exist.
    (In fact, this may actually read some input.)
 
-   If DO_TIMERS_NOW is nonzero, actually run timer events that are ripe.
-   If FILTER_EVENTS is nonzero, ignore internal events (FOCUS_IN_EVENT). */
+   If READABLE_EVENTS_DO_TIMERS_NOW is set in FLAGS, actually run
+   timer events that are ripe.
+   If READABLE_EVENTS_FILTER_EVENTS is set in FLAGS, ignore internal
+   events (FOCUS_IN_EVENT).
+   If READABLE_EVENTS_IGNORE_SQUEEZABLES is set in FLAGS, ignore mouse
+   movements. */
 
 static void
-get_filtered_input_pending (addr, do_timers_now, filter_events)
+get_input_pending (addr, flags)
      int *addr;
-     int do_timers_now;
-     int filter_events;
+     int flags;
 {
   /* First of all, have we already counted some input?  */
-  *addr = (!NILP (Vquit_flag)
-           || readable_filtered_events (do_timers_now, filter_events));
+  *addr = (!NILP (Vquit_flag) || readable_events (flags));
 
   /* If input is being read as it arrives, and we have none, there is none.  */
   if (*addr > 0 || (interrupt_input && ! interrupts_deferred))
@@ -6537,23 +6534,7 @@ get_filtered_input_pending (addr, do_timers_now, filter_events)
 
   /* Try to read some input and see how much we get.  */
   gobble_input (0);
-  *addr = (!NILP (Vquit_flag)
-           || readable_filtered_events (do_timers_now, filter_events));
-}
-
-/* Store into *addr a value nonzero if terminal input chars are available.
-   Serves the purpose of ioctl (0, FIONREAD, addr)
-   but works even if FIONREAD does not exist.
-   (In fact, this may actually read some input.)
-
-   If DO_TIMERS_NOW is nonzero, actually run timer events that are ripe.  */
-
-static void
-get_input_pending (addr, do_timers_now)
-     int *addr;
-     int do_timers_now;
-{
-  get_filtered_input_pending (addr, do_timers_now, 0);
+  *addr = (!NILP (Vquit_flag) || readable_events (flags));
 }
 
 /* Interface to read_avail_input, blocking SIGIO or SIGALRM if necessary.  */
@@ -9869,6 +9850,18 @@ detect_input_pending ()
   return input_pending;
 }
 
+/* Return nonzero if input events other than mouse movements are
+   pending.  */
+
+int
+detect_input_pending_ignore_squeezables ()
+{
+  if (!input_pending)
+    get_input_pending (&input_pending, READABLE_EVENTS_IGNORE_SQUEEZABLES);
+
+  return input_pending;
+}
+
 /* Return nonzero if input events are pending, and run any pending timers.  */
 
 int
@@ -9878,7 +9871,7 @@ detect_input_pending_run_timers (do_display)
   int old_timers_run = timers_run;
 
   if (!input_pending)
-    get_input_pending (&input_pending, 1);
+    get_input_pending (&input_pending, READABLE_EVENTS_DO_TIMERS_NOW);
 
   if (old_timers_run != timers_run && do_display)
     {
@@ -9927,7 +9920,9 @@ if there is a doubt, the value is t.  */)
   if (!NILP (Vunread_command_events) || unread_command_char != -1)
     return (Qt);
 
-  get_filtered_input_pending (&input_pending, 1, 1);
+  get_input_pending (&input_pending,
+                     READABLE_EVENTS_DO_TIMERS_NOW
+                     | READABLE_EVENTS_FILTER_EVENTS);
   return input_pending > 0 ? Qt : Qnil;
 }
 
diff --git a/src/keymap.c b/src/keymap.c
index ea0b1843b85..074cc1706bf 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -525,6 +525,10 @@ access_keymap (map, idx, t_ok, noinherit, autoload)
       struct gcpro gcpro1;
       Lisp_Object meta_map;
       GCPRO1 (map);
+      /* A strange value in which Meta is set would cause
+         infinite recursion.  Protect against that.  */
+      if (meta_prefix_char & CHAR_META)
+        meta_prefix_char = make_number (27);
       meta_map = get_keymap (access_keymap (map, meta_prefix_char,
                                             t_ok, noinherit, autoload),
                              0, autoload);
diff --git a/src/lisp.h b/src/lisp.h
index bb7766a7b82..2e82a336a66 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2481,7 +2481,7 @@ extern void syms_of_xdisp P_ ((void));
 extern void init_xdisp P_ ((void));
 extern Lisp_Object safe_eval P_ ((Lisp_Object));
 extern int pos_visible_p P_ ((struct window *, int, int *,
-                              int *, int *, int));
+                              int *, int *, int *, int));
 
 /* Defined in vm-limit.c.  */
 extern void memory_warnings P_ ((POINTER_TYPE *, void (*warnfun) ()));
@@ -2947,6 +2947,7 @@ EXFUN (Fevent_convert_list, 1);
 EXFUN (Fread_key_sequence, 5);
 EXFUN (Fset_input_mode, 4);
 extern int detect_input_pending P_ ((void));
+extern int detect_input_pending_ignore_squeezables P_ ((void));
 extern int detect_input_pending_run_timers P_ ((int));
 extern void safe_run_hooks P_ ((Lisp_Object));
 extern void cmd_error_internal P_ ((Lisp_Object, char *));
diff --git a/src/macterm.c b/src/macterm.c
index d35a210e4c6..d083252d90c 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -1,5 +1,5 @@
 /* Implementation of GUI terminal on the Mac OS.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -731,7 +731,7 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode,
      int nchars, mode, bytes_per_char;
 {
   SetPortWindowPort (w);
-#ifdef MAC_OSX
+#ifdef MAC_OS_X_VERSION_10_2
   UInt32 textFlags, savedFlags;
   if (!NILP(Vmac_use_core_graphics)) {
     textFlags = kQDUseCGTextRendering;
@@ -748,7 +748,7 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode,
 
   MoveTo (x, y);
   DrawText (buf, 0, nchars * bytes_per_char);
-#ifdef MAC_OSX
+#ifdef MAC_OS_X_VERSION_10_2
   if (!NILP(Vmac_use_core_graphics))
     SwapQDTextFlags(savedFlags);
 #endif
@@ -2648,15 +2648,9 @@ x_draw_glyph_string_box (s)
   struct glyph *last_glyph;
   Rect clip_rect;
 
-  last_x = window_box_right (s->w, s->area);
-  if (s->row->full_width_p
-      && !s->w->pseudo_window_p)
-    {
-      last_x += WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH (s->w);
-      if (s->area != RIGHT_MARGIN_AREA
-          || WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (s->w))
-        last_x += WINDOW_RIGHT_FRINGE_WIDTH (s->w);
-    }
+  last_x = ((s->row->full_width_p && !s->w->pseudo_window_p)
+            ? WINDOW_RIGHT_EDGE_X (s->w)
+            : window_box_right (s->w, s->area));
 
   /* The glyph that may have a right box line.  */
   last_glyph = (s->cmp || s->img
@@ -5951,7 +5945,7 @@ decode_mac_font_name (name, size, scriptcode)
 
 
 static char *
-mac_to_x_fontname (name, size, style, scriptcode, encoding_base)
+mac_to_x_fontname (name, size, style, scriptcode)
      char *name;
      int size;
      Style style;
@@ -6822,7 +6816,7 @@ XLoadQueryFont (Display *dpy, char *fontname)
         font->max_bounds.width = max_width;
       }
     }
-  
+
   TextFont (old_fontnum);  /* restore previous font number, size and face */
   TextSize (old_fontsize);
   TextFace (old_fontface);
@@ -9950,7 +9944,9 @@ Toolbox for processing before Emacs sees it.  */);
 #endif
 
   DEFVAR_LISP ("mac-allow-anti-aliasing", &Vmac_use_core_graphics,
-   doc: /* If non-nil, the text will be rendered using Core Graphics text rendering which may anti-alias the text.  */);
+   doc: /* If non-nil, allow anti-aliasing.
+The text will be rendered using Core Graphics text rendering which
+may anti-alias the text.  */);
   Vmac_use_core_graphics = Qnil;
 
   DEFVAR_INT ("mac-keyboard-text-encoding", &mac_keyboard_text_encoding,
diff --git a/src/process.c b/src/process.c
index ac92678c8e0..1bd8b3ae64d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -187,6 +187,7 @@ extern Lisp_Object QCfilter;
 #include "syswait.h"
 
 extern void set_waiting_for_input P_ ((EMACS_TIME *));
+extern char *get_operating_system_release ();
 
 #ifndef USE_CRT_DLL
 extern int errno;
@@ -6702,6 +6703,19 @@ init_process ()
    Fprovide (intern ("make-network-process"), subfeatures);
  }
 #endif /* HAVE_SOCKETS */
+
+#ifdef DARWIN
+  /* PTYs are broken on Darwin < 6, but are sometimes useful for interactive 
+     processes.  As such, we only change the default value.  */
+ if (initialized)
+  {
+    char *release = get_operating_system_release();
+    if (!release || !release[0] || (release[0] < MIN_PTY_KERNEL_VERSION
+                                    && release[1] == '.')) {
+      Vprocess_connection_type = Qnil;
+    }
+  }
+#endif
 }
 
 void
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 9f78405a43c..5b162ea08a3 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -37,6 +37,10 @@ Boston, MA 02111-1307, USA.  */
 #define BSD_SYSTEM
 /* #define VMS */
 
+#ifndef DARWIN
+#define DARWIN 1
+#endif
+
 /* MAC_OS is used to conditionally compile code common to both MAC_OS8
    and MAC_OSX.  */
 #ifdef MAC_OSX
@@ -103,10 +107,18 @@ Boston, MA 02111-1307, USA.  */
 
 /*
  *      Define HAVE_PTYS if the system supports pty devices.
+ *      Note: PTYs are broken on darwin <6.  Use at your own risk.
  */
 
 #define HAVE_PTYS
 
+/**
+ * PTYs only work correctly on Darwin 7 or higher.  So make the
+ * default for process-connection-type dependent on the kernel
+ * version.
+ */
+#define MIN_PTY_KERNEL_VERSION '7' 
+
 /*
  *      Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
  *      The 4.2 opendir, etc., library functions.
diff --git a/src/w32term.c b/src/w32term.c
index 9ed4eb3b64e..bffdd8f2565 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2072,15 +2072,9 @@ x_draw_glyph_string_box (s)
   struct glyph *last_glyph;
   RECT clip_rect;
 
-  last_x = window_box_right (s->w, s->area);
-  if (s->row->full_width_p
-      && !s->w->pseudo_window_p)
-    {
-      last_x += WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH (s->w);
-      if (s->area != RIGHT_MARGIN_AREA
-          || WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (s->w))
-        last_x += WINDOW_RIGHT_FRINGE_WIDTH (s->w);
-    }
+  last_x = ((s->row->full_width_p && !s->w->pseudo_window_p)
+            ? WINDOW_RIGHT_EDGE_X (s->w)
+            : window_box_right (s->w, s->area));
 
   /* The glyph that may have a right box line.  */
   last_glyph = (s->cmp || s->img
diff --git a/src/window.c b/src/window.c
index 27aa8102290..9b8a031f6c1 100644
--- a/src/window.c
+++ b/src/window.c
@@ -124,6 +124,11 @@ Lisp_Object Vother_window_scroll_buffer;
 
 Lisp_Object Vtemp_buffer_show_function;
 
+/* Non-zero means line and page scrolling on tall lines (with images)
+   does partial scrolling by modifying window-vscroll.  */
+
+int auto_window_vscroll_p;
+
 /* Non-zero means to use mode-line-inactive face in all windows but the
    selected-window and the minibuffer-scroll-window when the
    minibuffer is active.  */
@@ -328,9 +333,11 @@ If POS is only out of view because of horizontal scrolling, return non-nil.
 POS defaults to point in WINDOW; WINDOW defaults to the selected window.
 
 If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
-return value is a list (X Y FULLY) where X and Y are the pixel coordinates
-relative to the top left corner of the window, and FULLY is t if the
-character after POS is fully visible and nil otherwise.  */)
+return value is a list (X Y FULLY [RTOP RBOT]) where X and Y are the pixel
+coordinates relative to the top left corner of the window, and FULLY is t if the
+character after POS is fully visible and nil otherwise.  If FULLY is nil,
+RTOP and RBOT are the number of pixels invisible at the top and bottom row
+of the window.  */)
      (pos, window, partially)
      Lisp_Object pos, window, partially;
 {
@@ -339,7 +346,7 @@ character after POS is fully visible and nil otherwise.  */)
   register struct buffer *buf;
   struct text_pos top;
   Lisp_Object in_window = Qnil;
-  int fully_p = 1;
+  int rtop, rbot, fully_p = 1;
   int x, y;
 
   w = decode_window (window);
@@ -362,14 +369,19 @@ character after POS is fully visible and nil otherwise.  */)
       && posint <= BUF_ZV (buf)
       && CHARPOS (top) >= BUF_BEGV (buf)
       && CHARPOS (top) <= BUF_ZV (buf)
-      && pos_visible_p (w, posint, &fully_p, &x, &y, NILP (partially))
-      && (!NILP (partially) || fully_p))
+      && pos_visible_p (w, posint, &x, &y, &rtop, &rbot, NILP (partially))
+      && (fully_p = !rtop && !rbot, (!NILP (partially) || fully_p)))
     in_window = Qt;
 
   if (!NILP (in_window) && !NILP (partially))
     in_window = Fcons (make_number (x),
                        Fcons (make_number (y),
-                              Fcons (fully_p ? Qt : Qnil, Qnil)));
+                              Fcons (fully_p ? Qt : Qnil,
+                                     (fully_p
+                                      ? Qnil
+                                      : Fcons (make_number (rtop),
+                                               Fcons (make_number (rbot),
+                                                      Qnil))))));
   return in_window;
 }
 
@@ -4564,6 +4576,31 @@ window_scroll_pixel_based (window, n, whole, noerror)
 
       start = it.current.pos;
     }
+  else if (auto_window_vscroll_p)
+    {
+      if (NILP (XCAR (XCDR (XCDR (tem)))))
+        {
+          int px;
+          int dy = WINDOW_FRAME_LINE_HEIGHT (w);
+          if (whole)
+            dy = window_box_height (w) - next_screen_context_lines * dy;
+          dy *= n;
+
+          if (n < 0 && (px = XINT (Fnth (make_number (3), tem))) > 0)
+            {
+              px = max (0, -w->vscroll - min (px, -dy));
+              Fset_window_vscroll (window, make_number (px), Qt);
+              return;
+            }
+          if (n > 0 && (px = XINT (Fnth (make_number (4), tem))) > 0)
+            {
+              px = max (0, -w->vscroll + min (px, dy));
+              Fset_window_vscroll (window, make_number (px), Qt);
+              return;
+            }
+        }
+      Fset_window_vscroll (window, make_number (0), Qt);
+    }
 
   /* If scroll_preserve_screen_position is non-nil, we try to set
      point in the same window line as it is now, so get that line.  */
@@ -6335,13 +6372,16 @@ If PIXELS-P is non-nil, the return value is VSCROLL.  */)
                       : XFLOATINT (vscroll));
       w->vscroll = min (w->vscroll, 0);
 
-      /* Adjust glyph matrix of the frame if the virtual display
-         area becomes larger than before.  */
-      if (w->vscroll < 0 && w->vscroll < old_dy)
-        adjust_glyphs (f);
+      if (w->vscroll != old_dy)
+        {
+          /* Adjust glyph matrix of the frame if the virtual display
+             area becomes larger than before.  */
+          if (w->vscroll < 0 && w->vscroll < old_dy)
+            adjust_glyphs (f);
 
-      /* Prevent redisplay shortcuts.  */
-      XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
+          /* Prevent redisplay shortcuts.  */
+          XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
+        }
     }
 
   return Fwindow_vscroll (window, pixels_p);
@@ -6653,6 +6693,10 @@ is displayed in the `mode-line' face.  */);
                doc: /* *Non-nil means `display-buffer' should make a separate frame.  */);
   pop_up_frames = 0;
 
+  DEFVAR_BOOL ("auto-window-vscroll", &auto_window_vscroll_p,
+               doc: /* *Non-nil means to automatically adjust `window-vscroll' to view tall lines.  */);
+  auto_window_vscroll_p = 1;
+
   DEFVAR_BOOL ("display-buffer-reuse-frames", &display_buffer_reuse_frames,
                doc: /* *Non-nil means `display-buffer' should reuse frames.
 If the buffer in question is already displayed in a frame, raise that frame.  */);
diff --git a/src/xdisp.c b/src/xdisp.c
index 950ec6c57b2..6a59de7ef8d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1246,15 +1246,16 @@ line_bottom_y (it)
 }
 
 
-/* Return 1 if position CHARPOS is visible in window W.  Set *FULLY to
-   1 if POS is visible and the line containing POS is fully visible.
+/* Return 1 if position CHARPOS is visible in window W.
+   If visible, set *X and *Y to pixel coordinates of top left corner.
+   Set *RTOP and *RBOT to pixel height of an invisible area of glyph at POS.
    EXACT_MODE_LINE_HEIGHTS_P non-zero means compute exact mode-line
    and header-lines heights.  */
 
 int
-pos_visible_p (w, charpos, fully, x, y, exact_mode_line_heights_p)
+pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
      struct window *w;
-     int charpos, *fully, *x, *y, exact_mode_line_heights_p;
+     int charpos, *x, *y, *rtop, *rbot, exact_mode_line_heights_p;
 {
   struct it it;
   struct text_pos top;
@@ -1267,7 +1268,7 @@ pos_visible_p (w, charpos, fully, x, y, exact_mode_line_heights_p)
       set_buffer_internal_1 (XBUFFER (w->buffer));
     }
 
-  *fully = visible_p = 0;
+  visible_p = 0;
   SET_TEXT_POS_FROM_MARKER (top, w->start);
 
   /* Compute exact mode line heights, if requested.  */
@@ -1298,14 +1299,16 @@ pos_visible_p (w, charpos, fully, x, y, exact_mode_line_heights_p)
       if (top_y < window_top_y)
         visible_p = bottom_y > window_top_y;
       else if (top_y < it.last_visible_y)
-        {
           visible_p = 1;
-          *fully = bottom_y <= it.last_visible_y;
-        }
       if (visible_p && x)
         {
           *x = it.current_x;
           *y = max (top_y + it.max_ascent - it.ascent, window_top_y);
+          if (rtop)
+            {
+              *rtop = max (0, window_top_y - top_y);
+              *rbot = max (0, bottom_y - it.last_visible_y);
+            }
         }
     }
   else if (it.current_y + it.max_ascent + it.max_descent > it.last_visible_y)
@@ -1322,6 +1325,11 @@ pos_visible_p (w, charpos, fully, x, y, exact_mode_line_heights_p)
               move_it_to (&it2, charpos, -1, -1, -1, MOVE_TO_POS);
               *x = it2.current_x;
               *y = it2.current_y + it2.max_ascent - it2.ascent;
+              if (rtop)
+                {
+                  *rtop = 0;
+                  *rbot = max (0, (it2.current_y + it2.max_ascent + it2.max_descent) - it.last_visible_y);
+                }
             }
         }
     }
@@ -4669,51 +4677,52 @@ static void
 back_to_previous_visible_line_start (it)
      struct it *it;
 {
-  int visible_p = 0;
-
-  /* Go back one newline if not on BEGV already.  */
-  if (IT_CHARPOS (*it) > BEGV)
-    back_to_previous_line_start (it);
-
-  /* Move over lines that are invisible because of selective display
-     or text properties.  */
-  while (IT_CHARPOS (*it) > BEGV
-         && !visible_p)
+  while (IT_CHARPOS (*it) > BEGV)
     {
-      visible_p = 1;
+      back_to_previous_line_start (it);
+      if (IT_CHARPOS (*it) <= BEGV)
+        break;
 
       /* If selective > 0, then lines indented more than that values
          are invisible.  */
       if (it->selective > 0
           && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
                                 (double) it->selective)) /* iftc */
-        visible_p = 0;
-      else
-        {
-          Lisp_Object prop;
+        continue;
 
-          /* Check the newline before point for invisibility.  */
-          prop = Fget_char_property (make_number (IT_CHARPOS (*it) - 1),
+      /* Check the newline before point for invisibility.  */
+      {
+        Lisp_Object prop;
+        prop = Fget_char_property (make_number (IT_CHARPOS (*it) - 1),
                                      Qinvisible, it->window);
-          if (TEXT_PROP_MEANS_INVISIBLE (prop))
-            visible_p = 0;
-        }
-
-#if 0
-      /* Commenting this out fixes the bug described in
-         http://www.math.ku.dk/~larsh/emacs/emacs-loops-on-large-images/test-case.txt.  */
-      if (visible_p)
-        {
-          struct it it2 = *it;
-
-          if (handle_display_prop (&it2) == HANDLED_RETURN)
-            visible_p = 0;
-        }
-#endif
+        if (TEXT_PROP_MEANS_INVISIBLE (prop))
+          continue;
+      }
 
-      /* Back one more newline if the current one is invisible.  */
-      if (!visible_p)
-        back_to_previous_line_start (it);
+      /* If newline has a display property that replaces the newline with something
+         else (image or text), find start of overlay or interval and continue search
+         from that point.  */
+      {
+        struct it it2 = *it;
+        int pos = IT_CHARPOS (*it);
+        int beg, end;
+        Lisp_Object val, overlay;
+
+        if (handle_display_prop (&it2) == HANDLED_RETURN
+            && !NILP (val = get_char_property_and_overlay
+                      (make_number (pos), Qdisplay, Qnil, &overlay))
+            && (OVERLAYP (overlay)
+                ? (beg = OVERLAY_POSITION (OVERLAY_START (overlay)))
+                : get_property_and_range (pos, Qdisplay, &val, &beg, &end, Qnil)))
+          {
+            if (beg < BEGV)
+              beg = BEGV;
+            IT_CHARPOS (*it) = beg;
+            IT_BYTEPOS (*it) = buf_charpos_to_bytepos (current_buffer, beg);
+            continue;
+          }
+      }
+      break;
     }
 
   xassert (IT_CHARPOS (*it) >= BEGV);
@@ -20751,6 +20760,28 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
       past_end = 1;
     }
 
+  /* If whole rows or last part of a row came from a display overlay,
+     row_containing_pos will skip over such rows because their end pos
+     equals the start pos of the overlay or interval.  Backtrack if we
+     have a STOP object and previous row's end glyph came from STOP.  */
+  if (!NILP (stop))
+    {
+      struct glyph_row *prev = row-1;
+      while ((prev = row - 1, prev >= first)
+             && MATRIX_ROW_END_CHARPOS (prev) == charpos
+             && prev->used[TEXT_AREA] > 0)
+        {
+          end = prev->glyphs[TEXT_AREA];
+          glyph = end + prev->used[TEXT_AREA];
+          while (--glyph >= end
+                 && INTEGERP (glyph->object));
+          if (glyph >= end
+              && !EQ (stop, glyph->object))
+            break;
+          row = prev;
+        }
+    }
+
   *x = row->x;
   *y = row->y;
   *vpos = MATRIX_ROW_VPOS (row, w->current_matrix);
@@ -21212,9 +21243,9 @@ note_mode_line_or_margin_highlight (w, x, y, area)
                   help_echo_pos = charpos;
                 }
             }
-          if (NILP (pointer))
-            pointer = Fsafe_plist_get (XCDR (object), QCpointer);
         }
+      if (NILP (pointer))
+        pointer = Fsafe_plist_get (XCDR (object), QCpointer);
     }
 
   if (STRINGP (string))
diff --git a/src/xterm.c b/src/xterm.c
index d0b595ea73c..a68725a463c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2133,15 +2133,9 @@ x_draw_glyph_string_box (s)
   struct glyph *last_glyph;
   XRectangle clip_rect;
 
-  last_x = window_box_right (s->w, s->area);
-  if (s->row->full_width_p
-      && !s->w->pseudo_window_p)
-    {
-      last_x += WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH (s->w);
-      if (s->area != RIGHT_MARGIN_AREA
-          || WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (s->w))
-        last_x += WINDOW_RIGHT_FRINGE_WIDTH (s->w);
-    }
+  last_x = ((s->row->full_width_p && !s->w->pseudo_window_p)
+            ? WINDOW_RIGHT_EDGE_X (s->w)
+            : window_box_right (s->w, s->area));
 
   /* The glyph that may have a right box line.  */
   last_glyph = (s->cmp || s->img
@@ -4335,7 +4329,7 @@ xg_scroll_callback (widget, data)
     }
 
   if (part >= 0)
-    { 
+    {
       window_being_scrolled = bar->window;
       last_scroll_bar_part = part;
       x_send_scroll_bar_event (bar->window, part, portion, whole);