summaryrefslogtreecommitdiff
path: root/doc/emacs/ack.texi
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2015-12-29 21:40:28 -0800
committerJohn Wiegley <johnw@newartisans.com>2015-12-29 21:40:28 -0800
commit9f2f14a0725211b13a744573344636b57b9c98b9 (patch)
tree7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /doc/emacs/ack.texi
parentd259328fb87db8cc67d52771efcfa653e52c5b71 (diff)
parente823c34072bf045800d91e12c7ddb61fa23c6e30 (diff)
downloademacs-9f2f14a0725211b13a744573344636b57b9c98b9.tar.gz
Merge emacs-25 into master (using imerge)
Diffstat (limited to 'doc/emacs/ack.texi')
-rw-r--r--doc/emacs/ack.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 1c88e97a659..4d53456d0f0 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -64,6 +64,10 @@ point vertically fixed by scrolling the window when moving up and down
in the buffer.
@item
+Aurélien Aptel added dynamic module support to Emacs. Philipp
+Stephani and others also worked on the dynamic module code.
+
+@item
Joe Arceneaux wrote the original text property implementation, and
implemented support for X11.