Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-26

Merge from emacs--cvs-trunk--0

Patches applied:

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

11 files changed, 143 insertions, 17 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e51cdf554ce..d06be958790 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,49 @@
+2004-07-27  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_in_display_line_to): Check BUFFER_POS_REACHED_P after
+        we have ensured that the glyph fits on the current line (or returned
+        MOVE_LINE_CONTINUED otherwise).
+
+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.
+
 2004-07-22  Barry Fishman <barry_fishman@att.net>  (tiny change)
 
         * s/gnu-linux.h: Use GC_MARK_STACK if __amd64__ is defined.
diff --git a/src/abbrev.c b/src/abbrev.c
index 086a58021fb..7e68011955d 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 0e3e78bbac2..567b8c7a925 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2395,6 +2395,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 11395cb7f00..43ebe5c24d0 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 bbc7d86c429..a22216040f3 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4829,7 +4829,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/frame.c b/src/frame.c
index 41b92e75dbb..d7da02db278 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,5 +1,5 @@
 /* Generic frame functions.
-   Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2003
+   Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2003, 2004
    Free Software Foundation.
 
 This file is part of GNU Emacs.
@@ -733,7 +733,12 @@ DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e",
 Subsequent editing commands apply to its selected window.
 The selection of FRAME lasts until the next time the user does
 something to select a different frame, or until the next time this
-function is called.  */)
+function is called.  If you are using a window system, the previously
+selected frame may be restored as the selected frame after return to
+the command loop, because it still may have the window system's input
+focus.  On a text-only terminal, the next redisplay will display FRAME.
+
+This function returns FRAME, or nil if FRAME has been deleted.  */)
   (frame, no_enter)
     Lisp_Object frame, no_enter;
 {
@@ -861,6 +866,7 @@ If omitted, FRAME defaults to the currently selected frame.  */)
 DEFUN ("set-frame-selected-window", Fset_frame_selected_window,
        Sset_frame_selected_window, 2, 2, 0,
        doc: /* Set the selected window of frame object FRAME to WINDOW.
+Return WINDOW.
 If FRAME is nil, the selected frame is used.
 If FRAME is the selected frame, this makes WINDOW the selected window.  */)
      (frame, window)
@@ -1711,7 +1717,11 @@ DEFUN ("frame-visible-p", Fframe_visible_p, Sframe_visible_p,
        doc: /* Return t if FRAME is now \"visible\" (actually in use for display).
 A frame that is not \"visible\" is not updated and, if it works through
 a window system, it may not show at all.
-Return the symbol `icon' if frame is visible only as an icon.  */)
+Return the symbol `icon' if frame is visible only as an icon.
+
+On a text-only terminal, all frames are considered visible, whether
+they are currently being displayed or not, and this function returns t
+for all frames.  */)
      (frame)
      Lisp_Object frame;
 {
@@ -1751,7 +1761,7 @@ DEFUN ("visible-frame-list", Fvisible_frame_list, Svisible_frame_list,
 
 DEFUN ("raise-frame", Fraise_frame, Sraise_frame, 0, 1, "",
        doc: /* Bring FRAME to the front, so it occludes any frames it overlaps.
-If FRAME is invisible, make it visible.
+If FRAME is invisible or iconified, make it visible.
 If you don't specify a frame, the selected frame is used.
 If Emacs is displaying on an ordinary terminal or some other device which
 doesn't support multiple overlapping frames, this function does nothing.  */)
diff --git a/src/keyboard.h b/src/keyboard.h
index d92f13a5059..4e14257359f 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 1b1cab13e7a..9c94a43c3cd 100644
--- a/src/window.c
+++ b/src/window.c
@@ -579,6 +579,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
@@ -673,7 +675,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);
@@ -783,8 +785,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))
     {
@@ -818,6 +820,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 ();
     }
@@ -938,8 +944,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 3a4ff4d2ac0..463889507e4 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5750,9 +5750,13 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
     {
       int x, i, ascent = 0, descent = 0;
 
-      /* Stop when ZV or TO_CHARPOS reached.  */
+      /* Stop when ZV reached.
+         We used to stop here when TO_CHARPOS reached as well, but that is
+         too soon if this glyph does not fit on this line.  So we handle it
+         explicitly below.  */
       if (!get_next_display_element (it)
-          || BUFFER_POS_REACHED_P ())
+          || (it->truncate_lines_p
+              && BUFFER_POS_REACHED_P ()))
         {
           result = MOVE_POS_MATCH_OR_ZV;
           break;
@@ -5812,6 +5816,8 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
               /* We want to leave anything reaching TO_X to the caller.  */
               if ((op & MOVE_TO_X) && new_x > to_x)
                 {
+                  if (BUFFER_POS_REACHED_P ())
+                    goto buffer_pos_reached;
                   it->current_x = x;
                   result = MOVE_X_REACHED;
                   break;
@@ -5839,12 +5845,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;
@@ -5866,6 +5879,8 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
                   result = MOVE_LINE_CONTINUED;
                   break;
                 }
+              else if (BUFFER_POS_REACHED_P ())
+                goto buffer_pos_reached;
               else if (new_x > it->first_visible_x)
                 {
                   /* Glyph is visible.  Increment number of glyphs that
@@ -5882,6 +5897,15 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
           if (result != MOVE_UNDEFINED)
             break;
         }
+      else if (BUFFER_POS_REACHED_P ())
+        {
+        buffer_pos_reached:
+          it->current_x = x;
+          it->max_ascent = ascent;
+          it->max_descent = descent;
+          result = MOVE_POS_MATCH_OR_ZV;
+          break;
+        }
       else if ((op & MOVE_TO_X) && it->current_x >= to_x)
         {
           /* Stop when TO_X specified and reached.  This check is
diff --git a/src/xfaces.c b/src/xfaces.c
index 6ee06ba5f76..0a81342e96d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1542,6 +1542,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)
diff --git a/src/xfns.c b/src/xfns.c
index cdbce00fe4c..8d182a6788b 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2613,6 +2613,28 @@ x_window (f)
 #endif /* not USE_GTK */
 #endif /* not USE_X_TOOLKIT */
 
+/* Verify that the icon position args for this window are valid.  */
+
+static void
+x_icon_verify (f, parms)
+     struct frame *f;
+     Lisp_Object parms;
+{
+  Lisp_Object icon_x, icon_y;
+
+  /* Set the position of the icon.  Note that twm groups all
+     icons in an icon window.  */
+  icon_x = x_frame_get_and_record_arg (f, parms, Qicon_left, 0, 0, RES_TYPE_NUMBER);
+  icon_y = x_frame_get_and_record_arg (f, parms, Qicon_top, 0, 0, RES_TYPE_NUMBER);
+  if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))
+    {
+      CHECK_NUMBER (icon_x);
+      CHECK_NUMBER (icon_y);
+    }
+  else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound))
+    error ("Both left and top icon corners of icon must be specified");
+}
+
 /* Handle the icon stuff for this window.  Perhaps later we might
    want an x_set_icon_position which can be called interactively as
    well.  */
@@ -3101,6 +3123,8 @@ This function is an internal primitive--use `make-frame' instead.  */)
   tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
   f->no_split = minibuffer_only || EQ (tem, Qt);
 
+  x_icon_verify (f, parms);
+
   /* Create the X widget or window.  */
 #ifdef USE_X_TOOLKIT
   x_window (f, window_prompting, minibuffer_only);