aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/ChangeLog
diff options
context:
space:
mode:
authorEli Zaretskii2012-11-17 20:00:16 +0200
committerEli Zaretskii2012-11-17 20:00:16 +0200
commitcf2d22b874ca2df0072e32ee641e8efffe4abd6d (patch)
tree1795142ec7861fc85c61adc90f03265b69041556 /doc/misc/ChangeLog
parent3c4ca7155293ffc2d04708007131bcbc882d8913 (diff)
parent6ad30855c02908fdd99d9b11943719e185e65ee3 (diff)
downloademacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.tar.gz
emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.zip
Merge from trunk.
Diffstat (limited to 'doc/misc/ChangeLog')
-rw-r--r--doc/misc/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 7322613e0db..b31b67b5d84 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,14 @@
12012-11-16 Glenn Morris <rgm@gnu.org>
2
3 * cl.texi (Function Bindings): Clarify that cl-flet is lexical.
4 (Obsolete Macros): Move example here from Function Bindings.
5
6 * erc.texi: Use @code{nil} rather than just "nil".
7 (Modules): Undocument obsolete "hecomplete".
8 Add "notifications".
9 (Connecting): Add brief section on passwords.
10 (Options): Make a start by adding erc-hide-list, erc-lurker-hide-list.
11
12012-11-13 Glenn Morris <rgm@gnu.org> 122012-11-13 Glenn Morris <rgm@gnu.org>
2 13
3 * flymake.texi (Customizable variables) 14 * flymake.texi (Customizable variables)