Merged in changes from CVS trunk.

Patches applied:

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

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


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

9 files changed, 75 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8d9d72de9d2..3e6094bbca0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,40 @@
+2004-07-26  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_in_display_line_to): If overflow-newline-into-fringe
+        is enabled, return MOVE_LINE_CONTINUED rather than MOVE_POS_MATCH_OR_ZV
+        if target position is at end of display line but char is not a newline.
+
+2004-07-25  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (coordinates_in_window): Return ON_SCROLL_BAR
+        instead of ON_VERTICAL_BORDER, when on scroll bar.
+        (Fcoordinates_in_window_p): Handle ON_SCROLL_BAR--return nil.
+
+        * dispextern.h (enum window_part): Add ON_SCROLL_BAR.
+
+        * window.c (Fcoordinates_in_window_p):
+        Take account of FRAME_INTERNAL_BORDER_WIDTH.
+
+        * alloc.c (check_cons_list): New function (contents commented out).
+
+2004-07-24  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * xfaces.c (Fcolor_supported_p): Doc fix.
+
+        * frame.c (Fselect_frame, Fset_frame_selected_window)
+        (Fframe_visible_p, Fraise_frame): Doc fixes.
+
 2004-07-24  Richard M. Stallman  <rms@gnu.org>
 
+        * keyboard.h (not_single_kboard_state): Declared.
+
+        * fileio.c (Fwrite_region): Doc fix.
+
+        * window.c (Fwindow_at): Take account of FRAME_INTERNAL_BORDER_WIDTH.
+
+        * abbrev.c (Fexpand_abbrev): Run Qpre_abbrev_expand_hook
+        only when a real abbrev is present.
+
         * xfns.c (x_icon_verify): New function.
         (Fx_create_frame): Use it.
 
diff --git a/src/abbrev.c b/src/abbrev.c
index ac132f20023..37ab640ee43 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -248,8 +248,6 @@ Returns the abbrev symbol, if expansion took place.  */)
 
   value = Qnil;
 
-  Frun_hooks (1, &Qpre_abbrev_expand_hook);
-
   wordstart = 0;
   if (!(BUFFERP (Vabbrev_start_location_buffer)
         && XBUFFER (Vabbrev_start_location_buffer) == current_buffer))
@@ -326,6 +324,8 @@ Returns the abbrev symbol, if expansion took place.  */)
   if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym)))
     return value;
 
+  Frun_hooks (1, &Qpre_abbrev_expand_hook);
+
   if (INTERACTIVE && !EQ (minibuf_window, selected_window))
     {
       /* Add an undo boundary, in case we are doing this for
diff --git a/src/alloc.c b/src/alloc.c
index 955f274c270..e1fadc155f6 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2396,6 +2396,17 @@ DEFUN ("cons", Fcons, Scons, 2, 2, 0,
   return val;
 }
 
+/* Get an error now if there's any junk in the cons free list.  */
+void
+check_cons_list ()
+{
+  struct Lisp_Cons *tail = cons_free_list;
+
+#if 0
+  while (tail)
+    tail = *(struct Lisp_Cons **)&tail->cdr;
+#endif
+}
 
 /* Make a list of 2, 3, 4 or 5 specified objects.  */
 
diff --git a/src/dispextern.h b/src/dispextern.h
index c438ad0f9dd..5f293219328 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -99,7 +99,8 @@ enum window_part
   ON_LEFT_FRINGE,
   ON_RIGHT_FRINGE,
   ON_LEFT_MARGIN,
-  ON_RIGHT_MARGIN
+  ON_RIGHT_MARGIN,
+  ON_SCROLL_BAR
 };
 
 /* Number of bits allocated to store fringe bitmap numbers.  */
diff --git a/src/fileio.c b/src/fileio.c
index f81566a7656..a05d7689c12 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4868,7 +4868,7 @@ instead of any buffer contents; END is ignored.
 Optional fourth argument APPEND if non-nil means
   append to existing file contents (if any).  If it is an integer,
   seek to that offset in the file before writing.
-Optional fifth argument VISIT if t means
+Optional fifth argument VISIT, if t or a string, means
   set the last-save-file-modtime of buffer to this file's modtime
   and mark buffer not modified.
 If VISIT is a string, it is a second file name;
diff --git a/src/keyboard.h b/src/keyboard.h
index 3f38b7ded6b..c079994ca9a 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -307,6 +307,7 @@ extern void echo_now P_ ((void));
 extern void init_kboard P_ ((KBOARD *));
 extern void delete_kboard P_ ((KBOARD *));
 extern void single_kboard_state P_ ((void));
