Merge from origin/emacs-25

d6f6b7d * etc/AUTHORS: Update the AUTHORS file
5cf7c39 authors.el updates
a26f193 ; fix changelog entries
fbc85c7 ; make change-history-commit
06da00c Fix Bug#22859
ab30bf5 ; * src/w32proc.c: Update the commentary to sys_select.
1481029 Fix reordering of bidi text in an isolate inside an override
60e0596 Document c-guess-basic-syntax in the CC Mode manual.

2 files changed, 12 insertions, 8 deletions

diff --git a/src/bidi.c b/src/bidi.c
index 9b714543dd2..e7787054e23 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1919,8 +1919,6 @@ bidi_resolve_explicit (struct bidi_it *bidi_it)
         {
           eassert (bidi_it->prev.charpos == bidi_it->charpos - 1);
           prev_type = bidi_it->prev.orig_type;
-          if (prev_type == FSI)
-            prev_type = bidi_it->type_after_wn;
         }
     }
   /* Don't move at end of buffer/string.  */
@@ -1935,8 +1933,6 @@ bidi_resolve_explicit (struct bidi_it *bidi_it)
         emacs_abort ();
       bidi_it->bytepos += bidi_it->ch_len;
       prev_type = bidi_it->orig_type;
-      if (prev_type == FSI)
-        prev_type = bidi_it->type_after_wn;
     }
   else  /* EOB or end of string */
     prev_type = NEUTRAL_B;
@@ -2091,10 +2087,17 @@ bidi_resolve_explicit (struct bidi_it *bidi_it)
       if (typ1 != STRONG_R && typ1 != STRONG_AL)
         {
           type = LRI;
+          /* Override orig_type, which will be needed when we come to
+             examine the next character, which is the first character
+             inside the isolate.  */
+          bidi_it->orig_type = type;
           goto fsi_as_lri;
         }
       else
-        type = RLI;
+        {
+          type = RLI;
+          bidi_it->orig_type = type;
+        }
       /* FALLTHROUGH */
     case RLI:   /* X5a */
       if (override == NEUTRAL_DIR)
diff --git a/src/w32proc.c b/src/w32proc.c
index a89a9850466..85ddbfd9c7b 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -2062,10 +2062,11 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
   return pid;
 }
 
-/* Emulate the select call
+/* Emulate the select call.
    Wait for available input on any of the given rfds, or timeout if
-   a timeout is given and no input is detected
-   wfds and efds are not supported and must be NULL.
+   a timeout is given and no input is detected.  wfds are supported
+   only for asynchronous 'connect' calls.  efds are not supported
+   and must be NULL.
 
    For simplicity, we detect the death of child processes here and
    synchronously call the SIGCHLD handler.  Since it is possible for