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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 556-561)

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

 * gnus--rel--5.10  (patch 122-124)

   - Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.
   - Update from CVS

10 files changed, 108 insertions, 32 deletions

diff --git a/src/.gitignore b/src/.gitignore
index 48c78a4f3a6..8dbbc9f86b6 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -3,6 +3,7 @@
 *.pdb
 .gdb_history
 Makefile
+makefile
 Makefile.c
 TAGS-LISP
 _gdbinit
diff --git a/src/ChangeLog b/src/ChangeLog
index c827ba7c53a..4012f446f99 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,42 @@
+2005-09-23  Richard M. Stallman  <rms@gnu.org>
+
+        * editfns.c (Fformat): Explicitly test for end of format string
+        and don't use `index'.
+
+2005-09-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * s/aix4-2.h (BROKEN_GET_CURRENT_DIR_NAME): Define
+        BROKEN_GET_CURRENT_DIR_NAME.
+
+        * sysdep.c (get_current_dir_name): Also define if
+        BROKEN_GET_CURRENT_DIR_NAME. 
+
+        * m/ibmrs6000.h: Test for USG5, not USG5_4.
+
+2005-09-22  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (message_dolog): Add warning about GC and Lisp strings.
+        (message2): Fix commentary.  Ok to use alloca'ed memory.
+        Still not ok to use Lisp string data (because of GC).
+        (set_message): Add comment why GC cannot happen.
+
+2005-09-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (xlfdpat_block_match_1): Fix assertion.
+        (init_font_name_table) [TARGET_API_MAC_CARBON]: Don't add style
+        variants for a scalable font multiple times.
+
+2005-09-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * process.c (create_process) [RTU || UNIPLUS || DONT_REOPEN_PTY]:
+        Setup slave tty options before forking.
+
+2005-09-20  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_set_geometry): Do a gtk_window_move if program
+        positions have been set for the frame (as is done for frames in
+        special-display-buffer-names).
+
 2005-09-19  Kim F. Storm  <storm@cua.dk>
 
         * editfns.c (Fformat): Don't scan past end of format string that
diff --git a/src/editfns.c b/src/editfns.c
index 3f33285bcfc..98828352375 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3556,7 +3556,9 @@ usage: (format STRING &rest OBJECTS)  */)
            digits to print after the '.' for floats, or the max.
            number of chars to print from a string.  */
 
-        while (*format && index ("-0# ", *format))
+        while (format != end
+               && (*format == '-' || *format == '0' || *format == '#'
+                   || * format == ' '))
           ++format;
 
         if (*format >= '0' && *format <= '9')
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 3b590e0faed..84ce64beb56 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -554,6 +554,9 @@ xg_set_geometry (f)
     if (!gtk_window_parse_geometry (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
                                     geom_str))
       fprintf (stderr, "Failed to parse: '%s'\n", geom_str);
+  } else if (f->size_hint_flags & PPosition) {
+    gtk_window_move (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+                     f->left_pos, f->top_pos);
   }
 }
 
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 9559f1ae62a..0ff702d090d 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -112,7 +112,7 @@ Boston, MA 02110-1301, USA.  */
 #define OBJECTS_MACHINE hftctl.o
 #endif
 
-#ifndef USG5_4
+#ifndef USG5
 #define C_SWITCH_MACHINE -D_BSD
 #endif
 
diff --git a/src/macterm.c b/src/macterm.c
index d9b533a9b8c..90d6a886db6 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -6293,7 +6293,7 @@ static INLINE int
 xlfdpat_exact_p (pat)
      struct xlfdpat *pat;
 {
-  return (pat)->blocks == NULL;
+  return pat->blocks == NULL;
 }
 
 /* Return the first string in STRING + 0, ..., STRING + START_MAX such
@@ -6311,7 +6311,7 @@ xlfdpat_block_match_1 (blk, string, start_max)
 
   xassert (blk->len > 0);
   xassert (start_max + blk->len <= strlen (string));
-  xassert (blk->pattern[blk->len - 1] != '?');
+  xassert (blk->last_char != '?');
 
   /* See the comments in the function `boyer_moore' (search.c) for the
      use of `infinity'.  */
@@ -6706,28 +6706,29 @@ init_font_name_table ()
         {
           Lisp_Object rest = XCDR (XCDR (text_encoding_info));
 
-          for (; !NILP (rest); rest = XCDR (rest))
-            {
-              char *cs = SDATA (XCAR (rest));
+          if (size > 0 || style == normal)
+            for (; !NILP (rest); rest = XCDR (rest))
+              {
+                char *cs = SDATA (XCAR (rest));
 
-              if (size == 0)
-                {
-                  add_font_name_table_entry (mac_to_x_fontname (name, size,
-                                                                style, cs));
-                  add_font_name_table_entry (mac_to_x_fontname (name, size,
-                                                                italic, cs));
-                  add_font_name_table_entry (mac_to_x_fontname (name, size,
-                                                                bold, cs));
-                  add_font_name_table_entry (mac_to_x_fontname (name, size,
-                                                                italic | bold,
-                                                                cs));
-                }
-              else
-                {
-                  add_font_name_table_entry (mac_to_x_fontname (name, size,
-                                                                style, cs));
-                }
-            }
+                if (size == 0)
+                  {
+                    add_font_name_table_entry (mac_to_x_fontname (name, size,
+                                                                  style, cs));
+                    add_font_name_table_entry (mac_to_x_fontname (name, size,
+                                                                  italic, cs));
+                    add_font_name_table_entry (mac_to_x_fontname (name, size,
+                                                                  bold, cs));
+                    add_font_name_table_entry (mac_to_x_fontname (name, size,
+                                                                  italic | bold,
+                                                                  cs));
+                  }
+                else
+                  {
+                    add_font_name_table_entry (mac_to_x_fontname (name, size,
+                                                                  style, cs));
+                  }
+              }
         }
     }
 
