aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-02-22 20:34:59 -0500
committerGlenn Morris2012-02-22 20:34:59 -0500
commit6ea1787edaab5e3e1e0bed53accbf0eb2adf527f (patch)
tree2bfa04ae99a8162433d54cf42929b7f8c6781192
parent31a9ef2e3baa7e137b977f4549ad0b04f4fc9114 (diff)
downloademacs-6ea1787edaab5e3e1e0bed53accbf0eb2adf527f.tar.gz
emacs-6ea1787edaab5e3e1e0bed53accbf0eb2adf527f.zip
* doc/emacs/ack.texi (Acknowledgments): Mention smie.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/ack.texi6
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 20f751f703f..83eb19be7fa 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12012-02-23 Glenn Morris <rgm@gnu.org>
2
3 * ack.texi (Acknowledgments): Mention smie.
4
12012-02-22 Glenn Morris <rgm@gnu.org> 52012-02-22 Glenn Morris <rgm@gnu.org>
2 6
3 * macos.texi: Copyedits. Fix @key/@kbd usage. 7 * macos.texi: Copyedits. Fix @key/@kbd usage.
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 7bccc898d06..0a14f5119d1 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -833,9 +833,9 @@ text; @file{smerge-mode.el}, a minor mode for resolving @code{diff3}
833conflicts; @file{diff-mode.el}, a mode for viewing and editing context 833conflicts; @file{diff-mode.el}, a mode for viewing and editing context
834diffs; @file{css-mode.el} for Cascading Style Sheets; 834diffs; @file{css-mode.el} for Cascading Style Sheets;
835@file{bibtex-style.el} for BibTeX Style files; @file{mpc.el}, a 835@file{bibtex-style.el} for BibTeX Style files; @file{mpc.el}, a
836client for the ``Music Player Daemon''; and @file{pcase.el}, 836client for the ``Music Player Daemon''; @file{smie.el}, a generic
837implementing ML-style pattern matching. He integrated the 837indentation engine; and @file{pcase.el}, implementing ML-style pattern
838lexical binding code in Emacs 24. 838matching. He integrated the lexical binding code in Emacs 24.
839 839
840@item 840@item
841Morioka Tomohiko wrote several packages for MIME support in Gnus and 841Morioka Tomohiko wrote several packages for MIME support in Gnus and