aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorkwhite2015-02-12 13:41:10 -0500
committerkwhite2015-02-12 13:41:10 -0500
commit72fd047e6878f1db44e4d64a2b5049ecf7bac079 (patch)
treeb4136d6f26a1e32da1065310ad48a8ee7b083908 /etc
parenta7254bbf99d9c9a55c93aae840c9d97598d4ce73 (diff)
downloademacs-72fd047e6878f1db44e4d64a2b5049ecf7bac079.tar.gz
emacs-72fd047e6878f1db44e4d64a2b5049ecf7bac079.zip
NEWS: Add section to include ERC changes
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/NEWS17
2 files changed, 21 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index a801c52d7eb..41e44be9593 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12015-02-12 Kelvin White <kwhite@gnu.org>
2
3 * NEWS: Add section to include ERC changes
4
12015-01-17 Eli Zaretskii <eliz@gnu.org> 52015-01-17 Eli Zaretskii <eliz@gnu.org>
2 6
3 * tutorials/TUTORIAL.he: Use u+05f4 HEBREW PUNCTUATION GERSHAYIM 7 * tutorials/TUTORIAL.he: Use u+05f4 HEBREW PUNCTUATION GERSHAYIM
diff --git a/etc/NEWS b/etc/NEWS
index 584c9bae332..3a071ede8be 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -54,6 +54,23 @@ These emulations of old editors are believed to be no longer relevant
54*** vi.el, vip.el (try M-x viper instead) 54*** vi.el, vip.el (try M-x viper instead)
55 55
56 56
57* ERC Changes in Emacs 24.5
58
59+++
60** `erc-rename-buffers' if non-nil will rename buffers to reflect the
61current network name instead of using SERVER:PORT
62---
63** `erc-version' now follows current emacs version
64+++
65** `erc-format-@nick' displays all user modes instead of only op and
66voice
67---
68** `erc-my-nick-prefix-face' and `erc-nick-prefix-face' for changing
69the faces for user mode prefixes
70---
71** display of irc commands in current buffer has been disabled
72
73
57* Installation Changes in Emacs 24.4 74* Installation Changes in Emacs 24.4
58 75
59** Emacs can now be compiled with ACL (access control list) support. 76** Emacs can now be compiled with ACL (access control list) support.