diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-11-16 09:20:23 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-11-16 09:20:23 -0800 |
| commit | 96e055075d7c73cf189038db1b15f9369888ea41 (patch) | |
| tree | 000f5ac37801ff324fa5a79c1af23bd762d826dc /lisp/erc | |
| parent | 3d082a269ece18058ed82957f8a056822b39789e (diff) | |
| parent | cdc5d88cf68f232a71560937b557af8fa36d50c5 (diff) | |
| download | emacs-96e055075d7c73cf189038db1b15f9369888ea41.tar.gz | |
Merge from emacs-24; up to 2012-11-13T18:57:26Z!dgutov@yandex.ru
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 13dbba769a4..e0a88461dc9 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Glenn Morris <rgm@gnu.org> + + * erc.el (erc-modules): Add "notifications". Tweak "hecomplete" doc. + 2012-10-28 Stefan Monnier <monnier@iro.umontreal.ca> * erc-backend.el: Only require `erc' during compilation (bug#12740). diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 2e97131b603..7cb6fbb595b 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1843,7 +1843,7 @@ removed from the list will be disabled." capab-identify) (const :tag "completion: Complete nicknames and commands (programmable)" completion) - (const :tag "hecomplete: Complete nicknames and commands (old)" hecomplete) + (const :tag "hecomplete: Complete nicknames and commands (obsolete, use \"completion\")" hecomplete) (const :tag "dcc: Provide Direct Client-to-Client support" dcc) (const :tag "fill: Wrap long lines" fill) (const :tag "identd: Launch an identd server on port 8113" identd) @@ -1863,6 +1863,8 @@ removed from the list will be disabled." (const :tag "notify: Notify when the online status of certain users changes" notify) + (const :tag "notifications: Send notifications on PRIVMSG or nickname mentions" + notifications) (const :tag "page: Process CTCP PAGE requests from IRC" page) (const :tag "readonly: Make displayed lines read-only" readonly) (const :tag "replace: Replace text in messages" replace) |