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

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0  (patch 129-149)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - (make-text-button): Default button type if not specified
   - quick-install-emacs: Use mkdir --verbose only when requested

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 31-33)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

6 files changed, 102 insertions, 52 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bcde95958dd..eb0a3d0cf3b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,38 @@
+2005-03-02  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (XASSERTS): Define to 0 if not already defined.
+        (xassert) [!XASSERTS]: Define dummy version.
+
+2005-03-02  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (redisplay_window): YABX (yet another bogus xassert).
+        Reported by David Kastrup.
+
+2005-03-01  Ehud Karni  <ehud@unix.mvs.co.il>
+
+        * xdisp.c (get_next_display_element): Fix control and escape
+        glyph from display vector.
+
+2005-03-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (Fposn_at_x_y): Check integerness of X and Y.
+
+2005-02-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_resize_outer_widget): Remove unneeded call to
+        gtk_window_resize and x_wm_set_size_hint.
+
+2005-02-25  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (OVERLAY_STRING_CHUNK_SIZE): Increase from 3 to 16.
+
+        * xdisp.c (init_from_display_pos): Don't read past end of
+        it->overlay_strings array.
+
+2005-02-25  Stephan Stahl <stahl@eos.franken.de>  (tiny change)
+
+        * buffer.c (syms_of_buffer): Fix typo.
+
 2005-02-23  Lute Kamstra  <lute@gnu.org>
 
         * buffer.c (Foverlay_buffer): Doc fix.
@@ -14,7 +49,7 @@
         * 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>
+2005-02-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * keymap.h: Declare Fcurrent_active_maps, used in doc.c.
 
@@ -72,8 +107,7 @@
         (Fx_window_property): Likewise.
 
         * xselect.c (Fx_disown_selection_internal): Use union of struct
-        input_event and struct selection_input_event to avoid aliasing
-        issues.
+        input_event and struct selection_input_event to avoid aliasing issues.
 
         * xterm.c (handle_one_xevent): Use union of struct input_event and
         struct selection_input_event to avoid aliasing issues.
@@ -102,21 +136,20 @@
         clipboard operations and delayed rendering.
 
         Drop last_clipboard_text and related code, keep track of
-        ownership via clipboard_owner instead.  Drop old #if0
-        sections.
+        ownership via clipboard_owner instead.  Drop old #if0 sections.
 
         (DEFAULT_LCID, ANSICP, OEMCP, QUNICODE, QANSICP, QOEMCP)
         (clipboard_owner, modifying_clipboard, cfg_coding_system)
         (cfg_codepage, cfg_lcid, cfg_clipboard_type, current_text)
         (current_coding_system, current_requires_encoding)
-        (current_num_nls, current_clipboard_type, current_lcid): New
-        static variables.
+        (current_num_nls, current_clipboard_type, current_lcid):
+        New static variables.
 
         (convert_to_handle_as_ascii, convert_to_handle_as_coded)
         (render, render_all, run_protected, lisp_error_handler)
         (owner_callback, create_owner, setup_config)
-        (enum_locale_callback, cp_from_locale, coding_from_cp): New
-        local functions.
+        (enum_locale_callback, cp_from_locale, coding_from_cp):
+        New local functions.
 
         (term_w32select, globals_of_w32select): New global functions.
 
@@ -316,8 +349,7 @@
         (casify_region): Fix loop condition, args to replace_range_2, and
         update opoint_byte.
 
-        * insdel.c (replace_range_2): Fix bugs in adjusting markers and
-        point.
+        * insdel.c (replace_range_2): Fix bugs in adjusting markers and point.
 
 2005-02-01  Kim F. Storm  <storm@cua.dk>
 
@@ -10994,9 +11026,9 @@
         These changes were in part based upon suggestions made by Peter
         'Luna' Runestig [peter@runestig.com].
 
-        * w32.c (g_b_init_is_windows_9x, g_b_init_open_process_token,
-        g_b_init_get_token_information, g_b_init_lookup_account_sid,
-        g_b_init_get_sid_identifier_authority ): Add several static
+        * w32.c (g_b_init_is_windows_9x, g_b_init_open_process_token)
+        (g_b_init_get_token_information, g_b_init_lookup_account_sid)
+        (g_b_init_get_sid_identifier_authority ): Add several static
         global variables.
 
         * w32.c (globals_of_w32): New function.  Used to initialize those
diff --git a/src/buffer.c b/src/buffer.c
index be4f4dcae69..224c1bbcdef 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5689,7 +5689,7 @@ arrow bitmaps.
 
 If value is a symbol `left' or `right', both angle and arrow bitmaps
 are displayed in the left or right fringe, resp.  Any other value
