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

Merge from emacs--cvs-trunk--0

Patches applied:

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-114
   <no summary provided>

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-21
   More work on moving images to etc/images

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-23
   Fix errors with image-file installation

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-24
   etc/Makefile.in (install): Put gnus-tut.txt in the right place.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-25
   etc/Makefile.in (install, uninstall): Fix installed image dirs.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-26
   etc/Makefile.in (install): Create $(etcdir)/images/gnus dir.

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

10 files changed, 377 insertions, 96 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index e0e8535186e..c3c7e6fd428 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -101,6 +101,193 @@ document ppt
 Print point, beg, end, narrow, and gap for current buffer.
 end
 
+# Print out iterator given as first arg
+define pitx
+  set $it = $arg0
+  printf "cur=%d", $it->current.pos.charpos
+  if ($it->current.pos.charpos != $it->current.pos.bytepos)
+    printf "[%d]", $it->current.pos.bytepos
+  end
+  printf " start=%d", $it->start.pos.charpos
+  if ($it->start.pos.charpos != $it->start.pos.bytepos)
+    printf "[%d]", $it->start.pos.bytepos
+  end
+  printf " stop=%d ", $it->stop_charpos
+  output $it->what
+  if ($it->what == IT_CHARACTER)
+    if ($it->len == 1 && $it->c >= ' ' && it->c < 255)
+      printf "['%c']", $it->c
+    else
+      printf "[%d,%d]", $it->c, $it->len
+    end
+  end
+  printf " next="
+  output $it->method
+  printf "\n"
+  printf "vpos=%d hpos=%d", $it->vpos, $it->hpos,
+  printf " y=%d lvy=%d", $it->current_y, $it->last_visible_y
+  printf " x=%d lvx=%d", $it->current_x, $it->last_visible_x
+  printf " a+d=%d+%d=%d", $it->ascent, $it->descent, $it->ascent+$it->descent
+  printf " max=%d+%d=%d", $it->max_ascent, $it->max_descent, $it->max_ascent+$it->max_descent
+  printf "\n"
+end
+document pitx
+Pretty print a display iterator.
+Take one arg, an iterator object or pointer.
+end
+
+define pit
+  pitx it
+end
+document pit
+Pretty print the display iterator it.
+end
+
+define prowx
+  set $row = $arg0
+  printf "y=%d x=%d pwid=%d", $row->y, $row->x, $row->pixel_width
+  printf " a+d=%d+%d=%d", $row->ascent, $row->height-$row->ascent, $row->height
+  printf " phys=%d+%d=%d", $row->phys_ascent, $row->phys_height-$row->phys_ascent, $row->phys_height
+  printf " vis=%d", $row->visible_height
+  printf "  L=%d T=%d R=%d", $row->used[0], $row->used[1], $row->used[2]
+  printf "\n"
+  printf "start=%d end=%d", $row->start.pos.charpos, $row->end.pos.charpos
+  if ($row->enabled_p)
+    printf " ENA"
+  end
+  if ($row->displays_text_p)
+    printf " DISP"
+  end
+  if ($row->mode_line_p)
+    printf " MODEL"
+  end
+  if ($row->continued_p)
+    printf " CONT"
+  end
+  if ($row-> truncated_on_left_p)
+    printf " TRUNC:L"
+  end
+  if ($row-> truncated_on_right_p)
+    printf " TRUNC:R"
+  end
+  if ($row->starts_in_middle_of_char_p)
+    printf " STARTMID"
+  end
+  if ($row->ends_in_middle_of_char_p)
+    printf " ENDMID"
+  end
+  if ($row->ends_in_newline_from_string_p)
+    printf " ENDNLFS"
+  end
+  if ($row->ends_at_zv_p)
+    printf " ENDZV"
+  end
+  if ($row->overlapped_p)
+    printf " OLAPD"
+  end
+  if ($row->overlapping_p)
+    printf " OLAPNG"
+  end
+  printf "\n"
+end
+document prowx
+Pretty print information about glyph_row.
+Takes one argument, a row object or pointer.
+end
+
+define prow
+  prowx row
+end
+document prow
+Pretty print information about glyph_row in row.
+end
+
+
+define pcursorx
+  set $cp = $arg0
+  printf "y=%d x=%d vpos=%d hpos=%d", $cp->y, $cp->x, $cp->vpos, $cp->hpos
+end
+document pcursorx
+Pretty print a window cursor
+end
+
+define pcursor
+  printf "output: "
+  pcursorx output_cursor
+  printf "\n"
+end
+document pcursor
+Pretty print the output_cursor
+end
+
+define pwinx
+  set $w = $arg0
+  xgetint $w->sequence_number
+  if ($w->mini_p != Qnil)
+    printf "Mini "
+  end
+  printf "Window %d ", $int
+  xgetptr $w->buffer
+  set $tem = (struct buffer *) $ptr
+  xgetptr $tem->name
+  printf "%s", ((struct Lisp_String *) $ptr)->data
+  printf "\n"
+  xgetptr $w->start
+  set $tem = (struct Lisp_Marker *) $ptr
+  printf "start=%d end:", $tem->charpos
+  if ($w->window_end_valid != Qnil)
+    xgetint $w->window_end_pos
+    printf "pos=%d", $int
+    xgetint $w->window_end_vpos
+    printf " vpos=%d", $int
+  else
+    printf "invalid"
+  end
+  printf " vscroll=%d", $w->vscroll
+  if ($w->force_start != Qnil)
+    printf " FORCE_START"
+  end
+  if ($w->must_be_updated_p)
+    printf " MUST_UPD"
+  end
+  printf "\n"
+  printf "cursor: "
+  pcursorx $w->cursor
+  printf "  phys: "
+  pcursorx $w->phys_cursor
+  if ($w->phys_cursor_on_p)
+    printf " ON"
+  else
+    printf " OFF"
+  end
+  printf " blk="
+  if ($w->last_cursor_off_p != $w->cursor_off_p)
+    if ($w->last_cursor_off_p)
+      printf "ON->"
+    else
+      printf "OFF->"
+    end
+  end
+  if ($w->cursor_off_p)
+    printf "ON"
+  else
+    printf "OFF"
+  end
+  printf "\n"
+end
+document pwinx
+Pretty print a window structure.
+Takes one argument, a pointer to a window structure
+end
+
+define pwin
+  pwinx w
+end
+document pwin
+Pretty print window structure w.
+end
+
+
 define xtype
   xgettype $
   output $type
