From 9f493814bb40f1794ab53c84a5397aba1da58cd7 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 Jan 2016 17:13:16 +0200
Subject: [PATCH] Document 'function-put'

* doc/lispref/symbols.texi (Symbol Plists): Document
'function-put'.  Update documentation of 'function-get'.
---
 doc/lispref/symbols.texi | 17 +++++++++++++++--
 etc/NEWS                 |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi
index c99f993e5d..8c1ec3d85e 100644
--- a/doc/lispref/symbols.texi
+++ b/doc/lispref/symbols.texi
@@ -461,10 +461,23 @@ You could define @code{put} in terms of @code{setplist} and
 @end example
 @end defun
 
-@defun function-get symbol property
+@defun function-get symbol property &optional autoload
 This function is identical to @code{get}, except that if @var{symbol}
 is the name of a function alias, it looks in the property list of the
-symbol naming the actual function.  @xref{Defining Functions}.
+symbol naming the actual function.  @xref{Defining Functions}.  If the
+optional argument @var{autoload} is non-@code{nil}, and @var{symbol}
+is auto-loaded, this function will try to autoload it, since
+autoloading might set @var{property} of @var{symbol}.  If
+@var{autoload} is the symbol @code{macro}, only try autoloading if
+@var{symbol} is an auto-loaded macro.
+@end defun
+
+@defun function-put function property value
+This function sets @var{property} of @var{function} to @var{value}.
+@var{function} should be a symbol.  This function is preferred to
+calling @code{put} for setting properties of a function, because it
+will allow us some day to implement remapping of old properties to new
+ones.
 @end defun
 
 @node Standard Properties
diff --git a/etc/NEWS b/etc/NEWS
index 6735718b63..9dba4e58be 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1472,6 +1472,7 @@ MS-Windows doesn't support UTF-8 as codeset in its locales.
 but makes `called-interactively-p' treat the function as (you guessed it)
 called interactively.
 
++++
 ** New function `function-put' to use instead of `put' for function properties.
 
 +++
-- 
2.39.2