Merged in changes from CVS HEAD

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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


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

8 files changed, 57 insertions, 25 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a1c384ce535..0a1c04c1151 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,28 @@
+2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * doc.c (Fsnarf_documentation): Ignore new file name entries.
+
+2004-04-06  Kim F. Storm  <storm@cua.dk>
+
+        * msdos.c (clear_mouse_face): Only clear mouse highlight if not hidden.
+        (dos_rawgetc): Set mouse_face_hidden after clearing highlight.
+
+        * w32term.c (w32_read_socket): Set mouse_face_hidden after
+        clearing highlight.
+
+        * xdisp.c (clear_mouse_face): Only clear mouse highlight if not hidden.
+
+        * xterm.c (handle_one_xevent): Set mouse_face_hidden after
+        clearing highlight.
+
+        * indent.c (vmotion): Do not reserve one column for continuation
+        marks on window frames.
+
+2004-04-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * charset.h (SINGLE_BYTE_CHAR_P): Fix macro to avoid warnings
+        from GCC.
+
 2004-04-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * .gdbinit-union: Remove.
@@ -120,7 +145,7 @@
 
         * xfns.c (x_find_image_file): Remove prototype.
 
-2004-03-13  Eli Zaretskii  <eliz@elta.co.il>
+2004-03-13  Eli Zaretskii  <eliz@gnu.org>
 
         * Makefile.in (XMENU_OBJ): Include xmenu.o if HAVE_MENUS is defined.
 
@@ -782,7 +807,7 @@
         * w32term.c (w32_draw_fringe_bitmap): Draw overlaid bitmaps
         correctly over other bitmaps.
 
-2004-02-21  Eli Zaretskii  <eliz@elta.co.il>
+2004-02-21  Eli Zaretskii  <eliz@gnu.org>
 
         * emacs.c (USAGE1): Split into two halves.
         (USAGE2): Second half of the old USAGE1.
@@ -860,7 +885,7 @@
         (read_avail_input): Use it to zero out only those slots in buf[]
         that were used last time we were called.
 
-2004-02-16  Eli Zaretskii  <eliz@elta.co.il>
+2004-02-16  Eli Zaretskii  <eliz@gnu.org>
 
         * Makefile.in (obj): Move fringe.o from here...
         (XOBJ, MAC_OBJ): ...to here.
@@ -1147,7 +1172,7 @@
         if vector_ret_p is true.
         (syms_of_xfns): Sx_send_client_message moved to xselect.c.
 
-2004-02-02  Eli Zaretskii  <eliz@elta.co.il>
+2004-02-02  Eli Zaretskii  <eliz@gnu.org>
 
         * fileio.c (Fcopy_file): If NEWNAME is a directory, expand the
         basename of FILE relative to it, not FILE itself.
@@ -1166,7 +1191,7 @@
         (syms_of_fileio): Adapt the docstring of insert-default-directory
         to the change in Fread_file_name.
 
-2004-01-29  Eli Zaretskii  <eliz@elta.co.il>
+2004-01-29  Eli Zaretskii  <eliz@gnu.org>
 
         * alloca.c [!alloca]: Fix the prototype for xfree.
 
@@ -2241,7 +2266,7 @@
         * fontset.c (Finternal_char_font): Change return value to
         cons (FONT-NAME . GLYPH-CODE).
 
-2003-09-28  Eli Zaretskii  <eliz@elta.co.il>
+2003-09-28  Eli Zaretskii  <eliz@gnu.org>
 
         * term.c (tty_setup_colors): Treat any negative argument as -1.
 
@@ -2273,7 +2298,7 @@
 
         * process.c (Fnetwork_interface_info): Use HAVE_STRUCT_IFREQ... macros.
 
-2003-09-22  Eli Zaretskii  <eliz@elta.co.il>
+2003-09-22  Eli Zaretskii  <eliz@gnu.org>
 
         * term.c (set_tty_color_mode): Use INTEGERP to test whether a
         color mode is an integer number (it could be -1).