diff --git a/src/ChangeLog b/src/ChangeLog
index 089a3f3a694..d70ccc3d42d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,66 @@
+2005-02-22  Kim F. Storm  <storm@cua.dk>
+
+        * minibuf.c (Ftry_completion, Fall_completions): Allow both string
+        and symbol keys in alists and hash tables.
+
+        * xdisp.c (fast_find_position): Fix search for start of overlay.
+
+2005-02-21  Kim F. Storm  <storm@cua.dk>
+
+        * window.c (window_scroll_pixel_based): When scrolling backwards,
+        handle partial visible line at end of window even when we hit PT.
+
+2005-02-21  Stefan  <monnier@iro.umontreal.ca>
+
+        * keymap.h: Declare Fcurrent_active_maps, used in doc.c.
+
+2005-02-21  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_vertically_backward): Eliminate two xasserts.
+        I think those asserts are bogus if buffer contains invisible text
+        or images.
+
+2005-02-21  David Kastrup <dak@gnu.org>
+
+        * gtkutil.c (xg_create_frame_widgets): UNBLOCK_INPUT on error.
+
+2005-02-20  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (pos_visible_p): Be sure to move to the specified
+        position.  Always get the full ascent / descent of the
+        corresponding row, to return reliable rtop and rbot values.
+        (back_to_previous_visible_line_start): Fix 2005-01-18 change.
+        Must look one character back, as back_to_previous_line_start
+        returns position after the newline.
+        (move_it_vertically_backward): Fix heuristic for when to move further
+        back in case line_height * 2/3 is larger than window height.
+        (cursor_row_fully_visible_p): Rename make_cursor_line_fully_visible_p
+        as it does not do anything anymore.  Add arg current_matrix_p to
+        use current matrix rather than desired matrix when set.
+        (try_cursor_movement): Don't scroll to make cursor row fully
+        visible if cursor didn't move.  This avoids unexpected recentering
+        in case of blinking cursor or accepting process output.
+        Use current matrix to check cursor row visibility.
+        (redisplay_window): Fix whether to recenter or move to top in case
+        cursor line is taller than window height.
+        (find_first_unchanged_at_end_row): Stop search if we reach a row
+        which not enabled (instead of abort).
+
+2005-02-18  Kim F. Storm  <storm@cua.dk>
+
+        * xfaces.c (Finternal_set_lisp_face_attribute): Allow :color property
+        to be nil in a :box attribute value list; customize prints that
+        as lisp value when no box color is specified.
+
+        * .gdbinit (pitx, pit): Pretty print display iterator.
+        (prowx, prow): Pretty print glyph row.
+        (pcursorx, pcursor): Pretty print a window cursor.
+        (pwinx, pwin): Pretty print struct window.
+
+2005-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * alloc.c (BLOCK_BYTES): Harmless typo.
+
 2005-02-17  Andreas Schwab  <schwab@suse.de>
 
         * xfns.c (hack_wm_protocols): Use correct type for last parameter
