4 files changed, 12 insertions, 2 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 4f230111f35..1fab2aeee88 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,13 @@
 2008-10-13  Eli Zaretskii  <eliz@gnu.org>
 
+        * objects.texi (Primitive Function Type): Move "@cindex special
+        forms" from here...
+
+        * eval.texi (Special Forms): ...to here.
+
+        * functions.texi (What Is a Function): `functionp' returns nil for
+        special forms.  Add an xref.
+
         * elisp.texi (Top): Add a @detailmenu entry for "Frame-Local
         Variables".
 
diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi
index e6ec489f568..e2765b3afdf 100644
--- a/doc/lispref/eval.texi
+++ b/doc/lispref/eval.texi
@@ -410,7 +410,8 @@ expansion.
 
 @node Special Forms
 @subsection Special Forms
-@cindex special form evaluation
+@cindex special forms
+@cindex evaluation of special forms
 
   A @dfn{special form} is a primitive function specially marked so that
 its arguments are not all evaluated.  Most special forms define control
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index ddb4a6e8e92..6185faeee3b 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -1267,7 +1267,7 @@ without qualification, we mean a Lisp macro, not a keyboard macro.
 
 @node Primitive Function Type
 @subsection Primitive Function Type
-@cindex special forms
+@cindex primitive function
 
   A @dfn{primitive function} is a function callable from Lisp but
 written in the C programming language.  Primitive functions are also
diff --git a/etc/NEWS b/etc/NEWS
index af6ee2b1899..6a89758c757 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1041,6 +1041,7 @@ freetype library, giving access to a wider range of font formats.
 +++
 ** Variables cannot be both buffer-local and frame-local any more.
 
++++
 ** `functionp' returns nil for special forms.
 I.e., it only returns t for objects that can be passed to `funcall'.