-that doesn't look like an alist means displat the angle bitmaps in
+that doesn't look like an alist means display the angle bitmaps in
 the left fringe but no arrows.
 
 You can exercise more precise control by using an alist as the
diff --git a/src/dispextern.h b/src/dispextern.h
index 19f35a744e8..feeae776149 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -119,6 +119,13 @@ enum window_part
 #define GLYPH_DEBUG 0
 #endif
 
+/* If XASSERTS is non-zero, additional consistency checks are activated.
+   Turn it off by defining the macro XASSERTS to zero.  */
+
+#ifndef XASSERTS
+#define XASSERTS 0
+#endif
+
 /* Macros to include code only if GLYPH_DEBUG != 0.  */
 
 #if GLYPH_DEBUG
@@ -127,8 +134,11 @@ enum window_part
 #define IF_DEBUG(X)     (void) 0
 #endif
 
-/* Maybe move this inside the above `#ifdef GLYPH_DEBUG' for release.  */
+#if XASSERTS
 #define xassert(X)      do {if (!(X)) abort ();} while (0)
+#else
+#define xassert(X)      (void) 0
+#endif
 
 /* Macro for displaying traces of redisplay.  If Emacs was compiled
    with GLYPH_DEBUG != 0, the variable trace_redisplay_p can be set to
@@ -1881,7 +1891,7 @@ struct it
 
   /* Vector of overlays to process.  Overlay strings are processed
      OVERLAY_STRING_CHUNK_SIZE at a time.  */
-#define OVERLAY_STRING_CHUNK_SIZE 3
+#define OVERLAY_STRING_CHUNK_SIZE 16
   Lisp_Object overlay_strings[OVERLAY_STRING_CHUNK_SIZE];
 
   /* Total number of overlay strings to process.  This can be >
diff --git a/src/gtkutil.c b/src/gtkutil.c
index c291b44f5a2..6dcba3036c0 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -556,12 +556,6 @@ xg_resize_outer_widget (f, columns, rows)
      int columns;
      int rows;
 {
-  gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-                     FRAME_PIXEL_WIDTH (f), FRAME_TOTAL_PIXEL_HEIGHT (f));
-
-  /* base_height is now changed.  */
-  x_wm_set_size_hint (f, 0, 0);
-
   /* If we are not mapped yet, set geometry once again, as window
      height now have changed.  */
   if (! GTK_WIDGET_MAPPED (FRAME_GTK_OUTER_WIDGET (f)))
