Merged from miles@gnu.org--gnu-2005 (patch 27, 120-125)

Patches applied:

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

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

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

 * 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/emacs--cvs-trunk--0--patch-125
   Update from CVS

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

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

5 files changed, 57 insertions, 21 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4cd7ef4f373..23074668343 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2005-02-23  Lute Kamstra  <lute@gnu.org>
+
+        * buffer.c (Foverlay_buffer): Doc fix.
+
+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.
diff --git a/src/buffer.c b/src/buffer.c
index ae390ba7500..3394e1dead2 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,6 +1,6 @@
 /* Buffer manipulation primitives for GNU Emacs.
-   Copyright (C) 1985,86,87,88,89,93,94,95,97,98, 1999, 2000, 2001, 02, 03, 2004
-        Free Software Foundation, Inc.
+   Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99, 
+     2000, 01, 02, 03, 04, 2005 Free Software Foundation, Inc. 
 
 This file is part of GNU Emacs.
 
@@ -3830,7 +3830,8 @@ DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0,
 }
 
 DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0,
-       doc: /* Return the buffer OVERLAY belongs to.  */)
+       doc: /* Return the buffer OVERLAY belongs to.
+Return nil if OVERLAY has been deleted.  */)
      (overlay)
        Lisp_Object overlay;
 {
diff --git a/src/minibuf.c b/src/minibuf.c
index 463c083cb5e..b45e804feb5 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1186,13 +1186,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.
 
@@ -1262,7 +1265,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
@@ -1289,6 +1292,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,
@@ -1445,10 +1451,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.
 
@@ -1517,7 +1526,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
@@ -1544,6 +1553,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 f49e6cccbb7..574c348c460 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4765,6 +4765,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);
@@ -4776,7 +4777,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)
@@ -4797,14 +4811,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 c05e57cf7e1..671b20683e8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20776,7 +20776,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)
@@ -20785,8 +20785,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;
         }