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

1 files changed, 6 insertions, 1 deletions

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)