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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 223-227)

   - Update from CVS

9 files changed, 140 insertions, 46 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c3f13e624a8..a7c0dfdb8fa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,56 @@
+2005-04-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * alloc.c (allocate_string_data): Call BLOCK_INPUT before calling
+        mallopt.
+
+        * ralloc.c (r_alloc_init): Ditto.
+
+2005-04-01  Kenichi Handa  <handa@m17n.org>
+
+        * lisp.h (Vascii_upcase_table, Vascii_canon_table,
+        Vascii_eqv_table): Extern them.
+
+        * casetab.c (set_case_table): If standard is nonzero, setup
+        Vascii_upcase_table, Vascii_canon_table, and Vascii_eqv_table.
+
+        * search.c (looking_at_1): Use current_buffer->case_canon_table,
+        not DOWNCASE_TABLE.
+        (string_match_1): Likewise.
+        (fast_c_string_match_ignore_case): Use Vascii_canon_table, not
+        Vascii_downcase_table.
+        (fast_string_match_ignore_case): Likewise.
+        (search_buffer): Fix checking of boyer-moore usability.
+        (boyer_moore): Calculate translate_prev_byte1/2/3 in advance.  No
+        need of tranlating characters in PAT.  Fix calculation of
+        simple_translate.
+
+2005-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xterm.c [HAVE_XAW3D]: Include ThreeD.h for XtNbeNiceToColormap.
+        (x_create_toolkit_scroll_bar): Test XtNbeNiceToColormap before using it.
+        Use XtNtopShadowPixel and XtNbottomShadowPixel.
+        (x_set_toolkit_scroll_bar_thumb): Remove ugly old hack that didn't
+        really work and that breaks with some versions of Xaw3d.
+
+2005-03-31  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (syms_of_coding): Fix previous change.
+
+2005-03-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (search_embedded_absfilename): Fix last change.
+
+2005-03-25  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (syms_of_coding): Suggest to use set-coding-category in
+        the docstring of coding-category-list.
+
+2005-03-31  Kim F. Storm  <storm@cua.dk>
+
+        * keyboard.c (Qmouse_fixup_help_message): New var.
+        (syms_of_keyboard): Intern and staticpro it.
+        (show_help_echo): Apply mouse-fixup-help-message to help string.
+
 2005-03-30  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (display_line): Allow multiple overlay arrows in window.
@@ -15,7 +68,7 @@
 
 2005-03-26  Lennart Borgman  <lennart.borgman.073@student.lu.se>
 
-        * w32term.h (x_output): add focus_state.
+        * w32term.h (x_output): Add focus_state.
 
         * w32term.c (x_focus_changed, w32_detect_focus_change): New functions.
         (w32_read_socket) [WM_SETFOCUS]: Call w32_detect_focus_change.
diff --git a/src/alloc.c b/src/alloc.c
index aacce3041d5..aee09c3f16c 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1933,14 +1933,18 @@ allocate_string_data (s, nchars, nbytes)
          mmap'ed data typically have an address towards the top of the
          address space, which won't fit into an EMACS_INT (at least on
          32-bit systems with the current tagging scheme).  --fx  */
+      BLOCK_INPUT;
       mallopt (M_MMAP_MAX, 0);
+      UNBLOCK_INPUT;
 #endif
 
       b = (struct sblock *) lisp_malloc (size + GC_STRING_EXTRA, MEM_TYPE_NON_LISP);
 
 #ifdef DOUG_LEA_MALLOC
       /* Back to a reasonable maximum of mmap'ed areas. */
+      BLOCK_INPUT;
       mallopt (M_MMAP_MAX, MMAP_MAX_AREAS);
+      UNBLOCK_INPUT;
 #endif
 
       b->next_free = &b->first_data;
diff --git a/src/casetab.c b/src/casetab.c
index 63f29666a50..d0e0e137462 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -161,7 +161,12 @@ set_case_table (table, standard)
   XCHAR_TABLE (canon)->extras[2] = eqv;
 
   if (standard)
