diff options
| author | Julien Danjou | 2012-08-21 09:52:42 +0200 |
|---|---|---|
| committer | Julien Danjou | 2012-08-21 09:52:42 +0200 |
| commit | a878d0f2c1e1ffd144dbbb455e2bc7fe23845d26 (patch) | |
| tree | aad3d499277624f424639825c6aadff3bc5c7e9c | |
| parent | 798581599b14bd781d7d74adef5fe269fa8b5d17 (diff) | |
| download | emacs-a878d0f2c1e1ffd144dbbb455e2bc7fe23845d26.tar.gz emacs-a878d0f2c1e1ffd144dbbb455e2bc7fe23845d26.zip | |
erc-match: fix erc-match server buffer exclusion
* erc-match.el (erc-match-message): Use
`erc-match-exclude-server-buffer' not
`erc-track-exclude-server-buffer'.
| -rw-r--r-- | lisp/erc/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/erc/erc-match.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index dd62cae7de1..27b1fe8617a 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-08-21 Julien Danjou <julien@danjou.info> | ||
| 2 | |||
| 3 | * erc-match.el (erc-match-message): Use | ||
| 4 | `erc-match-exclude-server-buffer' not | ||
| 5 | `erc-track-exclude-server-buffer'. | ||
| 6 | |||
| 1 | 2012-08-20 Josh Feinstein <jlf@foxtail.org> | 7 | 2012-08-20 Josh Feinstein <jlf@foxtail.org> |
| 2 | 8 | ||
| 3 | * erc.el (erc-display-message): Abstract message hiding decision | 9 | * erc.el (erc-display-message): Abstract message hiding decision |
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index 8daf9be2b14..cac042c0298 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el | |||
| @@ -458,7 +458,7 @@ Use this defun with `erc-insert-modify-hook'." | |||
| 458 | (point-min)) | 458 | (point-min)) |
| 459 | (point-max)))) | 459 | (point-max)))) |
| 460 | (when (and vector | 460 | (when (and vector |
| 461 | (not (and erc-track-exclude-server-buffer | 461 | (not (and erc-match-exclude-server-buffer |
| 462 | (erc-server-buffer-p)))) | 462 | (erc-server-buffer-p)))) |
| 463 | (mapc | 463 | (mapc |
| 464 | (lambda (match-type) | 464 | (lambda (match-type) |