Merged in changes from CVS HEAD

Patches applied:

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

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

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

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

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


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

5 files changed, 87 insertions, 31 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 179b7a16a48..020e02cafcf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,38 @@
+2004-02-17  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (fast_find_position): Fix return value of new version;
+        it was inverted compared to the 21.1 version.
+        (get_window_cursor_type): Don't look at glyph if NULL.
+        (display_and_set_cursor): Set glyph to NULL if cursor in fringe.
+
+        * keyboard.c: Rework previous change; it didn't consider that the
+        buf array was allocated on the stack.
+        (prev_read): Remove variable.
+        (read_avail_input_buf): New static event buffer array.
+        (in_read_avail_input): New static variable to handle re-entrancy.
+        (read_avail_input): Change buf to pinter to read_avail_input_buf.
+        Use in_read_avail_input to handle re-entrance; when re-entered,
+        fully initialize and use tmp_buf array instead of read_avail_input_buf.
+        Do not initialize read_avail_input_buf in full here; instead assume it
+        is always cleared on entry.  To ensure that, we clear (just) the
+        entries that were used before we return.
+        (init_keyboard): Initialize read_avail_input_buf here.
+
+2004-02-16  Jesper Harder  <harder@ifa.au.dk>  (tiny change)
+
+        * cmds.c (Fend_of_line): Doc fix.
+
+2004-02-16  Dmitry Antipov  <dmitry.antipov@mail.ru>  (tiny change)
+
+        * keyboard.c (prev_read): New static variable.
+        (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>
+
+        * Makefile.in (obj): Move fringe.o from here...
+        (XOBJ, MAC_OBJ): ...to here.
+
 2004-02-16  Stephen Eglen  <stephen@gnu.org>
 
         * fringe.c (init_fringe_bitmap): Define j in MAC_OS code.
diff --git a/src/Makefile.in b/src/Makefile.in
index ac9cae31061..9f4dcd2b26f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -310,9 +310,9 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcd
 /* Include xmenu.o in the list of X object files.  */
 
 #ifdef USE_GTK
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o fringe.o
 #else
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o
 #endif
 
 /* The X Menu stuff is present in the X10 distribution, but missing
@@ -334,7 +334,7 @@ LIBXMENU= -lXMenu
 
 /* Otherwise, omit xmenu.o from the list of X object files, and
    don't worry about the menu library at all.  */
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o
 LIBXMENU=
 #endif /* not HAVE_MENUS */
 
@@ -562,7 +562,7 @@ MSDOS_OBJ = dosfns.o msdos.o w16select.o
 #ifdef HAVE_CARBON
 mac = $(dot)$(dot)/mac/
 XMENU_OBJ =
-MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o
+MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o
 emacsapp = $(PWD)/$(mac)Emacs.app/
 emacsappsrc = ${srcdir}/../mac/Emacs.app/
 #else
@@ -571,7 +571,7 @@ XMENU_OBJ = xmenu.o
 
 /* lastfile must follow all files
    whose initialized data areas should be dumped as pure by dump-emacs.  */
-obj=    dispnew.o frame.o scroll.o xdisp.o fringe.o $(XMENU_OBJ) window.o \
+obj=    dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \
         charset.o coding.o category.o ccl.o \
         cm.o term.o xfaces.o $(XOBJ) \
         emacs.o keyboard.o macros.o keymap.o sysdep.o \
diff --git a/src/cmds.c b/src/cmds.c
index 02e9e723881..b989bab46ee 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -181,7 +181,7 @@ DEFUN ("end-of-line", Fend_of_line, Send_of_line, 0, 1, "p",
        doc: /* Move point to end of current line.
 With argument N not nil or 1, move forward N - 1 lines first.
 If point reaches the beginning or end of buffer, it stops there.
-To ignore intangibility, bind `inhibit-text-motion-hooks' to t.
+To ignore intangibility, bind `inhibit-point-motion-hooks' to t.
 
 This command does not move point across a field boundary unless doing so
 would move beyond there to a different line; if N is nil or 1, and
diff --git a/src/keyboard.c b/src/keyboard.c
index 8223049d79d..26b1bfa89e1 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6560,6 +6560,14 @@ record_asynch_buffer_change ()
 
 #ifndef VMS
 
+/* We make the read_avail_input buffer static to avoid zeroing out the
+   whole struct input_event buf on every call.  */
+static struct input_event read_avail_input_buf[KBD_BUFFER_SIZE];
+
+/* I don't know whether it is necessary, but make read_avail_input 
+   re-entrant.  */
+static int in_read_avail_input = 0;
+
 /* Read any terminal input already buffered up by the system
    into the kbd_buffer, but do not wait.
 
@@ -6576,14 +6584,21 @@ static int
 read_avail_input (expected)
      int expected;
 {
-  struct input_event buf[KBD_BUFFER_SIZE];
+  struct input_event *buf = read_avail_input_buf;
+  struct input_event tmp_buf[KBD_BUFFER_SIZE];
   register int i;
-  struct display *d;
   int nread = 0;
+  struct display *d;
   
-  for (i = 0; i < KBD_BUFFER_SIZE; i++)
-    EVENT_INIT (buf[i]);
+  /* Trivial hack to make read_avail_input re-entrant.  */
+  if (in_read_avail_input++)
+    {
+      buf = tmp_buf;
+      for (i = 0; i < KBD_BUFFER_SIZE; i++)
+        EVENT_INIT (buf[i]);
+    }
 
+  /* Loop through the available displays, and call their input hooks. */
   d = display_list;
   while (d)
     {
@@ -6593,7 +6608,7 @@ read_avail_input (expected)
         /* No need for FIONREAD or fcntl; just say don't wait.  */
         nread = (*d->read_socket_hook) (d, buf, KBD_BUFFER_SIZE, expected);
 
-      if (nread == -2)
+      if (nread == -2)          /* -2 means non-transient error */
         {
           /* The display device terminated; it should be closed. */
 
@@ -6627,6 +6642,11 @@ read_avail_input (expected)
         break;
     }
 
+  /* Clear used events */
+  if (--in_read_avail_input == 0)
+    for (i = 0; i < nread; i++)
+      EVENT_INIT (buf[i]);
+
   return nread;
 }
 
@@ -6647,13 +6667,12 @@ tty_read_avail_input (struct display *display,
   unsigned char cbuf[KBD_BUFFER_SIZE - 1];
   int n_to_read, i;
   struct tty_display_info *tty = display->display_info.tty;
-  Lisp_Object frame;
   int nread = 0;
   
   if (display->type != output_termcap)
     abort ();
   
-  /* XXX I think the following code should be moved to separate
+  /* XXX I think the following code should be moved to separate hook
      functions in system-dependent files. */
 #ifdef WINDOWSNT
   return 0;
@@ -6668,7 +6687,7 @@ tty_read_avail_input (struct display *display,
   
 #else /* not MSDOS */
 
-  if (! tty->term_initted)
+  if (! tty->term_initted)      /* In case we get called during bootstrap. */
     return 0;
         
   /* Determine how many characters we should *try* to read.  */
@@ -6704,20 +6723,16 @@ tty_read_avail_input (struct display *display,
          process group won't get SIGHUP's at logout time.  BSDI adheres to
          this part standard and returns -1 from read (0) with errno==EIO
          when the control tty is taken away.
-         Jeffrey Honig <jch@bsdi.com> says this is generally safe.  */
+         Jeffrey Honig <jch@bsdi.com> says this is generally safe. */
       if (nread == -1 && errno == EIO)
-        {
-          return -2;          /* Close this display. */
-        }
+        return -2;          /* Close this display. */
 #if defined (AIX) && (! defined (aix386) && defined (_BSD))
       /* The kernel sometimes fails to deliver SIGHUP for ptys.
          This looks incorrect, but it isn't, because _BSD causes
          O_NDELAY to be defined in fcntl.h as O_NONBLOCK,
          and that causes a value other than 0 when there is no input.  */
       if (nread == 0)
-        {
-          return -2;          /* Close this display. */
-        }
+        return -2;          /* Close this display. */
 #endif
     }
   while (
@@ -6751,11 +6766,6 @@ tty_read_avail_input (struct display *display,
 #endif /* not MSDOS */
 #endif /* not WINDOWSNT */
   
-  /* Select the frame corresponding to the active tty.  Note that the
-     value of selected_frame is not reliable here, redisplay tends to
-     temporarily change it. */
-  frame = tty->top_frame;
-  
   for (i = 0; i < nread; i++)
     {
       buf[i].kind = ASCII_KEYSTROKE_EVENT;
@@ -6766,7 +6776,10 @@ tty_read_avail_input (struct display *display,
         cbuf[i] &= ~0x80;
       
       buf[i].code = cbuf[i];
-      buf[i].frame_or_window = frame;
+      /* Set the frame corresponding to the active tty.  Note that the
+         value of selected_frame is not reliable here, redisplay tends
+         to temporarily change it. */
+      buf[i].frame_or_window = tty->top_frame;
       buf[i].arg = Qnil;
     }
 
@@ -10658,6 +10671,13 @@ init_keyboard ()
   do_mouse_tracking = Qnil;
 #endif
   input_pending = 0;
+#ifndef VMS
+  {
+    int i;
+    for (i = 0; i < KBD_BUFFER_SIZE; i++)
+      EVENT_INIT (read_avail_input_buf[i]);
+  }
+#endif
 
   /* This means that command_loop_1 won't try to select anything the first
      time through.  */
diff --git a/src/xdisp.c b/src/xdisp.c
index edd7cc62e61..96d51b27480 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19028,7 +19028,7 @@ get_window_cursor_type (w, glyph, width, active_cursor)
     cursor_type = get_specified_cursor_type (b->cursor_type, width);
 
   /* Use normal cursor if not blinked off.  */
-  if (!w->cursor_off_p)
+  if (!w->cursor_off_p && glyph != NULL)
     {
       if (glyph->type == IMAGE_GLYPH) {
         if (cursor_type == FILLED_BOX_CURSOR)
@@ -19367,7 +19367,8 @@ display_and_set_cursor (w, on, hpos, vpos, x, y)
 
   current_glyphs = w->current_matrix;
   glyph_row = MATRIX_ROW (current_glyphs, vpos);
-  glyph = glyph_row->glyphs[TEXT_AREA] + hpos;
+  glyph = (glyph_row->cursor_in_fringe_p ? NULL
+           : glyph_row->glyphs[TEXT_AREA] + hpos);
 
   /* If cursor row is not enabled, we don't really know where to
      display the cursor.  */
@@ -19655,7 +19656,7 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
       if (charpos < MATRIX_ROW_START_CHARPOS (first))
         {
           *x = *y = *hpos = *vpos = 0;
-          return 0;
+          return 1;
         }
       else
         {
@@ -19695,7 +19696,7 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
     }
 
   *hpos = glyph - row->glyphs[TEXT_AREA];
-  return past_end;
+  return !past_end;
 }
 
 #else /* not 1 */