@@ -811,13 +874,8 @@
         (install_window_handler) [TARGET_API_MAC_CARBON]:
         Register handlers for tracking/receiving drag-and-drop items.
         (do_ae_open_documents): Generate unibyte strings for filenames.
-<<<<<<< ChangeLog
-        (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
-        Reject only non-filename items.  Set event modifiers and return value.
-=======
         (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
         Reject only non-filename items.  Set event modifiers, and return value.
->>>>>>> 1.4187
 
 2004-12-28  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -927,12 +985,7 @@
         (x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window
         if the position is neither user-specified nor program-specified.
         (x_free_frame_resources): Free size_hints.
-<<<<<<< ChangeLog
-        (x_wm_set_size_hint): Allocate size_hints if needed.
-        Set size_hints.
-=======
         (x_wm_set_size_hint): Allocate size_hints if needed.  Set size_hints.
->>>>>>> 1.4187
         (mac_clear_font_name_table): New function.
         (mac_do_list_fonts): Initialize font_name_table if needed.
         (x_list_fonts): Don't initialize font_name_table.  Add BLOCK_INPUT
@@ -984,11 +1037,7 @@
 
 2004-12-27  Richard M. Stallman  <rms@gnu.org>
 
-<<<<<<< ChangeLog
-        * buffer.c (Fbuffer_disable_undo): Delete (moved to simple.el).
-=======
         * buffer.c (Fbuffer_disable_undo): Delete (move to simple.el).
->>>>>>> 1.4187
         (syms_of_buffer): Don't defsubr it.
 
         * process.c (list_processes_1): Set undo_list instead
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 20fc4887084..5e50066bc78 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -3405,7 +3405,7 @@
         (UNISTD_H_INCLUDED): Don't define or test this.
         * m/ibm370aix.h (NEED_UNISTD_H): Defined.
         * s/aix3-1.h (NEED_UNISTD_H): Defined.
-        * s/irix4-0.h (NEED_UNISTD_H): Defined.
+        * s/irix4-0.h (NEED_UNISTD_H): Define.
 
         * fileio.c (internal_delete_file, internal_delete_file_1):
         New functions.
@@ -3419,7 +3419,7 @@
 1994-11-24  Francesco Potorti`  <pot@cnuce.cnr.it>
 
         * m/delta.h (C_SWITCH_MACHINE): -inline-functions removed,
-        because the compiler shipped with R3V7 is not stable.
+        because the compiler shipped with R3V7 is not stable.
 
 1994-11-24  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -3443,7 +3443,7 @@
         (complete_and_exit_1, complete_and_exit_2): New subroutines.
 
         * s/aix4.h: New file.
-        * s/aix3-1.h (AIXHFT): Defined.
+        * s/aix3-1.h (AIXHFT): Define.
         * m/ibmrs6000.h (OBJECTS_MACHINE): Define only if AIXHFT.
 
         * sysdep.c (init_sys_modes): Tes AIXHFT, not AIX.
@@ -6451,7 +6451,7 @@
         Add an unwind protect to restore original buffer and kill the temp.
 
         * sysdep.c (init_system_name): Retry gethostbyname after TRY_AGAIN
-        failure.
+        failure.
 
         * process.c (Fopen_network_stream):
         Retry gethostbyname after TRY_AGAIN failure.
@@ -6477,7 +6477,7 @@
 
         * s/linux.h [emacs]: Include stdio.h.
 
-        * commands.h (unread_command_char): Declared.
+        * commands.h (unread_command_char): Declare.
         * dispnew.c (sit_for): Return immediately if unread events exist.
 
 1994-07-17  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
diff --git a/src/alloc.c b/src/alloc.c
index 2fac07bdf85..70cf2d7b70e 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1,6 +1,6 @@
 /* Storage allocation and gc for GNU Emacs Lisp interpreter.
    Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999,
-      2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+      2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -890,12 +890,13 @@ lisp_free (block)
    On glibc-2.3.2, malloc never tries to align, so a padding of 0 is best.
    posix_memalign on the other hand would ideally prefer a value of 4
    because otherwise, there's 1020 bytes wasted between each ablocks.
-   But testing shows that those 1020 will most of the time be efficiently
-   used by malloc to place other objects, so a value of 0 is still preferable
-   unless you have a lot of cons&floats and virtually nothing else.  */
+   In Emacs, testing shows that those 1020 can most of the time be
+   efficiently used by malloc to place other objects, so a value of 0 can
+   still preferable unless you have a lot of aligned blocks and virtually
+   nothing else.  */
 #define BLOCK_PADDING 0
 #define BLOCK_BYTES \
-  (BLOCK_ALIGN - sizeof (struct aligned_block *) - BLOCK_PADDING)
+  (BLOCK_ALIGN - sizeof (struct ablock *) - BLOCK_PADDING)
 
 /* Internal data structures and constants.  */
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6bf0c25f350..c291b44f5a2 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -584,14 +584,14 @@ xg_resize_widgets (f, pixelwidth, pixelheight)
 {
   int mbheight = FRAME_MENUBAR_HEIGHT (f);
   int tbheight = FRAME_TOOLBAR_HEIGHT (f);
-  int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, (pixelheight 
+  int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, (pixelheight
                                                    - mbheight - tbheight));
   int columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth);
 
   if (FRAME_GTK_WIDGET (f)
-      && (columns != FRAME_COLS (f) 
+      && (columns != FRAME_COLS (f)
           || rows != FRAME_LINES (f)
-          || pixelwidth != FRAME_PIXEL_WIDTH (f) 
+          || pixelwidth != FRAME_PIXEL_WIDTH (f)
           || pixelheight != FRAME_PIXEL_HEIGHT (f)))
     {
       struct x_output *x = f->output_data.x;
@@ -719,6 +719,7 @@ xg_create_frame_widgets (f)
       if (wvbox) gtk_widget_destroy (wvbox);
       if (wfixed) gtk_widget_destroy (wfixed);
 
+      UNBLOCK_INPUT;
       return 0;
     }
 
@@ -2881,7 +2882,7 @@ scroll_bar_button_cb (widget, event, user_data)
       if (xg_timer) xg_stop_timer ();
       bar->dragging = Qnil;
     }
-  
+
   return FALSE;
 }
 
@@ -2945,7 +2946,7 @@ xg_create_scroll_bar (f, bar, scroll_callback, scroll_bar_name)
      event box window.  */
   gtk_fixed_put (GTK_FIXED (f->output_data.x->edit_widget), webox, -1, -1);
   gtk_container_add (GTK_CONTAINER (webox), wscroll);
-  
+
 
   /* Set the cursor to an arrow.  */
   xg_set_cursor (webox, FRAME_X_DISPLAY_INFO (f)->xg_cursor);
@@ -3270,10 +3271,10 @@ xg_tool_bar_item_expose_callback (w, event, client_data)
 
   event->area.x = max (0, event->area.x);
   event->area.y = max (0, event->area.y);
-  
+
   event->area.width = max (width, event->area.width);
   event->area.height = max (height, event->area.height);
-  
+
   return FALSE;
 }
 
@@ -3394,7 +3395,7 @@ update_frame_tool_bar (f)
      DEFAULT_TOOL_BAR_BUTTON_MARGIN has no effect.  */
   hmargin = max (0, hmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN);
   vmargin = max (0, vmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN);
-  
+
   if (! x->toolbar_widget)
     xg_create_tool_bar (f);
 
diff --git a/src/keymap.h b/src/keymap.h
index e50a62c8aa5..bec39186863 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -1,5 +1,5 @@
 /* Functions to manipulate keymaps.
-   Copyright (C) 2001  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -33,6 +33,7 @@ EXFUN (Fkey_binding, 3);
 EXFUN (Fkey_description, 2);
 EXFUN (Fsingle_key_description, 2);
 EXFUN (Fwhere_is_internal, 5);
+EXFUN (Fcurrent_active_maps, 1);
 extern Lisp_Object access_keymap P_ ((Lisp_Object, Lisp_Object, int, int, int));
 extern Lisp_Object get_keyelt P_ ((Lisp_Object, int));
 extern Lisp_Object get_keymap P_ ((Lisp_Object, int, int));
diff --git a/src/minibuf.c b/src/minibuf.c
index e1939339ce8..329070c5cb3 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1181,13 +1181,16 @@ minibuf_conform_representation (string, basis)
 DEFUN ("try-completion", Ftry_completion, Stry_completion, 2, 3, 0,
        doc: /* Return common substring of all completions of STRING in ALIST.
 Each car of each element of ALIST (or each element if it is not a cons cell)
-is tested to see if it begins with STRING.
+is tested to see if it begins with STRING.  The possible matches may be
+strings or symbols.  Symbols are converted to strings before testing,
+see `symbol-name'.
 All that match are compared together; the longest initial sequence
 common to all matches is returned as a string.
 If there is no match at all, nil is returned.
 For a unique match which is exact, t is returned.
 
-If ALIST is a hash-table, all the string keys are the possible matches.
+If ALIST is a hash-table, all the string and symbol keys are the
+possible matches.
 If ALIST is an obarray, the names of all symbols in the obarray
 are the possible matches.
 
@@ -1257,7 +1260,7 @@ is used to further constrain the set of candidates.  */)
           if (!EQ (bucket, zero))
             {
               elt = bucket;
-              eltstring = Fsymbol_name (elt);
+              eltstring = elt;
               if (XSYMBOL (bucket)->next)
                 XSETSYMBOL (bucket, XSYMBOL (bucket)->next);
               else
@@ -1284,6 +1287,9 @@ is used to further constrain the set of candidates.  */)
 
       /* Is this element a possible completion? */
 
+      if (SYMBOLP (eltstring))
+        eltstring = Fsymbol_name (eltstring);
+
       if (STRINGP (eltstring)
           && SCHARS (string) <= SCHARS (eltstring)
           && (tem = Fcompare_strings (eltstring, zero,
@@ -1440,10 +1446,13 @@ is used to further constrain the set of candidates.  */)
 DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 4, 0,
        doc: /* Search for partial matches to STRING in ALIST.
 Each car of each element of ALIST (or each element if it is not a cons cell)
-is tested to see if it begins with STRING.
+is tested to see if it begins with STRING.  The possible matches may be
+strings or symbols.  Symbols are converted to strings before testing,
+see `symbol-name'.
 The value is a list of all the strings from ALIST that match.
 
-If ALIST is a hash-table, all the string keys are the possible matches.
+If ALIST is a hash-table, all the string and symbol keys are the
+possible matches.
 If ALIST is an obarray, the names of all symbols in the obarray
 are the possible matches.
 
@@ -1512,7 +1521,7 @@ are ignored unless STRING itself starts with a space.  */)
           if (!EQ (bucket, zero))
             {
               elt = bucket;
-              eltstring = Fsymbol_name (elt);
+              eltstring = elt;
               if (XSYMBOL (bucket)->next)
                 XSETSYMBOL (bucket, XSYMBOL (bucket)->next);
               else
@@ -1539,6 +1548,9 @@ are ignored unless STRING itself starts with a space.  */)
 
       /* Is this element a possible completion? */
 
+      if (SYMBOLP (eltstring))
+        eltstring = Fsymbol_name (eltstring);
+
       if (STRINGP (eltstring)
           && SCHARS (string) <= SCHARS (eltstring)
           /* If HIDE_SPACES, reject alternatives that start with space
diff --git a/src/window.c b/src/window.c
index 370251882ba..be0f47da8d4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4763,6 +4763,7 @@ window_scroll_pixel_based (window, n, whole, noerror)
   else if (n < 0)
     {
       int charpos, bytepos;
+      int partial_p;
 
       /* Save our position, for the preserve_y case.  */
       charpos = IT_CHARPOS (it);
@@ -4774,7 +4775,20 @@ window_scroll_pixel_based (window, n, whole, noerror)
                   it.last_visible_y - this_scroll_margin - 1, -1,
                   MOVE_TO_POS | MOVE_TO_Y);
 
-      if (IT_CHARPOS (it) == PT)
+      /* Save our position, in case it's correct.  */
+      charpos = IT_CHARPOS (it);
+      bytepos = IT_BYTEPOS (it);
+
+      /* See if point is on a partially visible line at the end.  */
+      if (it.what == IT_EOB)
+        partial_p = it.current_y + it.ascent + it.descent > it.last_visible_y;
+      else
+        {
+          move_it_by_lines (&it, 1, 1);
+          partial_p = it.current_y > it.last_visible_y;
+        }
+
+      if (charpos == PT && !partial_p)
         /* We found PT before we found the display margin, so PT is ok.  */
         ;
       else if (preserve_y >= 0)
@@ -4795,14 +4809,7 @@ window_scroll_pixel_based (window, n, whole, noerror)
         }
       else
         {
-          /* Save our position, in case it's correct.  */
-          charpos = IT_CHARPOS (it);
-          bytepos = IT_BYTEPOS (it);
-
-          /* See if point is on a partially visible line at the end.  */
-          move_it_by_lines (&it, 1, 1);
-
-          if (it.current_y > it.last_visible_y)
+          if (partial_p)
             /* The last line was only partially visible, so back up two
                lines to make sure we're on a fully visible line.  */
             {
diff --git a/src/xdisp.c b/src/xdisp.c
index 9aefcf5c9a5..3d3225a6762 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -866,7 +866,7 @@ static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *,
                                                           Lisp_Object));
 static void extend_face_to_end_of_line P_ ((struct it *));
 static int append_space_for_newline P_ ((struct it *, int));
-static int make_cursor_line_fully_visible P_ ((struct window *, int));
+static int cursor_row_fully_visible_p P_ ((struct window *, int, int));
 static int try_scrolling P_ ((Lisp_Object, int, EMACS_INT, EMACS_INT, int, int));
 static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *));
 static int trailing_whitespace_p P_ ((int));