-    Vascii_downcase_table = table;
+    {
+      Vascii_downcase_table = table;
+      Vascii_upcase_table = up;
+      Vascii_canon_table = canon;
+      Vascii_eqv_table = eqv;
+    }
   else
     {
       current_buffer->downcase_table = table;
diff --git a/src/coding.c b/src/coding.c
index 6fcb031b432..66430553a84 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -9357,7 +9357,7 @@ associated with each coding-category one by one in this order.  When
 one algorithm agrees with a byte sequence of source text, the coding
 system bound to the corresponding coding-category is selected.
 
-Don't modify this variable directly, but use `set-coding-category'.  */);
+Don't modify this variable directly, but use `set-coding-priority'.  */);
   {
     int i;
 
diff --git a/src/keyboard.c b/src/keyboard.c
index ec68d35cae6..bd3e27c0f1a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -523,6 +523,10 @@ Lisp_Object Qmake_frame_visible;
 Lisp_Object Qselect_window;
 Lisp_Object Qhelp_echo;
 
+#ifdef HAVE_MOUSE
+Lisp_Object Qmouse_fixup_help_message;
+#endif
+
 /* Symbols to denote kinds of events.  */
 Lisp_Object Qfunction_key;
 Lisp_Object Qmouse_click;
@@ -2304,6 +2308,11 @@ show_help_echo (help, window, object, pos, ok_to_overwrite_keystroke_echo)
         return;
     }
 
+#ifdef HAVE_MOUSE
+  if (!noninteractive && STRINGP (help))
+    help = call1 (Qmouse_fixup_help_message, help);
+#endif
+
   if (STRINGP (help) || NILP (help))
     {
       if (!NILP (Vshow_help_function))
@@ -10873,6 +10882,11 @@ syms_of_keyboard ()
   Qmenu_bar = intern ("menu-bar");
   staticpro (&Qmenu_bar);
 
+#ifdef HAVE_MOUSE
+  Qmouse_fixup_help_message = intern ("mouse-fixup-help-message");
+  staticpro (&Qmouse_fixup_help_message);
+#endif
+
   Qabove_handle = intern ("above-handle");
   staticpro (&Qabove_handle);
   Qhandle = intern ("handle");
diff --git a/src/lisp.h b/src/lisp.h
index 160a5cb398b..ca8795fb1e1 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1879,7 +1879,8 @@ extern Lisp_Object case_temp2;
     NATNUMP (case_temp2))                                       \
    ? XFASTINT (case_temp2) : case_temp1)
 
-extern Lisp_Object Vascii_downcase_table;
+extern Lisp_Object Vascii_downcase_table, Vascii_upcase_table;
+extern Lisp_Object Vascii_canon_table, Vascii_eqv_table;
 
 /* Number of bytes of structure consed since last GC.  */
 
diff --git a/src/ralloc.c b/src/ralloc.c
index 75c25258a9d..fd0d62e1977 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 #include "lisp.h"               /* Needed for VALBITS.  */
+#include "blockinput.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -1255,7 +1256,9 @@ r_alloc_init ()
 #endif
 
 #ifdef DOUG_LEA_MALLOC