diff --git a/src/process.c b/src/process.c
index a7ef9c36589..5bab9684a7a 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1794,6 +1794,12 @@ create_process (process, new_argv, current_dir)
 #endif
       if (forkin < 0)
         report_file_error ("Opening pty", Qnil);
+#if defined (RTU) || defined (UNIPLUS) || defined (DONT_REOPEN_PTY)
+      /* In the case that vfork is defined as fork, the parent process
+         (Emacs) may send some data before the child process completes
+         tty options setup.  So we setup tty before forking.  */
+      child_setup_tty (forkout);
+#endif /* RTU or UNIPLUS or DONT_REOPEN_PTY */
 #else
       forkin = forkout = -1;
 #endif /* not USG, or USG_SUBTTY_WORKS */
@@ -2078,8 +2084,10 @@ create_process (process, new_argv, current_dir)
 #endif /* SIGCHLD */
 #endif /* !POSIX_SIGNALS */
 
+#if !defined (RTU) && !defined (UNIPLUS) && !defined (DONT_REOPEN_PTY)
         if (pty_flag)
           child_setup_tty (xforkout);
+#endif /* not RTU and not UNIPLUS and not DONT_REOPEN_PTY */
 #ifdef WINDOWSNT
         pid = child_setup (xforkin, xforkout, xforkout,
                            new_argv, 1, current_dir);
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 66b7d322b56..02225a9226f 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -2,5 +2,23 @@
 
 #undef ALIGN_DATA_RELOC
 
+/* On AIX Emacs uses the gmalloc.c malloc implementation.  But given
+   the way this system works, libc functions that return malloced
+   memory use the libc malloc implementation. Calling xfree or
+   xrealloc on the results of such functions results in a crash. 
+
+   One solution for this could be to define SYSTEM_MALLOC here, but
+   that does not currently work on this system.
+
+   It is possible to completely override the malloc implementation on
+   AIX, but that involves putting the malloc functions in a shared
+   library and setting the MALLOCTYPE environment variable to point to
+   tha shared library.
+   
+   Emacs currently calls xrealloc on the results of get_current_dir name,
+   to avoid a crash just use the Emacs implementation for that function.
+*/
+#define BROKEN_GET_CURRENT_DIR_NAME 1
+
 /* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562
    (do not change this comment) */
diff --git a/src/sysdep.c b/src/sysdep.c
index eae493ba453..f70d4b18cff 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -256,7 +256,7 @@ void hft_reset ();
 SIGMASKTYPE sigprocmask_set;
 
 
-#ifndef HAVE_GET_CURRENT_DIR_NAME
+#if !defined (HAVE_GET_CURRENT_DIR_NAME) || defined (BROKEN_GET_CURRENT_DIR_NAME)
 
 /* Return the current working directory.  Returns NULL on errors.
    Any other returned value must be freed with free. This is used
diff --git a/src/xdisp.c b/src/xdisp.c
index 3ae8543144d..dddea77b572 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6856,7 +6856,10 @@ message_log_maybe_newline ()
    terminated with a newline when NLFLAG is non-zero.  MULTIBYTE, if
    nonzero, means interpret the contents of M as multibyte.  This
    function calls low-level routines in order to bypass text property
-   hooks, etc. which might not be safe to run.  */
+   hooks, etc. which might not be safe to run.
+
+   This may GC (insert may run before/after change hooks),
+   so the buffer M must NOT point to a Lisp string.  */
 
 void
 message_dolog (m, nbytes, nlflag, multibyte)
@@ -7068,10 +7071,7 @@ message_log_check_duplicate (prev_bol, prev_bol_byte, this_bol, this_bol_byte)
    out any existing message, and let the mini-buffer text show
    through.
 
-   The buffer M must continue to exist until after the echo area gets
-   cleared or some other message gets displayed there.  This means do
-   not pass text that is stored in a Lisp string; do not pass text in
-   a buffer that was alloca'd.  */
+   This may GC, so the buffer M must NOT point to a Lisp string.  */
 
 void
 message2 (m, nbytes, multibyte)
@@ -8128,7 +8128,11 @@ truncate_message_1 (nchars, a2, a3, a4)
 
    If S is not null, set the message to the first LEN bytes of S.  LEN
    zero means use the whole string.  MULTIBYTE_P non-zero means S is
-   multibyte.  Display the message multibyte in that case.  */
+   multibyte.  Display the message multibyte in that case.
+
+   Doesn't GC, as with_echo_area_buffer binds Qinhibit_modification_hooks
+   to t before calling set_message_1 (which calls insert).
+  */
 
 void
 set_message (s, string, nbytes, multibyte_p)