aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorVivek Dasmohapatra2010-08-14 18:58:10 -0400
committerChong Yidong2010-08-14 18:58:10 -0400
commit8a8d54cd2a7116c5aed4ecab7f5b14ae705ca740 (patch)
tree168f46d1eb3959da56e0164abdc00f98f0b09a62 /etc
parentab731e1cf3567059a906879c4e53306fa153c4c8 (diff)
downloademacs-8a8d54cd2a7116c5aed4ecab7f5b14ae705ca740.tar.gz
emacs-8a8d54cd2a7116c5aed4ecab7f5b14ae705ca740.zip
Allow delayed autojoin in ERC (Bug#5521).
* erc/erc-join.el (erc-autojoin-timing, erc-autojoin-delay): New vars. (erc-autojoin-channels-delayed, erc-autojoin-after-ident): New functions. (erc-autojoin-channels): Allow autojoining after ident (Bug#5521).
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS8
1 files changed, 8 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index bef21ad3bdd..8e2594d8ace 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -213,6 +213,14 @@ automatically added to the primary window selection.
213 213
214** Archive Mode has basic support to browse 7z archives. 214** Archive Mode has basic support to browse 7z archives.
215 215
216** ERC changes
217
218*** New vars `erc-autojoin-timing' and `erc-autojoin-delay'.
219If the value of `erc-autojoin-timing' is 'ident, ERC autojoins after a
220successful NickServ identification, or after `erc-autojoin-delay'
221seconds. The default value, 'ident, means to autojoin immediately
222after connecting.
223
216** In ido-mode, C-v is no longer bound to ido-toggle-vc. 224** In ido-mode, C-v is no longer bound to ido-toggle-vc.
217The reason is that this interferes with cua-mode. 225The reason is that this interferes with cua-mode.
218 226