Show
Ignore:
Timestamp:
2007年04月07日 15時49分28秒 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/erc/erc-match.el

    r4190 r4200  
    11;;; erc-match.el --- Highlight messages matching certain regexps 
    22 
    3 ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. 
     3;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 
     4;;   2007 Free Software Foundation, Inc. 
    45 
    56;; Author: Andreas Fuchs <asf@void.at> 
    …… 
    541542           (or (eq erc-log-matches-flag t) 
    542543               (and (eq erc-log-matches-flag 'away) 
    543                     erc-away)) 
     544                    (erc-away-time))) 
    544545           match-buffer-name) 
    545546      (let ((line (format-spec erc-log-match-format 
    …… 
    573574(defun erc-log-matches-come-back (proc parsed) 
    574575  "Display a notice that messages were logged while away." 
    575   (when (and erc-away 
     576  (when (and (erc-away-time) 
    576577             (eq erc-log-matches-flag 'away)) 
    577578    (mapc 
    …… 
    584585                                    (get-text-property (1- (point-max)) 
    585586                                                       'timestamp)))) 
    586                   (away-time     (erc-emacs-time-to-erc-time erc-away))) 
     587                  (away-time (erc-emacs-time-to-erc-time (erc-away-time)))) 
    587588             (when (and away-time last-msg-time 
    588589                        (erc-time-gt last-msg-time away-time))