@@ -2405,7 +2430,7 @@
         * alloc.c: Use long instead of int when casting ABLOCKS_BUSY to
         avoid warning.
 
-2003-09-07  Eli Zaretskii  <eliz@elta.co.il>
+2003-09-07  Eli Zaretskii  <eliz@gnu.org>
 
         * editfns.c (region_limit): Support any non-zero value of BEGINNINGP.
 
@@ -2492,7 +2517,7 @@
         * xfns.c (Vgtk_version_string): New variable.
         (syms_of_xfns): DEFVAR_LISP it.  Provide gtk.
 
-2003-08-24  Eli Zaretskii  <eliz@elta.co.il>
+2003-08-24  Eli Zaretskii  <eliz@gnu.org>
 
         * term.c (term_init): Remove `const' from buffer_size's declaration.
 
diff --git a/src/charset.h b/src/charset.h
index 3a4eb5cbfcc..b49ed87a3ab 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -216,7 +216,7 @@ extern int charset_big5_2;	/* Big5 Level 2 (Chinese Traditional) */
 #define MAX_CHAR (0x1F << 14)
 
 /* 1 if C is a single byte character, else 0.  */
-#define SINGLE_BYTE_CHAR_P(c) ((unsigned) (c) < 0x100)
+#define SINGLE_BYTE_CHAR_P(c) (((unsigned)(c) & 0xFF) == (c))
 
 /* 1 if BYTE is an ASCII character in itself, in multibyte mode.  */
 #define ASCII_BYTE_P(byte) ((byte) < 0x80)
@@ -535,7 +535,7 @@ extern int iso_charset_table[2][2][128];
 
 #define CHAR_STRING(c, str)                                               \
   (SINGLE_BYTE_CHAR_P (c)                                                 \
-   ? ((ASCII_BYTE_P (c) || c >= 0xA0)                                     \
+   ? ((ASCII_BYTE_P (c) || c >= 0xA0)                     \
       ? (*(str) = (unsigned char)(c), 1)                                  \
       : (*(str) = LEADING_CODE_8_BIT_CONTROL, *((str)+ 1) = c + 0x20, 2)) \
    : char_to_string (c, (unsigned char *) str))
diff --git a/src/doc.c b/src/doc.c
index 930afc88e23..d4d749ab585 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -1,5 +1,6 @@
 /* Record indices of function doc strings stored in a file.
-   Copyright (C) 1985, 86,93,94,95,97,98,99, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1985, 86,93,94,95,97,98,99,2000,04
+             Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -612,8 +613,7 @@ the same file name is found in the `data-directory'.  */)
         *p = '_';
       p++;
     }
-#endif /* not VMS4_4 */
-#ifdef VMS4_4
+#else /* VMS4_4 */
   strcpy (name, sys_translate_unix (name));
 #endif /* VMS4_4 */
 #endif /* VMS */
