Merge from origin/emacs-25

9a41cd1 ; Fix typo
9356fe2 Expand FIXME near definition of fboundp
219b39f kill-rectangle should mention killed-rectangle
59fa4c3 Avoid assertion violations in nhexl-mode

2 files changed, 12 insertions, 9 deletions

diff --git a/src/bidi.c b/src/bidi.c
index 6ea84d9c0c4..5824de54ad8 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -2971,15 +2971,13 @@ bidi_resolve_neutral (struct bidi_it *bidi_it)
       /* N1-N2/Retaining */
       || type == WEAK_BN)
     {
-      if (bidi_it->next_for_neutral.type != UNKNOWN_BT)
+      if (bidi_it->next_for_neutral.type != UNKNOWN_BT
+          && (bidi_it->next_for_neutral.charpos > bidi_it->charpos
+              /* PDI defines an eos, so it's OK for it to serve as its
+                 own next_for_neutral.  */
+              || (bidi_it->next_for_neutral.charpos == bidi_it->charpos
+                  && bidi_it->type == PDI)))
         {
-          /* Make sure the data for resolving neutrals we are
-             about to use is valid.  */
-          eassert (bidi_it->next_for_neutral.charpos > bidi_it->charpos
-                   /* PDI defines an eos, so it's OK for it to
-                      serve as its own next_for_neutral.  */
-                   || (bidi_it->next_for_neutral.charpos == bidi_it->charpos
-                       && bidi_it->type == PDI));
           type = bidi_resolve_neutral_1 (bidi_it->prev_for_neutral.type,
                                          bidi_it->next_for_neutral.type,
                                          current_level);
diff --git a/src/data.c b/src/data.c
index 71da916ae74..5af590abed9 100644
--- a/src/data.c
+++ b/src/data.c
@@ -629,7 +629,12 @@ global value outside of any lexical scope.  */)
   return (EQ (valcontents, Qunbound) ? Qnil : Qt);
 }
 
-/* FIXME: Make it an alias for function-symbol!  */
+/* FIXME: It has been previously suggested to make this function an
+   alias for symbol-function, but upon discussion at Debbug#23957,
+   there is a risk breaking backward compatiblity, as some users of
+   fboundp may expect `t' in particular, rather than any true
+   value.  An alias is still welcome so long as the compatibility
+   issues are addressed.  */
 DEFUN ("fboundp", Ffboundp, Sfboundp, 1, 1, 0,
        doc: /* Return t if SYMBOL's function definition is not void.  */)
   (register Lisp_Object symbol)