+extern void not_single_kboard_state P_ ((KBOARD *));
 extern void push_frame_kboard P_ ((struct frame *));
 extern void pop_frame_kboard P_ ((void));
 extern void record_asynch_buffer_change P_ ((void));
diff --git a/src/window.c b/src/window.c
index 2ab9957153f..5edabc510be 100644
--- a/src/window.c
+++ b/src/window.c
@@ -581,6 +581,8 @@ display margins, fringes, header line, and/or mode line.  */)
    if it is on the window's modeline, return ON_MODE_LINE;
    if it is on the border between the window and its right sibling,
       return ON_VERTICAL_BORDER.
+   if it is on a scroll bar,
+      return ON_SCROLL_BAR.
    if it is on the window's top line, return ON_HEADER_LINE;
    if it is in left or right fringe of the window,
       return ON_LEFT_FRINGE or ON_RIGHT_FRINGE, and convert *X and *Y
@@ -675,7 +677,7 @@ coordinates_in_window (w, x, y)
 
   /* Outside any interesting column?  */
   if (*x < left_x || *x > right_x)
-    return ON_VERTICAL_BORDER;
+    return ON_SCROLL_BAR;
 
   lmargin_width = window_box_width (w, LEFT_MARGIN_AREA);
   rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA);
@@ -785,8 +787,8 @@ If they are in the windows's left or right marginal areas, `left-margin'\n\
   ly = Fcdr (coordinates);
   CHECK_NUMBER_OR_FLOAT (lx);
   CHECK_NUMBER_OR_FLOAT (ly);
-  x = FRAME_PIXEL_X_FROM_CANON_X (f, lx);
-  y = FRAME_PIXEL_Y_FROM_CANON_Y (f, ly);
+  x = FRAME_PIXEL_X_FROM_CANON_X (f, lx) + FRAME_INTERNAL_BORDER_WIDTH (f);
+  y = FRAME_PIXEL_Y_FROM_CANON_Y (f, ly) + FRAME_INTERNAL_BORDER_WIDTH (f);
 
   switch (coordinates_in_window (w, &x, &y))
     {
@@ -820,6 +822,10 @@ If they are in the windows's left or right marginal areas, `left-margin'\n\
     case ON_RIGHT_MARGIN:
       return Qright_margin;
 
+    case ON_SCROLL_BAR:
+      /* Historically we are supposed to return nil in this case.  */
+      return Qnil;
+
     default:
       abort ();
     }
@@ -940,8 +946,10 @@ column 0.  */)
   CHECK_NUMBER_OR_FLOAT (y);
 
   return window_from_coordinates (f,
-                                  FRAME_PIXEL_X_FROM_CANON_X (f, x),
-                                  FRAME_PIXEL_Y_FROM_CANON_Y (f, y),
+                                  (FRAME_PIXEL_X_FROM_CANON_X (f, x)
+                                   + FRAME_INTERNAL_BORDER_WIDTH (f)),
+                                  (FRAME_PIXEL_Y_FROM_CANON_Y (f, y)
+                                   + FRAME_INTERNAL_BORDER_WIDTH (f)),
                                   0, 0, 0, 0);
 }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 02f020ed57a..818e2c1a48a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5734,12 +5734,19 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
 #ifdef HAVE_WINDOW_SYSTEM
                           if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
                             {
-                              if (!get_next_display_element (it)
-                                  || BUFFER_POS_REACHED_P ())
+                              if (!get_next_display_element (it))
                                 {
                                   result = MOVE_POS_MATCH_OR_ZV;
                                   break;
                                 }
+                              if (BUFFER_POS_REACHED_P ())
+                                {
+                                  if (ITERATOR_AT_END_OF_LINE_P (it))
+                                    result = MOVE_POS_MATCH_OR_ZV;
+                                  else
+                                    result = MOVE_LINE_CONTINUED;
+                                  break;
+                                }
                               if (ITERATOR_AT_END_OF_LINE_P (it))
                                 {
                                   result = MOVE_NEWLINE_OR_CR;
diff --git a/src/xfaces.c b/src/xfaces.c
index ce40e053b20..f664249a290 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1547,6 +1547,7 @@ DEFUN ("color-supported-p", Fcolor_supported_p,
        Scolor_supported_p, 1, 3, 0,
        doc: /* Return non-nil if COLOR can be displayed on FRAME.
 BACKGROUND-P non-nil means COLOR is used as a background.
+Otherwise, this function tells whether it can be used as a foreground.
 If FRAME is nil or omitted, use the selected frame.
 COLOR must be a valid color name.  */)
      (color, frame, background_p)