@@ -660,6 +660,9 @@ the same file name is found in the `data-directory'.  */)
               else if (p[1] == 'F')
                 store_function_docstring (sym, pos + end + 1 - buf);
 
+              else if (p[1] == 'S')
+                ; /* Just a source file name boundary marker.  Ignore it.  */
+
               else
                 error ("DOC file invalid at position %d", pos);
             }
diff --git a/src/indent.c b/src/indent.c
index 32efcbd0cc7..99422698d51 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1838,9 +1838,7 @@ vmotion (from, vtarget, w)
      register int from, vtarget;
      struct window *w;
 {
-  /* We don't need to make room for continuation marks (we have fringes now),
-     so hould we really subtract 1 here if FRAME_WINDOW_P ?  ++KFS  */
-  int width = window_box_text_cols (w) - 1;
+  int width = window_box_text_cols (w);
   int hscroll = XINT (w->hscroll);
   struct position pos;
   /* vpos is cumulative vertical position, changed as from is changed */
@@ -1861,6 +1859,12 @@ vmotion (from, vtarget, w)
 
   XSETWINDOW (window, w);
 
+  /* We must make room for continuation marks if we don't have fringes.  */
+#ifdef HAVE_WINDOW_SYSTEM
+  if (!FRAME_WINDOW_P (XFRAME (w->frame)))
+#endif
+    width -= 1;
+
   /* If the window contains this buffer, use it for getting text properties.
      Otherwise use the current buffer as arg for doing that.  */
   if (EQ (w->buffer, Fcurrent_buffer ()))
diff --git a/src/msdos.c b/src/msdos.c
index e73f284fa4d..39d28564890 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1329,7 +1329,7 @@ show_mouse_face (struct display_info *dpyinfo, int hl)
 static void
 clear_mouse_face (struct display_info *dpyinfo)
 {
-  if (! NILP (dpyinfo->mouse_face_window))
+  if (!dpyinfo->mouse_face_hidden && ! NILP (dpyinfo->mouse_face_window))
     show_mouse_face (dpyinfo, 0);
 
   dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
@@ -3131,7 +3131,7 @@ dos_rawgetc ()
   union REGS regs;
   struct display_info *dpyinfo = FRAME_X_DISPLAY_INFO (SELECTED_FRAME());
   EVENT_INIT (event);
-  
+
 #ifndef HAVE_X_WINDOWS
   /* Maybe put the cursor where it should be.  */
   IT_cmgoto (SELECTED_FRAME());
@@ -3342,8 +3342,8 @@ dos_rawgetc ()
 
       if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
         {
-          dpyinfo->mouse_face_hidden = 1;
           clear_mouse_face (dpyinfo);
+          dpyinfo->mouse_face_hidden = 1;
         }
 
       if (code >= 0x100)
diff --git a/src/w32term.c b/src/w32term.c
index 41c188a2414..7f3b6b626de 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4245,8 +4245,8 @@ w32_read_socket (sd, expected, hold_quit)
             {
               if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
                 {
-                  dpyinfo->mouse_face_hidden = 1;
                   clear_mouse_face (dpyinfo);
+                  dpyinfo->mouse_face_hidden = 1;
                 }
 
               if (temp_index == sizeof temp_buffer / sizeof (short))
@@ -4268,8 +4268,8 @@ w32_read_socket (sd, expected, hold_quit)
             {
               if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
                 {
-                  dpyinfo->mouse_face_hidden = 1;
                   clear_mouse_face (dpyinfo);
+                  dpyinfo->mouse_face_hidden = 1;
                 }
 
               if (temp_index == sizeof temp_buffer / sizeof (short))
@@ -4773,7 +4773,7 @@ w32_read_socket (sd, expected, hold_quit)
                   help_echo_object = help_echo_window = Qnil;
                   help_echo_pos = -1;
                 }
-              
+
               any_help_event_p = 1;
               gen_help_event (help_echo_string, frame, help_echo_window,
                               help_echo_object, help_echo_pos);
diff --git a/src/xdisp.c b/src/xdisp.c
index d5e49f744cf..0f5cde82cbd 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19831,7 +19831,7 @@ clear_mouse_face (dpyinfo)
 {
   int cleared = 0;
 
-  if (!NILP (dpyinfo->mouse_face_window))
+  if (!dpyinfo->mouse_face_hidden && !NILP (dpyinfo->mouse_face_window))
     {
       show_mouse_face (dpyinfo, DRAW_NORMAL_TEXT);
       cleared = 1;
diff --git a/src/xterm.c b/src/xterm.c
index fe1dca7fd71..350c68ca20f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6198,8 +6198,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
 
       if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
         {
-          dpyinfo->mouse_face_hidden = 1;
           clear_mouse_face (dpyinfo);
+          dpyinfo->mouse_face_hidden = 1;
         }
 
 #if defined USE_MOTIF && defined USE_TOOLKIT_SCROLL_BARS