summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-11-03 16:49:37 -0500
committerGlenn Morris <rgm@gnu.org>2014-11-03 16:49:37 -0500
commit41e962982dfe424c69ed99f0bd26a6e4eb67107f (patch)
treed7cda64bfecc7b9403459fda89b7f39a9fd8732f /doc
parent303fd9411f21d19604306ecdbd89941bf4923201 (diff)
parentbd673cc594764572cd49bd0f10a0432006368489 (diff)
downloademacs-41e962982dfe424c69ed99f0bd26a6e4eb67107f.tar.gz
Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/programs.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index adf61e833b3..9dc3af97788 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-03 Glenn Morris <rgm@gnu.org>
+
+ * programs.texi (Misc for Programs): Fix typo.
+
2014-10-30 Eli Zaretskii <eliz@gnu.org>
* frames.texi (Scroll Bars): Improve indexing of faces.
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 4c80449c2a2..f2ca386b49e 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1453,7 +1453,7 @@ creates.
@findex superword-mode
Superword mode is a buffer-local minor mode that causes editing and
motion commands to treat symbols (e.g., @samp{this_is_a_symbol}) as words.
-When Subword mode is enabled, the minor mode indicator
+When Superword mode is enabled, the minor mode indicator
@iftex
@samp{@math{^2}}
@end iftex