@@ -1288,8 +1288,8 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
     }
 
   start_display (&it, w, top);
-  move_it_to (&it, charpos, 0, it.last_visible_y, -1,
-              MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
+  move_it_to (&it, charpos, -1, it.last_visible_y, -1,
+              MOVE_TO_POS | MOVE_TO_Y);
 
   /* Note that we may overshoot because of invisible text.  */
   if (IT_CHARPOS (it) >= charpos)
@@ -1313,12 +1313,13 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
             }
         }
     }
-  else if (it.current_y + it.max_ascent + it.max_descent > it.last_visible_y)
+  else
     {
       struct it it2;
 
       it2 = it;
-      move_it_by_lines (&it, 1, 0);
+      if (IT_CHARPOS (it) < ZV && FETCH_BYTE (IT_BYTEPOS (it)) != '\n')
+        move_it_by_lines (&it, 1, 0);
       if (charpos < IT_CHARPOS (it))
         {
           visible_p = 1;
@@ -1329,8 +1330,9 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
               *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);
+                  *rtop = max (0, -it2.current_y);
+                  *rbot = max (0, ((it2.current_y + it2.max_ascent + it2.max_descent)
+                                   - it.last_visible_y));
                 }
             }
         }
@@ -4793,27 +4795,31 @@ back_to_previous_visible_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;
-
-        it2.sp = 0;
-        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;
-          }
-      }
+      if (IT_CHARPOS (*it) > BEGV)
+        {
+          struct it it2 = *it;
+          int pos;
+          int beg, end;
+          Lisp_Object val, overlay;
+
+          pos = --IT_CHARPOS (it2);
+          --IT_BYTEPOS (it2);
+          it2.sp = 0;
+          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;
     }
 
