Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-296
   Allow restarting an existing debugger session that's exited

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

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


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

9 files changed, 67 insertions, 46 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5168e9126e1..fad84ff38f5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,41 @@
+2004-05-10  Andreas Schwab  <schwab@suse.de>
+
+        * lisp.h: Declare Fmake_symbolic_link.
+
+        * fileio.c (Frename_file): Remove extra argument in call to
+        Fmake_symbolic_link.
+
+2004-05-10  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (calc_line_height_property): Use string position when
+        object is a string.
+
+2004-05-10  Kenichi Handa  <handa@m17n.org>
+
+        * print.c (temp_output_buffer_setup): Bind inhibit-read-only and
+        inhibit-modification-hooks to t temporarily before calling
+        Ferase_buffer.
+
+        * xfns.c (x_create_tip_frame): Bind inhibit-read-only and
+        inhibit-modification-hooks to t temporarily before calling
+        Ferase_buffer.
+
+        * w32fns.c (x_create_tip_frame): Bind inhibit-read-only and
+        inhibit-modification-hooks to t temporarily before calling
+        Ferase_buffer.
+
+        * fns.c (count_combining): Delete it.
+        (concat): Don't check combining bytes.
+
+2004-05-09  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (Vw32_ansi_code_page): New Lisp variable.
+        (globals_of_w32fns): Set it.
+
+2004-05-09  Piet van Oostrum  <piet@cs.uu.nl>  (tiny change)
+
+        * data.c (Fquo): Simplify.
+
 2004-05-08  Peter Whaite  <emacs@whaite.ca>  (tiny change)
 
         * data.c (Fquo): If any argument is float, do the computation in
diff --git a/src/data.c b/src/data.c
index 1a66e52632a..992aac66476 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2699,9 +2699,7 @@ usage: (/ DIVIDEND DIVISOR &rest DIVISORS)  */)
      Lisp_Object *args;
 {
   int argnum;
-  if (nargs == 2)
-    return arith_driver (Adiv, nargs, args);
-  for (argnum = 0; argnum < nargs; argnum++)
+  for (argnum = 2; argnum < nargs; argnum++)
     if (FLOATP (args[argnum]))
       return float_arith_driver (0, 0, Adiv, nargs, args);
   return arith_driver (Adiv, nargs, args);
diff --git a/src/fileio.c b/src/fileio.c
index bd84ce6121b..6be8cbe18f6 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1,5 +1,5 @@
 /* File IO for GNU Emacs.
-   Copyright (C) 1985,86,87,88,93,94,95,96,97,98,99,2000,01,2003
+   Copyright (C) 1985,86,87,88,93,94,95,96,97,98,99,2000,01,03,2004
      Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -2731,7 +2731,7 @@ This is what happens in interactive use with M-x.  */)
           symlink_target = Ffile_symlink_p (file);
           if (! NILP (symlink_target))
             Fmake_symbolic_link (symlink_target, newname,
-                                 NILP (ok_if_already_exists) ? Qnil : Qt, Qt);
+                                 NILP (ok_if_already_exists) ? Qnil : Qt);
           else
 #endif
             Fcopy_file (file, newname,
diff --git a/src/fns.c b/src/fns.c
index 1dbb9fb7c33..6001d99fb49 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -527,27 +527,6 @@ with the original. */)
   return concat (1, &arg, CONSP (arg) ? Lisp_Cons : XTYPE (arg), 0);
 }
 
-/* In string STR of length LEN, see if bytes before STR[I] combine
-   with bytes after STR[I] to form a single character.  If so, return
-   the number of bytes after STR[I] which combine in this way.
-   Otherwize, return 0.  */
-
-static int
-count_combining (str, len, i)
-     unsigned char *str;
-     int len, i;
-{
-  int j = i - 1, bytes;
-
-  if (i == 0 || i == len || CHAR_HEAD_P (str[i]))
-    return 0;
-  while (j >= 0 && !CHAR_HEAD_P (str[j])) j--;
-  if (j < 0 || ! BASE_LEADING_CODE_P (str[j]))
-    return 0;
-  PARSE_MULTIBYTE_SEQ (str + j, len - j, bytes);
-  return (bytes <= i - j ? 0 : bytes - (i - j));
-}
-
 /* This structure holds information of an argument of `concat' that is
    a string and has text properties to be copied.  */
 struct textprop_rec
@@ -710,25 +689,18 @@ concat (nargs, args, target_type, last_special)
           && STRING_MULTIBYTE (this) == some_multibyte)
         {
           int thislen_byte = SBYTES (this);
-          int combined;
 
           bcopy (SDATA (this), SDATA (val) + toindex_byte,
                  SBYTES (this));
-          combined =  (some_multibyte && toindex_byte > 0
-                       ? count_combining (SDATA (val),
-                                          toindex_byte + thislen_byte,
-                                          toindex_byte)
-                       : 0);
           if (! NULL_INTERVAL_P (STRING_INTERVALS (this)))
             {
               textprops[num_textprops].argnum = argnum;
-              /* We ignore text properties on characters being combined.  */
-              textprops[num_textprops].from = combined;
+              textprops[num_textprops].from = 0;
               textprops[num_textprops++].to = toindex;
             }
           toindex_byte += thislen_byte;
-          toindex += thisleni - combined;
-          STRING_SET_CHARS (val, SCHARS (val) - combined);
+          toindex += thisleni;
+          STRING_SET_CHARS (val, SCHARS (val));
         }
       /* Copy a single-byte string to a multibyte string.  */
       else if (STRINGP (this) && STRINGP (val))
