summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/help.texi2
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/syntax.texi5
4 files changed, 15 insertions, 0 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 9a2f5d98e47..072a13c0904 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-26 Glenn Morris <rgm@gnu.org>
+
+ * help.texi (Misc Help): Index describe-syntax.
+
2013-05-23 Glenn Morris <rgm@gnu.org>
* programs.texi (Semantic): Fix typo.
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 0a0a3865d2d..0f7e910ec17 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -530,6 +530,8 @@ describes the commands and features that are changed in this mode.
@kindex C-h b
@findex describe-bindings
+@kindex C-h s
+@findex describe-syntax
@kbd{C-h b} (@code{describe-bindings}) and @kbd{C-h s}
(@code{describe-syntax}) show other information about the current
environment within Emacs. @kbd{C-h b} displays a list of all the key
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index b851b869ed4..440e5dc8239 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-26 Glenn Morris <rgm@gnu.org>
+
+ * syntax.texi (Syntax Table Functions): Mention describe-syntax.
+
2013-06-19 Glenn Morris <rgm@gnu.org>
* loading.texi (Autoload): Fix typo.
diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi
index dfa121103bc..6bbd7a3a7b7 100644
--- a/doc/lispref/syntax.texi
+++ b/doc/lispref/syntax.texi
@@ -506,6 +506,11 @@ This function returns the current syntax table, which is the table for
the current buffer.
@end defun
+@deffn Command describe-syntax &optional buffer
+This command displays the contents of the syntax table of
+@var{buffer} (by default, the current buffer) in a help buffer.
+@end deffn
+
@defmac with-syntax-table table body@dots{}
This macro executes @var{body} using @var{table} as the current syntax
table. It returns the value of the last form in @var{body}, after