@@ -6424,7 +6430,11 @@ move_it_vertically_backward (it, dy)
          value of nlines is > 0 if continuation lines were involved.  */
       if (nlines > 0)
         move_it_by_lines (it, nlines, 1);
+#if 0
+      /* I think this assert is bogus if buffer contains
+         invisible text or images.  KFS.  */
       xassert (IT_CHARPOS (*it) <= start_pos);
+#endif
     }
   else
     {
@@ -6442,7 +6452,8 @@ move_it_vertically_backward (it, dy)
              a line height of 13 pixels each, recentering with point
              on the bottom line will try to move -39/2 = 19 pixels
              backward.  Try to avoid moving into the first line.  */
-          && it->current_y - target_y > line_height * 2 / 3
+          && (it->current_y - target_y
+              > min (window_box_height (it->w), line_height * 2 / 3))
           && IT_CHARPOS (*it) > BEGV)
         {
           TRACE_MOVE ((stderr, "  not far enough -> move_vert %d\n",
@@ -6472,7 +6483,11 @@ move_it_vertically_backward (it, dy)
               while (target_y >= line_bottom_y (it) && IT_CHARPOS (*it) < ZV);
             }
 
+#if 0
+          /* I think this assert is bogus if buffer contains
+             invisible text or images.  KFS.  */
           xassert (IT_CHARPOS (*it) >= BEGV);
+#endif
         }
     }
 }
