Merge from emacs--devo--0
authorMiles Bader <miles@gnu.org>
Tue, 3 Oct 2006 05:04:21 +0000 (05:04 +0000)
committerMiles Bader <miles@gnu.org>
Tue, 3 Oct 2006 05:04:21 +0000 (05:04 +0000)
Patches applied:

 * emacs--devo--0  (patch 447-459)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 141-144)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-115

32 files changed:
1  2 
configure
configure.in
etc/NEWS
etc/PROBLEMS
leim/Makefile.in
lisp/ChangeLog
lisp/emacs-lisp/cl-macs.el
lisp/font-lock.el
lisp/gnus/mm-util.el
lisp/isearch.el
lisp/progmodes/sh-script.el
lisp/ps-print.el
lisp/simple.el
lisp/startup.el
lisp/subr.el
lisp/textmodes/ispell.el
lisp/wid-edit.el
src/ChangeLog
src/buffer.c
src/config.in
src/fns.c
src/indent.c
src/keymap.c
src/macterm.c
src/makefile.w32-in
src/minibuf.c
src/regex.c
src/search.c
src/w32fns.c
src/window.c
src/xdisp.c
src/xfns.c

diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc etc/PROBLEMS
Simple merge
Simple merge
diff --cc lisp/ChangeLog
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/isearch.el
Simple merge
Simple merge
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/startup.el
@@@ -779,7 -779,7 +779,8 @@@ or `CVS', and any subdirectory that con
    (custom-reevaluate-setting 'mouse-wheel-up-event)
    (custom-reevaluate-setting 'file-name-shadow-mode)
    (custom-reevaluate-setting 'send-mail-function)
+   (custom-reevaluate-setting 'focus-follows-mouse)
 +  (custom-reevaluate-setting 'global-auto-composition-mode)
  
    ;; Register default TTY colors for the case the terminal hasn't a
    ;; terminal init file.
diff --cc lisp/subr.el
Simple merge
Simple merge
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/buffer.c
Simple merge
diff --cc src/config.in
Simple merge
diff --cc src/fns.c
Simple merge
diff --cc src/indent.c
Simple merge
diff --cc src/keymap.c
Simple merge
diff --cc src/macterm.c
Simple merge
Simple merge
diff --cc src/minibuf.c
Simple merge
diff --cc src/regex.c
@@@ -3989,10 -3915,16 +3989,16 @@@ analyse_first (p, pend, fastmap, multib
          for (j = CHARSET_BITMAP_SIZE (&p[-1]) * BYTEWIDTH - 1, p++;
               j >= 0; j--)
            if (!!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))) ^ not)
-             fastmap[j] = 1;
+             {
+               fastmap[j] = 1;
+ #ifdef emacs
+               if (j >= 0x80 && j < 0xa0)
+                 fastmap[LEADING_CODE_8_BIT_CONTROL] = 1;
+ #endif
+             }
  
          if ((not && multibyte)
 -            /* Any character set can possibly contain a character
 +            /* Any leading code can possibly start a character
                 which doesn't match the specified set of characters.  */
              || (CHARSET_RANGE_TABLE_EXISTS_P (&p[-2])
                  && CHARSET_RANGE_TABLE_BITS (&p[-2]) != 0))
diff --cc src/search.c
@@@ -134,16 -137,48 +134,17 @@@ compile_pattern_1 (cp, pattern, transla
    cp->regexp = Qnil;
    cp->buf.translate = (! NILP (translate) ? translate : make_number (0));
    cp->posix = posix;
 -  cp->buf.multibyte = multibyte;
 +  cp->buf.multibyte = STRING_MULTIBYTE (pattern);
 +  cp->buf.target_multibyte = multibyte;
    cp->whitespace_regexp = Vsearch_spaces_regexp;
    cp->syntax_table = current_buffer->syntax_table;
-   /* Doing BLOCK_INPUT here has the effect that
-      the debugger won't run if an error occurs.
-      Why is BLOCK_INPUT needed here?  */
-   BLOCK_INPUT;
+   /* rms: I think BLOCK_INPUT is not needed here any more,
+      because regex.c defines malloc to call xmalloc.
+      Using BLOCK_INPUT here means the debugger won't run if an error occurs.
+      So let's turn it off.  */
+   /*  BLOCK_INPUT;  */
    old = re_set_syntax (RE_SYNTAX_EMACS
                       | (posix ? 0 : RE_NO_POSIX_BACKTRACKING));
 -
    re_set_whitespace_regexp (NILP (Vsearch_spaces_regexp) ? NULL
                            : SDATA (Vsearch_spaces_regexp));
  
diff --cc src/w32fns.c
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfns.c
Simple merge