Merge from origin/emacs-26

4cf1eb8 (origin/emacs-26) ; * src/data.c (Fkeywordp): Remove inaccura...
3f1470d * doc/emacs/mark.texi (Mark): Index "(de)activating the mark".

2 files changed, 2 insertions, 2 deletions

diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 0ffa9f74ac6..10505873c53 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -17,11 +17,13 @@ one comes earlier in the text; each time you move point, the region
 changes.
 
 @cindex active region
+@cindex activating the mark
   Setting the mark at a position in the text also @dfn{activates} it.
 When the mark is active, we say also that the region is active; Emacs
 indicates its extent by highlighting the text within it, using the
 @code{region} face (@pxref{Face Customization}).
 
+@cindex deactivating the mark
   After certain non-motion commands, including any command that
 changes the text in the buffer, Emacs automatically @dfn{deactivates}
 the mark; this turns off the highlighting.  You can also explicitly
diff --git a/src/data.c b/src/data.c
index 750d494b83a..5f1d059512d 100644
--- a/src/data.c
+++ b/src/data.c
@@ -336,8 +336,6 @@ DEFUN ("symbolp", Fsymbolp, Ssymbolp, 1, 1, 0,
   return Qnil;
 }
 
-/* Define this in C to avoid unnecessarily consing up the symbol
-   name.  */
 DEFUN ("keywordp", Fkeywordp, Skeywordp, 1, 1, 0,
        doc: /* Return t if OBJECT is a keyword.
 This means that it is a symbol with a print name beginning with `:'