@@ -11191,7 +11206,7 @@ run_window_scroll_functions (window, startp)
    as if point had gone off the screen.  */
 
 static int
-make_cursor_line_fully_visible (w, force_p)
+cursor_row_fully_visible_p (w, force_p, current_matrix_p)
      struct window *w;
      int force_p;
 {
@@ -11207,7 +11222,7 @@ make_cursor_line_fully_visible (w, force_p)
   if (w->cursor.vpos < 0)
     return 1;
 
-  matrix = w->desired_matrix;
+  matrix = current_matrix_p ? w->current_matrix : w->desired_matrix;
   row = MATRIX_ROW (matrix, w->cursor.vpos);
 
   /* If the cursor row is not partially visible, there's nothing to do.  */
@@ -11512,7 +11527,7 @@ try_scrolling (window, just_this_one_p, scroll_conservatively,
 
       /* If cursor ends up on a partially visible line,
          treat that as being off the bottom of the screen.  */
-      if (! make_cursor_line_fully_visible (w, extra_scroll_margin_lines <= 1))
+      if (! cursor_row_fully_visible_p (w, extra_scroll_margin_lines <= 1, 0))
         {
           clear_glyph_matrix (w->desired_matrix);
           ++extra_scroll_margin_lines;
@@ -11782,6 +11797,12 @@ try_cursor_movement (window, startp, scroll_step)
                   && CHARPOS (startp) != BEGV)
                 scroll_p = 1;
             }
+          else
+            {
+              /* Cursor did not move.  So don't scroll even if cursor line
+                 is partially visible, as it was so before.  */
+                 rc = CURSOR_MOVEMENT_SUCCESS;
+            }
 
           if (PT < MATRIX_ROW_START_CHARPOS (row)
               || PT > MATRIX_ROW_END_CHARPOS (row))
@@ -11789,7 +11810,8 @@ try_cursor_movement (window, startp, scroll_step)
               /* if PT is not in the glyph row, give up.  */
               rc = CURSOR_MOVEMENT_MUST_SCROLL;
             }
