2 files changed, 4 insertions, 15 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 325e428bfeb..1f68372f31a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-03  Chong Yidong  <cyd@gnu.org>
+
+        * doc.c (Fdocumentation): Remove dynamic-docstring-function.
+
 2014-01-02  Martin Rudalics  <rudalics@gmx.at>
 
         Further adjust frame/window scrollbar width calculations.
diff --git a/src/doc.c b/src/doc.c
index 0d9c8021cdf..ecefd776b85 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -416,21 +416,6 @@ string is passed through `substitute-command-keys'.  */)
       xsignal1 (Qinvalid_function, fun);
     }
 
-  /* Check for a dynamic docstring.  These come with
-     a dynamic-docstring-function text property.  */
-  if (STRINGP (doc))
-    {
-      Lisp_Object func
-        = Fget_text_property (make_number (0),
-                              intern ("dynamic-docstring-function"),
-                                      doc);
-      if (!NILP (func))
-        /* Pass both `doc' and `function' since `function' can be needed, and
-           finding `doc' can be annoying: calling `documentation' is not an
-           option because it would infloop.  */
-        doc = call2 (func, doc, function);
-    }
-
   /* If DOC is 0, it's typically because of a dumped file missing
      from the DOC file (bug in src/Makefile.in).  */
   if (EQ (doc, make_number (0)))