diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /lisp/erc/ChangeLog | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'lisp/erc/ChangeLog')
| -rw-r--r-- | lisp/erc/ChangeLog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 76766144c18..a23fa508c46 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -141,7 +141,7 @@ | |||
| 141 | * erc-page.el (erc-page-function): | 141 | * erc-page.el (erc-page-function): |
| 142 | * erc-stamp.el (erc-stamp): Doc fix. | 142 | * erc-stamp.el (erc-stamp): Doc fix. |
| 143 | 143 | ||
| 144 | 2012-08-21 Josh Feinstein <jlf@foxtail.org> | 144 | 2012-08-21 Josh Feinstein <jlf@foxtail.org> |
| 145 | 145 | ||
| 146 | * erc-join.el (erc-autojoin-timing): Fix defcustom type. | 146 | * erc-join.el (erc-autojoin-timing): Fix defcustom type. |
| 147 | 147 | ||
| @@ -151,7 +151,7 @@ | |||
| 151 | Use `erc-match-exclude-server-buffer' not | 151 | Use `erc-match-exclude-server-buffer' not |
| 152 | `erc-track-exclude-server-buffer'. | 152 | `erc-track-exclude-server-buffer'. |
| 153 | 153 | ||
| 154 | 2012-08-20 Josh Feinstein <jlf@foxtail.org> | 154 | 2012-08-20 Josh Feinstein <jlf@foxtail.org> |
| 155 | 155 | ||
| 156 | * erc.el (erc-display-message): Abstract message hiding decision | 156 | * erc.el (erc-display-message): Abstract message hiding decision |
| 157 | to new function erc-hide-current-message-p. | 157 | to new function erc-hide-current-message-p. |