Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-615
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-46
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-47
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-48
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49
   Add {arch}/=commit-merge-make-log

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50
   {arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes


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

9 files changed, 98 insertions, 44 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a513d0194e..9fedb52f42c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,35 @@
+2004-10-14  Kim F. Storm  <storm@cua.dk>
+
+        * xterm.h: Include Xutil.h after keysym.h to work around bug
+        (incorrectly recognising AltGr key) in some X versions.
+
+2004-10-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (get_keymap): An autoload form is not a keymap.
+
+        * textprop.c (syms_of_textprop): Make `syntax-table' nonsticky.
+
+2004-10-13  Kim F. Storm  <storm@cua.dk>
+
+        * callproc.c (Fcall_process): Simplify handling of display arg.
+        Resume `display_on_the_fly' once a coding system is determined.
+
+        * xdisp.c (redisplay_preserve_echo_area): Fix last change.
+
+2004-10-12  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (redisplay_preserve_echo_area): Flush display in case
+        caller, such as call-process, is not going to poll for input.
+        (calc_line_height_property): Handle case where it->object is nil.
+
+        * xterm.c (x_redisplay_interface): Fix flush_display_optional.
+
+2004-10-12  Kenichi Handa  <handa@m17n.org>
+
+        * xdisp.c (get_next_display_element):
+        If unibyte_display_via_language_environment is zero, display 8-bit
+        chars in octal in unibyte buffer.
+
 2004-10-12  Kim F. Storm  <storm@cua.dk>
 
         * doc.c (Fsubstitute_command_keys): Ignore remappings unless there
@@ -5,22 +37,21 @@
 
 2004-10-11  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * xfns.c (syms_of_xfns): defsubr x-file-dialog for GTK also.
+        * xfns.c (syms_of_xfns): Defsubr x-file-dialog for GTK also.
 
 2004-10-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * macterm.c (x_raise_frame): Add BLOCK_INPUT around SelectWindow
-        (x_lower_frame): Add BLOCK_INPUT around SendBehind
+        * macterm.c (x_raise_frame): Add BLOCK_INPUT around SelectWindow.
+        (x_lower_frame): Add BLOCK_INPUT around SendBehind.
         (make_mac_frame): Add BLOCK_INPUT around the making of a
-        terminal frame
-        (mac_initialize): Add BLOCK_INPUT around carbon initialization
-        * macgui.h (mktime): Use emacs_mktime
+        terminal frame.
+        (mac_initialize): Add BLOCK_INPUT around carbon initialization.
+        * macgui.h (mktime): Use emacs_mktime.
         * macfns.c (Fx_file_dialog): Add BLOCK_INPUT around more code.
         Make a cancel file-open dialog be like C-g.
-        * mac.c (mktime): Use emacs_mktime
-        (Fdo_applescript): Add BLOCK_INPUT around do_applescript
-        (Fmac_paste_function): Add better error handling for carbon
-        cut/paste
+        * mac.c (mktime): Use emacs_mktime.
+        (Fdo_applescript): Add BLOCK_INPUT around do_applescript.
+        (Fmac_paste_function): Add better error handling for carbon cut/paste.
 
 2004-10-10  Kim F. Storm  <storm@cua.dk>
 
@@ -34,12 +65,12 @@
 
 2004-10-08  Steven Tamm  <steventamm@mac.com>
 
-        * config.in (HAVE_MALLOC_MALLOC_H): Regenerate
+        * config.in (HAVE_MALLOC_MALLOC_H): Regenerate.
         * macterm.c (mac_check_for_quit_char): Remove warning for using
-        NULL where 0 should be used
+        NULL where 0 should be used.
         * unexmacosx.c: Use malloc/malloc.h on Tiger instead of
         objc/malloc.h
-        * mac.c: Include time.h for Tiger compatibility
+        * mac.c: Include time.h for Tiger compatibility.
 
 2004-10-07  Kim F. Storm  <storm@cua.dk>
 
@@ -185,8 +216,8 @@
         Change arg to Lisp_Object and fail if not an integer.
         (get_fringe_bitmap_name, resolve_fringe_bitmap)
         (destroy_fringe_bitmap): New functions.
-        (Fdestroy_fringe_bitmap): Change arg to bitmap symbol.  Use
-        destroy_fringe_bitmap.  Remove symbol from Vfringe_bitmaps and
+        (Fdestroy_fringe_bitmap): Change arg to bitmap symbol.
+        Use destroy_fringe_bitmap.  Remove symbol from Vfringe_bitmaps and
         clear its fringe property.
         (init_fringe_bitmap): Use destroy_fringe_bitmap instead of
         Fdestroy_fringe_bitmap.
@@ -211,7 +242,7 @@
 
 2004-09-25  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * config.in: Rebuild
+        * config.in: Rebuild.
 
 2004-09-24  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
@@ -231,7 +262,7 @@
         Handle the case where we reach the old displayed text,
         out of sync with the old line boundary.
 
-2004-09-14  Stefan  <monnier@iro.umontreal.ca>
+2004-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * fileio.c (Finsert_file_contents): Fix case of replacement in a
         narrowed buffer.
@@ -253,7 +284,7 @@
         (Fbyte_code): Remove dead code after `wrong_type_argument'.
 
         * alloc.c (Fgarbage_collect): Mark keyboards, gtk data, and specpdl
-        before doing the mark_stack_check_gcpros since they are not on the stack.
+        before doing the mark_stack_check_gcpros since they're not on the stack.
 
 2004-09-12  Kim F. Storm  <storm@cua.dk>
 
@@ -272,8 +303,7 @@
         blockinput.h.
         (dosfns.o): Depend on blockinput.h, window.h, dispextern.h,
         charset.h, and coding.h
-        (w16select.o): Depend on buffer.h, charset.h, coding.h, and
-        composite.h.
+        (w16select.o): Depend on buffer.h, charset.h, coding.h, and composite.h.
         (term.o): Depend on window.h and keymap.h.
         (abbrev.o): Depend on syntax.h.
         (callint.o): Depend on keymap.h.
@@ -306,8 +336,8 @@
         (lread.o): Depend on $(INTERVALS_SRC), termhooks.h, and coding.h.
         (intervals.o): Depend on keymap.h.
 
-        * msdos.c (msdos_set_cursor_shape, IT_display_cursor): Add
-        debugging print-out to termscript.
+        * msdos.c (msdos_set_cursor_shape, IT_display_cursor):
+        Add debugging print-out to termscript.
 
 2004-09-09  Richard M. Stallman  <rms@gnu.org>
 
@@ -333,8 +363,8 @@
 2004-09-07  Luc Teirlinck  <teirllm@auburn.edu>
 
         * buffer.h (struct buffer): Add auto_save_file_format field.
-        * buffer.c (reset_buffer, init_buffer_once): Handle
-        auto_save_file_format field.
+        * buffer.c (reset_buffer, init_buffer_once):
+        Handle auto_save_file_format field.
         (syms_of_buffer): Add DEFVAR_PER_BUFFER for
         `buffer-auto-save-file-format'.
         * fileio.c: Delete declaration for removed Vauto_save_file_format.
@@ -347,15 +377,15 @@
 
         * w32term.h (AppendMenuW_Proc): Move declaration from w32menu.c.
 
-        * w32fns.c (w32_wnd_proc) [WM_MEASUREITEM, WM_DRAWITEM]: Handle
-        Unicode menu titles.
+        * w32fns.c (w32_wnd_proc) [WM_MEASUREITEM, WM_DRAWITEM]:
+        Handle Unicode menu titles.
 
 2004-09-07  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (set_cursor_from_row): Fix last change.  Only use 'cursor'
         property from text property or overlay strings at point.
 
-2004-09-07  Stefan  <monnier@iro.umontreal.ca>
+2004-09-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * xmenu.c (update_submenu_strings): YAILOM.
         (set_frame_menubar): Make sure last_i is initialized.
@@ -844,7 +874,7 @@
         * w32select.c (Fw32_set_clipboard_data): Update `nbytes' correctly
         after getting a new string by pre-write-conversion.
 
-2004-06-30  Stefan  <monnier@iro.umontreal.ca>
+2004-06-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * xterm.c (x_detect_focus_change): Remove unused var `nr_events'.
         (x_calc_absolute_position): Remove unused var `child'.
diff --git a/src/callproc.c b/src/callproc.c
index effd7ecbb14..5d7447d94f2 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -216,7 +216,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
      int nargs;
      register Lisp_Object *args;
 {
-  Lisp_Object infile, buffer, current_dir, display, path;
+  Lisp_Object infile, buffer, current_dir, path;
+  int display_p;
   int fd[2];
   int filefd;
   register int pid;
@@ -372,7 +373,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     UNGCPRO;
   }
 
-  display = nargs >= 4 ? args[3] : Qnil;
+  display_p = INTERACTIVE && nargs >= 4 && !NILP (args[3]);
 
   filefd = emacs_open (SDATA (infile), O_RDONLY, 0);
   if (filefd < 0)
@@ -747,7 +748,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     int first = 1;
     int total_read = 0;
     int carryover = 0;
-    int display_on_the_fly = !NILP (display) && INTERACTIVE;
+    int display_on_the_fly = display_p;
     struct coding_system saved_coding;
     int pt_orig = PT, pt_byte_orig = PT_BYTE;
     int inserted;
@@ -823,12 +824,15 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
                   {
                     /* We have detected some coding system.  But,
                        there's a possibility that the detection was
-                       done by insufficient data.  So, we give up
-                       displaying on the fly.  */
+                       done by insufficient data.  So, we try the code
+                       detection again with more data.  */
                     xfree (decoding_buf);
                     display_on_the_fly = 0;
                     process_coding = saved_coding;
                     carryover = nread;
+                    /* This is to make the above condition always
+                       fails in the future.  */
+                    saved_coding.type = coding_type_no_conversion;
                     continue;
                   }
 
@@ -929,12 +933,16 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
             bufptr = tempptr;
           }
 
-        if (!NILP (display) && INTERACTIVE)
+        if (display_p)
           {
             if (first)
               prepare_menu_bars ();
             first = 0;
             redisplay_preserve_echo_area (1);
+            /* This variable might have been set to 0 for code
+               detection.  In that case, we set it back to 1 because
+               we should have already detected a coding system.  */
+            display_on_the_fly = 1;
           }
         immediate_quit = 1;
         QUIT;
diff --git a/src/dispextern.h b/src/dispextern.h
index ecdb760e302..166d420d857 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1963,8 +1963,8 @@ struct it
 
   /* Object and position where the current display element came from.
      Object can be a Lisp string in case the current display element
-     comes from an overlay string, or it is buffer.  Position is
-     a position in object.  */
+     comes from an overlay string, or it is buffer.  It may also be nil
+     during mode-line update.  Position is a position in object.  */
   Lisp_Object object;
   struct text_pos position;
 
diff --git a/src/fns.c b/src/fns.c
index 06d04781789..814babae7d8 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2705,6 +2705,9 @@ map_char_table (c_function, function, table, subtable, arg, depth, indices)
      int depth;
 {
   int i, to;
+  struct gcpro gcpro1, gcpro2,  gcpro3, gcpro4;
+
+  GCPRO4 (arg, table, subtable, function);
 
   if (depth == 0)
     {
@@ -2724,7 +2727,10 @@ map_char_table (c_function, function, table, subtable, arg, depth, indices)
 #if 0 /* If the char table has entries for higher characters,
          we should report them.  */
       if (NILP (current_buffer->enable_multibyte_characters))
-        return;
+        {
+          UNGCPRO;
+          return;
+        }
 #endif
       to = CHAR_TABLE_ORDINARY_SLOTS;
     }
@@ -2777,6 +2783,7 @@ map_char_table (c_function, function, table, subtable, arg, depth, indices)
             call2 (function, make_number (c), elt);
         }
     }
+  UNGCPRO;
 }
 
 static void void_call2 P_ ((Lisp_Object a, Lisp_Object b, Lisp_Object c));
diff --git a/src/keymap.c b/src/keymap.c
index 484f08b9077..256485079c1 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -268,7 +268,8 @@ get_keymap (object, error, autoload)
 
       /* Should we do an autoload?  Autoload forms for keymaps have
          Qkeymap as their fifth element.  */
-      if ((autoload || !error) && EQ (XCAR (tem), Qautoload))
+      if ((autoload || !error) && EQ (XCAR (tem), Qautoload)
+          && SYMBOLP (object))
         {
           Lisp_Object tail;
 
diff --git a/src/textprop.c b/src/textprop.c
index c8ec008dcbd..317f8fa6aa3 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1,5 +1,5 @@
 /* Interface code for dealing with text properties.
-   Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -2233,7 +2233,9 @@ If a character in a buffer has PROPERTY, new text inserted adjacent to
 the character doesn't inherit PROPERTY if NONSTICKINESS is non-nil,
 inherits it if NONSTICKINESS is nil.  The front-sticky and
 rear-nonsticky properties of the character overrides NONSTICKINESS.  */);
-  Vtext_property_default_nonsticky = Qnil;
+  /* Text property `syntax-table' should be nonsticky by default.  */
+  Vtext_property_default_nonsticky
+    = Fcons (Fcons (intern ("syntax-table"), Qt), Qnil);
 
   staticpro (&interval_insert_behind_hooks);
   staticpro (&interval_insert_in_front_hooks);
diff --git a/src/xdisp.c b/src/xdisp.c
index 191e0427c66..d69b456cab2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4893,7 +4893,8 @@ get_next_display_element (it)
                            && it->len == 1)
                           || !CHAR_PRINTABLE_P (it->c))
                        : (it->c >= 127
-                          && it->c == unibyte_char_to_multibyte (it->c))))
+                          && (!unibyte_display_via_language_environment
+                              || it->c == unibyte_char_to_multibyte (it->c)))))
             {
               /* IT->c is a control character which must be displayed
                  either as '\003' or as `^C' where the '\\' and '^'
@@ -10402,6 +10403,9 @@ redisplay_preserve_echo_area (from_where)
     }
   else
     redisplay_internal (1);
+
+  if (rif != NULL && rif->flush_display_optional)
+    rif->flush_display_optional (NULL);
 }
 
 
@@ -18694,8 +18698,10 @@ calc_line_height_property (it, prop, font, boff, total)
 
   if (STRINGP (it->object))
     position = make_number (IT_STRING_CHARPOS (*it));
-  else
+  else if (BUFFERP (it->object))
     position = make_number (IT_CHARPOS (*it));
+  else
+    return Qnil;
 
   val = Fget_char_property (position, prop, it->object);
 
diff --git a/src/xterm.c b/src/xterm.c
index db4914bc165..2ce8b7d7759 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10788,7 +10788,7 @@ static struct redisplay_interface x_redisplay_interface =
     x_update_window_end,
     x_cursor_to,
     x_flush,
-#ifndef XFlush
+#ifdef XFlush
     x_flush,
 #else
     0,  /* flush_display_optional */
diff --git a/src/xterm.h b/src/xterm.h
index f0e86f0ecab..53f0081b215 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -21,8 +21,8 @@ Boston, MA 02111-1307, USA.  */
 
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
-#include <X11/Xutil.h>
 #include <X11/keysym.h>
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/Xresource.h>