@@ -814,13 +786,7 @@ concat (nargs, args, target_type, last_special)
                                         SDATA (val) + toindex_byte);
                     else
                       SSET (val, toindex_byte++, XINT (elt));
-                    if (some_multibyte
-                        && toindex_byte > 0
-                        && count_combining (SDATA (val),
-                                            toindex_byte, toindex_byte - 1))
-                      STRING_SET_CHARS (val, SCHARS (val) - 1);
-                    else
-                      toindex++;
+                    toindex++;
                   }
                 else
                   /* If we have any multibyte characters,
diff --git a/src/lisp.h b/src/lisp.h
index 7e59c50c3b4..023bedaea04 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2743,6 +2743,7 @@ extern void syms_of_fileio P_ ((void));
 EXFUN (Fmake_temp_name, 1);
 extern void init_fileio_once P_ ((void));
 extern Lisp_Object make_temp_name P_ ((Lisp_Object, int));
+EXFUN (Fmake_symbolic_link, 3);
 
 /* Defined in abbrev.c */
 
diff --git a/src/print.c b/src/print.c
index 7548bc75661..e729b468fd1 100644
--- a/src/print.c
+++ b/src/print.c
@@ -601,6 +601,8 @@ temp_output_buffer_setup (bufname)
   eassert (current_buffer->overlays_after == NULL);
   current_buffer->enable_multibyte_characters
     = buffer_defaults.enable_multibyte_characters;
+  specbind (Qinhibit_read_only, Qt);
+  specbind (Qinhibit_modification_hooks, Qt);
   Ferase_buffer ();
   XSETBUFFER (buf, current_buffer);
 
diff --git a/src/w32fns.c b/src/w32fns.c
index f9a81a19992..fc40f5f68da 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -234,6 +234,9 @@ Lisp_Object Qw32_charset_mac;
 Lisp_Object Qw32_charset_unicode;
 #endif
 
+/* The ANSI codepage.  */
+Lisp_Object Vw32_ansi_code_page;
+
 /* Prefix for system colors.  */
 #define SYSTEM_COLOR_PREFIX "System"
 #define SYSTEM_COLOR_PREFIX_LEN (sizeof (SYSTEM_COLOR_PREFIX) - 1)
@@ -7112,6 +7115,8 @@ x_create_tip_frame (dpyinfo, parms, text)
   old_buffer = current_buffer;
   set_buffer_internal_1 (XBUFFER (buffer));
   current_buffer->truncate_lines = Qnil;
+  specbind (Qinhibit_read_only, Qt);
+  specbind (Qinhibit_modification_hooks, Qt);
   Ferase_buffer ();
   Finsert (1, &text);
   set_buffer_internal_1 (old_buffer);
@@ -8793,6 +8798,11 @@ void globals_of_w32fns ()
   /* ditto for GetClipboardSequenceNumber.  */
   clipboard_sequence_fn = (ClipboardSequence_Proc)
     GetProcAddress (user32_lib, "GetClipboardSequenceNumber");
+
+  DEFVAR_INT ("w32-ansi-code-page",
+              &Vw32_ansi_code_page,
+              doc: /* The ANSI code page used by the system.  */);
+  XSETINT (Vw32_ansi_code_page, GetACP ());
 }
 
 #undef abort
diff --git a/src/xdisp.c b/src/xdisp.c
index 83857e5bb84..7f5b38e550b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18528,12 +18528,16 @@ calc_line_height_property (it, prop, font, boff, total)
      XFontStruct *font;
      int boff, *total;
 {
-  Lisp_Object val;
+  Lisp_Object position, val;
   Lisp_Object face_name = Qnil;
   int ascent, descent, height, override;
 
-  val = Fget_char_property (make_number (IT_CHARPOS (*it)),
-                            prop, it->object);
+  if (STRINGP (it->object))
+    position = make_number (IT_STRING_CHARPOS (*it));
+  else
+    position = make_number (IT_CHARPOS (*it));
+
+  val = Fget_char_property (position, prop, it->object);
 
   if (NILP (val))
     return val;
diff --git a/src/xfns.c b/src/xfns.c
index 93de6ee4bfa..3b0b2884246 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4447,6 +4447,8 @@ x_create_tip_frame (dpyinfo, parms, text)
   old_buffer = current_buffer;
   set_buffer_internal_1 (XBUFFER (buffer));
   current_buffer->truncate_lines = Qnil;
+  specbind (Qinhibit_read_only, Qt);
+  specbind (Qinhibit_modification_hooks, Qt);
   Ferase_buffer ();
   Finsert (1, &text);
   set_buffer_internal_1 (old_buffer);