diff options
| author | Miles Bader <miles@gnu.org> | 2007-04-01 13:36:38 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-04-01 13:36:38 +0000 |
| commit | ff59d266c7dcb9c6f7cc7ff7942510bda288e167 (patch) | |
| tree | 9cc762d166a00ae8d02c9f079890afb68125072e /lisp/erc/erc-match.el | |
| parent | 25c8c1594fe7ba177ec0621260304181b7052af3 (diff) | |
| download | emacs-ff59d266c7dcb9c6f7cc7ff7942510bda288e167.tar.gz | |
Release ERC 5.2.
I have updated the version of ERC to 5.2, since it fixes a bug with C-c
C-SPC being bound globally by default. For the full list of changes in
this version, see etc/ERC-NEWS.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-687
Creator: Michael Olson <mwolson@gnu.org>
Diffstat (limited to 'lisp/erc/erc-match.el')
| -rw-r--r-- | lisp/erc/erc-match.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index 50e4cfbc521..35ba1b13492 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -1,6 +1,7 @@ ;;; erc-match.el --- Highlight messages matching certain regexps -;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006, +;; 2007 Free Software Foundation, Inc. ;; Author: Andreas Fuchs <asf@void.at> ;; Keywords: comm, faces @@ -540,7 +541,7 @@ deactivate/activate match logging in the latter. See (when (and (or (eq erc-log-matches-flag t) (and (eq erc-log-matches-flag 'away) - erc-away)) + (erc-away-time))) match-buffer-name) (let ((line (format-spec erc-log-match-format (format-spec-make @@ -572,7 +573,7 @@ deactivate/activate match logging in the latter. See (defun erc-log-matches-come-back (proc parsed) "Display a notice that messages were logged while away." - (when (and erc-away + (when (and (erc-away-time) (eq erc-log-matches-flag 'away)) (mapc (lambda (match-type) @@ -583,7 +584,7 @@ deactivate/activate match logging in the latter. See (with-current-buffer buffer (get-text-property (1- (point-max)) 'timestamp)))) - (away-time (erc-emacs-time-to-erc-time erc-away))) + (away-time (erc-emacs-time-to-erc-time (erc-away-time)))) (when (and away-time last-msg-time (erc-time-gt last-msg-time away-time)) (erc-display-message |