-    mallopt (M_TOP_PAD, 64 * 4096);
+  BLOCK_INPUT;
+  mallopt (M_TOP_PAD, 64 * 4096);
+  UNBLOCK_INPUT;
 #else
 #ifndef SYSTEM_MALLOC
   /* Give GNU malloc's morecore some hysteresis
diff --git a/src/search.c b/src/search.c
index 30e4be41ca9..fb149c665a9 100644
--- a/src/search.c
+++ b/src/search.c
@@ -259,7 +259,7 @@ looking_at_1 (string, posix)
   CHECK_STRING (string);
   bufp = compile_pattern (string, &search_regs,
                           (!NILP (current_buffer->case_fold_search)
-                           ? DOWNCASE_TABLE : Qnil),
+                           ? current_buffer->case_canon_table : Qnil),
                           posix,
                           !NILP (current_buffer->enable_multibyte_characters));
 
@@ -365,7 +365,7 @@ string_match_1 (regexp, string, start, posix)
 
   bufp = compile_pattern (regexp, &search_regs,
                           (!NILP (current_buffer->case_fold_search)
-                           ? DOWNCASE_TABLE : Qnil),
+                           ? current_buffer->case_canon_table : Qnil),
                           posix,
                           STRING_MULTIBYTE (string));
   immediate_quit = 1;
@@ -465,7 +465,7 @@ fast_c_string_match_ignore_case (regexp, string)
   regexp = string_make_unibyte (regexp);
   re_match_object = Qt;
   bufp = compile_pattern (regexp, 0,
-                          Vascii_downcase_table, 0,
+                          Vascii_canon_table, 0,
                           0);
   immediate_quit = 1;
   val = re_search (bufp, string, len, 0, len, 0);
@@ -482,7 +482,7 @@ fast_string_match_ignore_case (regexp, string)
   int val;
   struct re_pattern_buffer *bufp;
 
-  bufp = compile_pattern (regexp, 0, Vascii_downcase_table,
+  bufp = compile_pattern (regexp, 0, Vascii_canon_table,
                           0, STRING_MULTIBYTE (string));
   immediate_quit = 1;
   re_match_object = string;
@@ -1253,6 +1253,7 @@ search_buffer (string, pos, pos_byte, lim, lim_byte, n,
               if (RE && *base_pat == '\\')
                 {
                   len--;
+                  raw_pattern_size--;
                   base_pat++;
                 }
               c = *base_pat++;
@@ -1487,16 +1488,18 @@ simple_search (n, pat, len, len_byte, trt, pos, pos_byte, lim, lim_byte)
     return n;
 }
 
-/* Do Boyer-Moore search N times for the string PAT,
+/* Do Boyer-Moore search N times for the string BASE_PAT,
    whose length is LEN/LEN_BYTE,
    from buffer position POS/POS_BYTE until LIM/LIM_BYTE.
    DIRECTION says which direction we search in.
    TRT and INVERSE_TRT are translation tables.
+   Characters in PAT are already translated by TRT.
 
-   This kind of search works if all the characters in PAT that have
-   nontrivial translation are the same aside from the last byte.  This
-   makes it possible to translate just the last byte of a character,
-   and do so after just a simple test of the context.
+   This kind of search works if all the characters in BASE_PAT that
+   have nontrivial translation are the same aside from the last byte.
+   This makes it possible to translate just the last byte of a
+   character, and do so after just a simple test of the context.
+   CHARSET_BASE is nonzero iff there is such a non-ASCII character.
 
    If that criterion is not satisfied, do not call this function.  */
 
@@ -1523,8 +1526,13 @@ boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt,
   int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
 
   unsigned char simple_translate[0400];
-  int translate_prev_byte = 0;
-  int translate_anteprev_byte = 0;
+  /* These are set to the preceding bytes of a byte to be translated
+     if charset_base is nonzero.  As the maximum byte length of a
+     multibyte character is 4, we have to check at most three previous
+     bytes.  */
+  int translate_prev_byte1 = 0;
+  int translate_prev_byte2 = 0;
+  int translate_prev_byte3 = 0;
 
 #ifdef C_ALLOCA
   int BM_tab_space[0400];
@@ -1590,6 +1598,23 @@ boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt,
   for (i = 0; i < 0400; i++)
     simple_translate[i] = i;
 
+  if (charset_base)
+    {
+      /* Setup translate_prev_byte1/2/3 from CHARSET_BASE.  Only a
+         byte following them are the target of translation.  */
+      int sample_char = charset_base | 0x20;
+      unsigned char str[MAX_MULTIBYTE_LENGTH];
+      int len = CHAR_STRING (sample_char, str);
+
+      translate_prev_byte1 = str[len - 2];
+      if (len > 2)
+        {
+          translate_prev_byte2 = str[len - 3];
+          if (len > 3)
+            translate_prev_byte3 = str[len - 4];
+        }
+    }
+
   i = 0;
   while (i != infinity)
     {
@@ -1777,9 +1802,13 @@ boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt,
                           || ((cursor == tail_end_ptr
                                || CHAR_HEAD_P (cursor[1]))
                               && (CHAR_HEAD_P (cursor[0])
-                                  || (translate_prev_byte == cursor[-1]
-                                      && (CHAR_HEAD_P (translate_prev_byte)
-                                          || translate_anteprev_byte == cursor[-2])))))
+                                  /* Check if this is the last byte of
+                                     a translable character.  */
+                                  || (translate_prev_byte1 == cursor[-1]
+                                      && (CHAR_HEAD_P (translate_prev_byte1)
+                                          || (translate_prev_byte2 == cursor[-2]
+                                              && (CHAR_HEAD_P (translate_prev_byte2)
+                                                  || (translate_prev_byte3 == cursor[-3]))))))))
                         ch = simple_translate[*cursor];
                       else
                         ch = *cursor;
