[Emacs-diffs] Changes to emacs/lisp/erc/erc-match.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/04/01 13:36:38

Index: lisp/erc/erc-match.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/erc/erc-match.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- lisp/erc/erc-match.el       21 Jan 2007 02:47:36 -0000      1.6
+++ lisp/erc/erc-match.el       1 Apr 2007 13:36:37 -0000       1.7
@@ -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 <address@hidden>
 ;; Keywords: comm, faces
@@ -540,7 +541,7 @@
     (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 @@
 
 (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 @@
                                  (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