Merge from mainline.

4 files changed, 83 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 43ca62aedfc..031b254739e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2011-02-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * process.c (create_process): Reset SIGPIPE handler in the child.
+        * callproc.c (Fcall_process): Likewise.  (Bug#5238)
+
+2011-02-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c <this_line_min_pos>: New variable.
+        (move_it_in_display_line_to): Record in this_line_min_pos the
+        smallest position iterated across.
+        (display_line): Use this_line_min_pos to record the smallest
+        position in the line even if it is not displayed due to
+        hscrolling.  (Bug#7939)
+
 2011-02-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove no-longer needed getloadavg symbols.
diff --git a/src/callproc.c b/src/callproc.c
index 925eefb4b02..27e8493bcf1 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -445,6 +445,11 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     register char **save_environ = environ;
     register int fd1 = fd[1];
     int fd_error = fd1;
+#ifdef HAVE_WORKING_VFORK
+    sigset_t procmask;
+    sigset_t blocked;
+    struct sigaction sigpipe_action;
+#endif
 
 #if 0  /* Some systems don't have sigblock.  */
     mask = sigblock (sigmask (SIGCHLD));
@@ -525,6 +530,18 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     pid = child_setup (filefd, fd1, fd_error, (char **) new_argv,
                        0, current_dir);
 #else  /* not WINDOWSNT */
+
+#ifdef HAVE_WORKING_VFORK
+    /* On many hosts (e.g. Solaris 2.4), if a vforked child calls `signal',
+       this sets the parent's signal handlers as well as the child's.
+       So delay all interrupts whose handlers the child might munge,
+       and record the current handlers so they can be restored later.  */
+    sigemptyset (&blocked);
+    sigaddset (&blocked, SIGPIPE);
+    sigaction (SIGPIPE, 0, &sigpipe_action);
+    sigprocmask (SIG_BLOCK, &blocked, &procmask);
+#endif
+
     BLOCK_INPUT;
 
     pid = vfork ();
@@ -541,11 +558,26 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 #else
         setpgrp (pid, pid);
 #endif /* USG */
+
+        /* GTK causes us to ignore SIGPIPE, make sure it is restored
+           in the child.  */
+        signal (SIGPIPE, SIG_DFL);
+#ifdef HAVE_WORKING_VFORK
+        sigprocmask (SIG_SETMASK, &procmask, 0);
+#endif
+
         child_setup (filefd, fd1, fd_error, (char **) new_argv,
                      0, current_dir);
       }
 
     UNBLOCK_INPUT;
+
+#ifdef HAVE_WORKING_VFORK
+    /* Restore the signal state.  */
+    sigaction (SIGPIPE, &sigpipe_action, 0);
+    sigprocmask (SIG_SETMASK, &procmask, 0);
+#endif
+
 #endif /* not WINDOWSNT */
 
     /* The MSDOS case did this already.  */
diff --git a/src/process.c b/src/process.c
index 80e70e49f8e..d026b9d030b 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1786,6 +1786,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
   sigset_t blocked;
   struct sigaction sigint_action;
   struct sigaction sigquit_action;
+  struct sigaction sigpipe_action;
 #ifdef AIX
   struct sigaction sighup_action;
 #endif
@@ -1898,6 +1899,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
      and record the current handlers so they can be restored later.  */
   sigaddset (&blocked, SIGINT );  sigaction (SIGINT , 0, &sigint_action );
   sigaddset (&blocked, SIGQUIT);  sigaction (SIGQUIT, 0, &sigquit_action);
+  sigaddset (&blocked, SIGPIPE);  sigaction (SIGPIPE, 0, &sigpipe_action);
 #ifdef AIX
   sigaddset (&blocked, SIGHUP );  sigaction (SIGHUP , 0, &sighup_action );
 #endif
@@ -2054,6 +2056,9 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
 
         signal (SIGINT, SIG_DFL);
         signal (SIGQUIT, SIG_DFL);
+        /* GTK causes us to ignore SIGPIPE, make sure it is restored
+           in the child.  */
+        signal (SIGPIPE, SIG_DFL);
 
         /* Stop blocking signals in the child.  */
         sigprocmask (SIG_SETMASK, &procmask, 0);
@@ -2142,6 +2147,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
   /* Restore the parent's signal handlers.  */
   sigaction (SIGINT, &sigint_action, 0);
   sigaction (SIGQUIT, &sigquit_action, 0);
+  sigaction (SIGPIPE, &sigpipe_action, 0);
 #ifdef AIX
   sigaction (SIGHUP, &sighup_action, 0);
 #endif
diff --git a/src/xdisp.c b/src/xdisp.c
index 630c1dcda85..b9b77e34b9d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -444,6 +444,12 @@ static int this_line_pixel_height;
 
 static int this_line_start_x;
 
+/* The smallest character position seen by move_it_* functions as they
+   move across display lines.  Used to set MATRIX_ROW_START_CHARPOS of
+   hscrolled lines, see display_line.  */
+
+static struct text_pos this_line_min_pos;
+
 /* Buffer that this_line_.* variables are referring to.  */
 
 static struct buffer *this_line_buffer;
@@ -6909,6 +6915,9 @@ move_it_in_display_line_to (struct it *it,
       && it->current_y < it->last_visible_y)
     handle_line_prefix (it);
 
+  if (IT_CHARPOS (*it) < CHARPOS (this_line_min_pos))
+    SET_TEXT_POS (this_line_min_pos, IT_CHARPOS (*it), IT_BYTEPOS (*it));
+
   while (1)
     {
       int x, i, ascent = 0, descent = 0;
@@ -7013,6 +7022,9 @@ move_it_in_display_line_to (struct it *it,
       if (it->area != TEXT_AREA)
         {
           set_iterator_to_next (it, 1);
+          if (IT_CHARPOS (*it) < CHARPOS (this_line_min_pos))
+            SET_TEXT_POS (this_line_min_pos,
+                          IT_CHARPOS (*it), IT_BYTEPOS (*it));
           continue;
         }
 
@@ -7121,6 +7133,9 @@ move_it_in_display_line_to (struct it *it,
                             }
 
                           set_iterator_to_next (it, 1);
+                          if (IT_CHARPOS (*it) < CHARPOS (this_line_min_pos))
+                            SET_TEXT_POS (this_line_min_pos,
+                                          IT_CHARPOS (*it), IT_BYTEPOS (*it));
                           /* On graphical terminals, newlines may
                              "overflow" into the fringe if
                              overflow-newline-into-fringe is non-nil.
@@ -7219,6 +7234,8 @@ move_it_in_display_line_to (struct it *it,
       /* The current display element has been consumed.  Advance
          to the next.  */
       set_iterator_to_next (it, 1);
+      if (IT_CHARPOS (*it) < CHARPOS (this_line_min_pos))
+        SET_TEXT_POS (this_line_min_pos, IT_CHARPOS (*it), IT_BYTEPOS (*it));
 
       /* Stop if lines are truncated and IT's current x-position is
          past the right edge of the window now.  */
@@ -17139,18 +17156,15 @@ find_row_edges (struct it *it, struct glyph_row *row,
   if (min_pos <= ZV)
     SET_TEXT_POS (row->minpos, min_pos, min_bpos);
   else
-    {
-      /* We didn't find _any_ valid buffer positions in any of the
-         glyphs, so we must trust the iterator's computed
-         positions.  */
+    /* We didn't find _any_ valid buffer positions in any of the
+       glyphs, so we must trust the iterator's computed positions.  */
       row->minpos = row->start.pos;
+  if (max_pos <= 0)
+    {
       max_pos = CHARPOS (it->current.pos);
       max_bpos = BYTEPOS (it->current.pos);
     }
 
-  if (!max_pos)
-    abort ();
-
   /* Here are the various use-cases for ending the row, and the
      corresponding values for ROW->maxpos:
 
@@ -17263,8 +17277,18 @@ display_line (struct it *it)
      if the first glyph is partially visible or if we hit a line end.  */
   if (it->current_x < it->first_visible_x)
     {
+      SET_TEXT_POS (this_line_min_pos, ZV + 1, ZV_BYTE + 1);
       move_it_in_display_line_to (it, ZV, it->first_visible_x,
                                   MOVE_TO_POS | MOVE_TO_X);
+      /* Record the smallest positions seen while we moved over
+         display elements that are not visible.  This is needed by
+         redisplay_internal for optimizing the case where the cursor
+         stays inside the same line.  The rest of this function only
+         considers positions that are actually displayed, so
+         RECORD_MAX_MIN_POS will not otherwise record positions that
+         are hscrolled to the left of the left edge of the window.  */
+      min_pos = CHARPOS (this_line_min_pos);
+      min_bpos = BYTEPOS (this_line_min_pos);
     }
   else
     {