diff --git a/src/keyboard.c b/src/keyboard.c
index 32d8a34216b..fbdd768dd3a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1,6 +1,6 @@
 /* Keyboard and mouse input; editor command loop.
-   Copyright (C) 1985,86,87,88,89,93,94,95,96,97,99,2000,01,02,03,04
-     Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997,
+     1999, 2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -10529,6 +10529,9 @@ The `posn-' functions access elements of such lists.  */)
   (x, y, frame_or_window, whole)
      Lisp_Object x, y, frame_or_window, whole;
 {
+  CHECK_NATNUM (x);
+  CHECK_NATNUM (y);
+
   if (NILP (frame_or_window))
     frame_or_window = selected_window;
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 3d3225a6762..463d016381c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2541,7 +2541,10 @@ init_from_display_pos (it, w, pos)
      after-string.  */
   init_iterator (it, w, charpos, bytepos, NULL, DEFAULT_FACE_ID);
 
-  for (i = 0; i < it->n_overlay_strings; ++i)
+  /* This only scans the current chunk -- it should scan all chunks.
+     However, OVERLAY_STRING_CHUNK_SIZE has been increased from 3 in 21.1
+     to 16 in 22.1 to make this a lesser problem.  */
+  for (i = 0; i < it->n_overlay_strings && i < OVERLAY_STRING_CHUNK_SIZE; ++i)
     {
       const char *s = SDATA (it->overlay_strings[i]);
       const char *e = s + SBYTES (it->overlay_strings[i]);
@@ -5178,11 +5181,12 @@ get_next_display_element (it)
                  display.  Then, set IT->dpvec to these glyphs.  */
               GLYPH g;
               int ctl_len;
-              int face_id, lface_id;
+              int face_id, lface_id = 0 ;
               GLYPH escape_glyph;
 
               if (it->c < 128 && it->ctl_arrow_p)
                 {
+                  g = '^';           /* default glyph for Control */
                   /* Set IT->ctl_chars[0] to the glyph for `^'.  */
                   if (it->dp
                       && INTEGERP (DISP_CTRL_GLYPH (it->dp))
@@ -5190,19 +5194,18 @@ get_next_display_element (it)
                     {
                       g = XINT (DISP_CTRL_GLYPH (it->dp));
                       lface_id = FAST_GLYPH_FACE (g);
-                      if (lface_id)
-                        {
-                          g = FAST_GLYPH_CHAR (g);
-                          face_id = merge_faces (it->f, Qt, lface_id,
-                                                 it->face_id);
-                        }
+                    }
+                  if (lface_id)
+                    {
+                       g = FAST_GLYPH_CHAR (g);
+                       face_id = merge_faces (it->f, Qt, lface_id,
+                                              it->face_id);
                     }
                   else
                     {
                       /* Merge the escape-glyph face into the current face.  */
                       face_id = merge_faces (it->f, Qescape_glyph, 0,
                                              it->face_id);
-                      g = '^';
                     }
 
                   XSETINT (it->ctl_chars[0], g);
@@ -5212,25 +5215,25 @@ get_next_display_element (it)
                   goto display_control;
                 }
 
+              escape_glyph = '\\';    /* default for Octal display */
               if (it->dp
                   && INTEGERP (DISP_ESCAPE_GLYPH (it->dp))
                   && GLYPH_CHAR_VALID_P (XFASTINT (DISP_ESCAPE_GLYPH (it->dp))))
                 {
                   escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp));
                   lface_id = FAST_GLYPH_FACE (escape_glyph);
-                  if (lface_id)
-                    {
-                      escape_glyph = FAST_GLYPH_CHAR (escape_glyph);
-                      face_id = merge_faces (it->f, Qt, lface_id,
-                                             it->face_id);
-                    }
+                }
+              if (lface_id)
+                {
+                  escape_glyph = FAST_GLYPH_CHAR (escape_glyph);
+                  face_id = merge_faces (it->f, Qt, lface_id,
+                                         it->face_id);
                 }
               else
                 {
                   /* Merge the escape-glyph face into the current face.  */
                   face_id = merge_faces (it->f, Qescape_glyph, 0,
                                          it->face_id);
-                  escape_glyph = '\\';
                 }
 
               if (it->c == 0xA0 || it->c == 0xAD)
@@ -5947,9 +5950,9 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
   ((op & MOVE_TO_POS) != 0                                      \
    && BUFFERP (it->object)                                      \
    && IT_CHARPOS (*it) >= to_charpos                            \
-   && (it->method == GET_FROM_BUFFER ||                         \
-       (it->method == GET_FROM_DISPLAY_VECTOR &&                \
-        it->dpvec + it->current.dpvec_index + 1 >= it->dpend)))
+   && (it->method == GET_FROM_BUFFER                            \
+       || (it->method == GET_FROM_DISPLAY_VECTOR                \
+           && it->dpvec + it->current.dpvec_index + 1 >= it->dpend)))
 
 
   while (1)
@@ -12386,7 +12389,11 @@ redisplay_window (window, just_this_one_p)
     {
       init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
       move_it_vertically_backward (&it, 0);
+#if 0
+      /* I think this assert is bogus if buffer contains
+         invisible text or images.  KFS.  */
       xassert (IT_CHARPOS (it) <= PT);
+#endif
       it.current_y = 0;
     }
 
@@ -20920,8 +20927,10 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
 
   /* 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.  */
+     equals the start pos of the overlay or interval.
+
+     Move back if we have a STOP object and previous row's
+     end glyph came from STOP.  */
   if (!NILP (stop))
     {
       struct glyph_row *prev;
@@ -20929,11 +20938,11 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
              && 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
+          struct glyph *beg = prev->glyphs[TEXT_AREA];
+          glyph = beg + prev->used[TEXT_AREA];
+          while (--glyph >= beg
                  && INTEGERP (glyph->object));
-          if (glyph < end
+          if (glyph < beg
               || !EQ (stop, glyph->object))
             break;
           row = prev;
@@ -22961,8 +22970,10 @@ Bind this around calls to `message' to let it take effect.  */);
   message_truncate_lines = 0;
 
   DEFVAR_LISP ("menu-bar-update-hook",  &Vmenu_bar_update_hook,
-    doc: /* Normal hook run for clicks on menu bar, before displaying a submenu.
-Can be used to update submenus whose contents should vary.  */);
+    doc: /* Normal hook run to update the menu bar definitions.
+Redisplay runs this hook before it redisplays the menu bar.
+This is used to update submenus such as Buffers,
+whose contents depend on various data.  */);
   Vmenu_bar_update_hook = Qnil;
 
   DEFVAR_BOOL ("inhibit-menubar-update", &inhibit_menubar_update,