@@ -1857,9 +1886,13 @@ boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt,
                       || ((ptr == tail_end_ptr
                            || CHAR_HEAD_P (ptr[1]))
                           && (CHAR_HEAD_P (ptr[0])
-                              || (translate_prev_byte == ptr[-1]
-                                  && (CHAR_HEAD_P (translate_prev_byte)
-                                      || translate_anteprev_byte == ptr[-2])))))
+                              /* Check if this is the last byte of a
+                                 translable character.  */
+                              || (translate_prev_byte1 == ptr[-1]
+                                  && (CHAR_HEAD_P (translate_prev_byte1)
+                                      || (translate_prev_byte2 == ptr[-2]
+                                          && (CHAR_HEAD_P (translate_prev_byte2)
+                                              || translate_prev_byte3 == ptr[-3])))))))
                     ch = simple_translate[*ptr];
                   else
                     ch = *ptr;
diff --git a/src/xterm.c b/src/xterm.c
index 3b6d2e18ac6..26af2848f9b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -131,9 +131,7 @@ extern void _XEditResCheckMessages ();
 #ifdef HAVE_XAW3D
 #include <X11/Xaw3d/Simple.h>
 #include <X11/Xaw3d/Scrollbar.h>
-#define ARROW_SCROLLBAR
-#define XAW_ARROW_SCROLLBARS
-#include <X11/Xaw3d/ScrollbarP.h>
+#include <X11/Xaw3d/ThreeD.h>
 #else /* !HAVE_XAW3D */
 #include <X11/Xaw/Simple.h>
 #include <X11/Xaw/Scrollbar.h>
@@ -4553,6 +4551,7 @@ x_create_toolkit_scroll_bar (f, bar)
       f->output_data.x->scroll_bar_bottom_shadow_pixel = pixel;
     }
 
+#ifdef XtNbeNiceToColormap
   /* Tell the toolkit about them.  */
   if (f->output_data.x->scroll_bar_top_shadow_pixel == -1
       || f->output_data.x->scroll_bar_bottom_shadow_pixel == -1)
@@ -4576,16 +4575,17 @@ x_create_toolkit_scroll_bar (f, bar)
       pixel = f->output_data.x->scroll_bar_top_shadow_pixel;
       if (pixel != -1)
         {
-          XtSetArg (av[ac], "topShadowPixel", pixel);
+          XtSetArg (av[ac], XtNtopShadowPixel, pixel);
           ++ac;
         }
       pixel = f->output_data.x->scroll_bar_bottom_shadow_pixel;
       if (pixel != -1)
         {
-          XtSetArg (av[ac], "bottomShadowPixel", pixel);
+          XtSetArg (av[ac], XtNbottomShadowPixel, pixel);
           ++ac;
         }
     }
+#endif
 
   widget = XtCreateWidget (scroll_bar_name, scrollbarWidgetClass,
                            f->output_data.x->edit_widget, av, ac);
@@ -4731,30 +4731,11 @@ x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole)
           XawScrollbarSetThumb (widget, top, shown);
         else
           {
-#ifdef HAVE_XAW3D
-            ScrollbarWidget sb = (ScrollbarWidget) widget;
-            int scroll_mode = 0;
-
-            /* `scroll_mode' only exists with Xaw3d + ARROW_SCROLLBAR.  */
-            if (xaw3d_arrow_scroll)
-              {
-                /* Xaw3d stupidly ignores resize requests while dragging
-                   so we have to make it believe it's not in dragging mode.  */
-                scroll_mode = sb->scrollbar.scroll_mode;
-                if (scroll_mode == 2)
-                  sb->scrollbar.scroll_mode = 0;
-              }
-#endif
             /* Try to make the scrolling a tad smoother.  */
             if (!xaw3d_pick_top)
               shown = min (shown, old_shown);
 
             XawScrollbarSetThumb (widget, top, shown);
-
-#ifdef HAVE_XAW3D
-            if (xaw3d_arrow_scroll && scroll_mode == 2)
-              sb->scrollbar.scroll_mode = scroll_mode;
-#endif
           }
       }
   }