-          else if (MATRIX_ROW_PARTIALLY_VISIBLE_P (w, row)
+          else if (rc != CURSOR_MOVEMENT_SUCCESS
+                   && MATRIX_ROW_PARTIALLY_VISIBLE_P (w, row)
                    && make_cursor_line_fully_visible_p)
             {
               if (PT == MATRIX_ROW_END_CHARPOS (row)
@@ -11808,7 +11830,7 @@ try_cursor_movement (window, startp, scroll_step)
               else
                 {
                   set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
-                  if (!make_cursor_line_fully_visible (w, 0))
+                  if (!cursor_row_fully_visible_p (w, 0, 1))
                     rc = CURSOR_MOVEMENT_MUST_SCROLL;
                   else
                     rc = CURSOR_MOVEMENT_SUCCESS;
@@ -11893,7 +11915,7 @@ redisplay_window (window, just_this_one_p)
   int temp_scroll_step = 0;
   int count = SPECPDL_INDEX ();
   int rc;
-  int centering_position;
+  int centering_position = -1;
   int last_line_misfit = 0;
 
   SET_TEXT_POS (lpoint, PT, PT_BYTE);
@@ -12139,7 +12161,7 @@ redisplay_window (window, just_this_one_p)
           new_vpos = window_box_height (w) / 2;
         }
 
-      if (!make_cursor_line_fully_visible (w, 0))
+      if (!cursor_row_fully_visible_p (w, 0, 0))
         {
           /* Point does appear, but on a line partly visible at end of window.
              Move it back to a fully-visible line.  */
@@ -12276,7 +12298,7 @@ redisplay_window (window, just_this_one_p)
             /* Forget any recorded base line for line number display.  */
             w->base_line_number = Qnil;
 
-          if (!make_cursor_line_fully_visible (w, 1))
+          if (!cursor_row_fully_visible_p (w, 1, 0))
             {
               clear_glyph_matrix (w->desired_matrix);
               last_line_misfit = 1;
@@ -12336,10 +12358,8 @@ redisplay_window (window, just_this_one_p)
   /* Finally, just choose place to start which centers point */
 
  recenter:
-  centering_position = window_box_height (w) / 2;
-
- point_at_top:
-  /* Jump here with centering_position already set to 0.  */
+  if (centering_position < 0)
+    centering_position = window_box_height (w) / 2;
 
 #if GLYPH_DEBUG
   debug_method_add (w, "recenter");
@@ -12436,7 +12456,7 @@ redisplay_window (window, just_this_one_p)
       set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
     }
 
-  if (!make_cursor_line_fully_visible (w, centering_position > 0))
+  if (!cursor_row_fully_visible_p (w, 0, 0))
     {
       /* If vscroll is enabled, disable it and try again.  */
       if (w->vscroll)
@@ -12451,9 +12471,10 @@ redisplay_window (window, just_this_one_p)
          visible, if it can be done.  */
       if (centering_position == 0)
         goto done;
+
       clear_glyph_matrix (w->desired_matrix);
       centering_position = 0;
-      goto point_at_top;
+      goto recenter;
     }
 
  done:
@@ -13238,8 +13259,10 @@ find_first_unchanged_at_end_row (w, delta, delta_bytes)
          starts at a minimum position >= last_unchanged_pos_old.  */
       for (; row > first_text_row; --row)
         {
+          /* This used to abort, but it can happen.
+             It is ok to just stop the search instead here.  KFS.  */
           if (!row->enabled_p || !MATRIX_ROW_DISPLAYS_TEXT_P (row))
-            abort ();
+            break;
 
           if (MATRIX_ROW_START_CHARPOS (row) >= last_unchanged_pos_old)
             row_found = row;
@@ -20901,7 +20924,7 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
      have a STOP object and previous row's end glyph came from STOP.  */
   if (!NILP (stop))
     {
-      struct glyph_row *prev = row-1;
+      struct glyph_row *prev;
       while ((prev = row - 1, prev >= first)
              && MATRIX_ROW_END_CHARPOS (prev) == charpos
              && prev->used[TEXT_AREA] > 0)
@@ -20910,8 +20933,8 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
           glyph = end + prev->used[TEXT_AREA];
           while (--glyph >= end
                  && INTEGERP (glyph->object));
-          if (glyph >= end
-              && !EQ (stop, glyph->object))
+          if (glyph < end
+              || !EQ (stop, glyph->object))
             break;
           row = prev;
         }
diff --git a/src/xfaces.c b/src/xfaces.c
index 29b342a8f1e..d9c2185e767 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4227,7 +4227,7 @@ FRAME 0 means change the face on all frames, and change the default
                 }
               else if (EQ (k, QCcolor))
                 {
-                  if (!STRINGP (v) || SCHARS (v) == 0)
+                  if (!NILP (v) && (!STRINGP (v) || SCHARS (v) == 0))
                     break;
                 }
               else if (EQ (k, QCstyle))