[Erc-commit] [commit][emacs22] Fixed lag formatting. Set header-line face property.

[mwolson]

commit 3c3ac5f8130169dfb9219abeb8ceef1024b875d2
Author: Diane Murray <address@hidden>
Date:   Thu Jan 11 01:26:10 2007 +0000

    Fixed lag formatting.  Set header-line face property.
    
    * erc.el: Updated copyright years.
    (erc-version-string): Set to 5.2 (devel).
    (erc-format-lag-time): Fixed to work when `erc-server-lag' is nil.
    (erc-update-mode-line-buffer): Set the header face.
    git-archimport-id: address@hidden/erc--main--0--patch-84

diff --git a/ChangeLog b/ChangeLog
index 9e955d3..0ca3bd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-11  Diane Murray  <address@hidden>
+
+       * erc.el: Updated copyright years.
+       (erc-version-string): Set to 5.2 (devel).
+       (erc-format-lag-time): Fixed to work when `erc-server-lag' is nil.
+       (erc-update-mode-line-buffer): Set the header face.
+
 2007-01-11  Michael Olson  <address@hidden>
 
        * erc-bbdb.el (erc-bbdb-popup-type): Fix customization type and
diff --git a/erc.el b/erc.el
index a4fbbf2..cbd4be0 100644
--- a/erc.el
+++ b/erc.el
@@ -1,7 +1,7 @@
 ;; erc.el --- An Emacs Internet Relay Chat client
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Alexander L. Belikoff (address@hidden)
 ;; Contributors: Sergey Berezin (address@hidden),
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.4 (devel)"
+(defconst erc-version-string "Version 5.2 (devel)"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
@@ -5818,7 +5818,9 @@ if `erc-away' is non-nil."
 
 (defun erc-format-lag-time ()
   "Return the estimated lag time to server, `erc-server-lag'."
-  (format "lag:%.0f" (erc-with-server-buffer erc-server-lag)))
+  (let ((lag (erc-with-server-buffer erc-server-lag)))
+    (cond (lag (format "lag:%.0f" lag))
+         (t ""))))
 
 (defun erc-update-mode-line-buffer (buffer)
   "Update the mode line in a single ERC buffer BUFFER."
@@ -5872,7 +5874,10 @@ if `erc-away' is non-nil."
                              (erc-propertize header 'help-echo help-echo
                                              'face face)
                            (erc-propertize header 'help-echo help-echo))))))
-               (t (setq header-line-format header))))))
+               (t (setq header-line-format
+                        (if face
+                            (erc-propertize header 'face face)
+                          header)))))))
     (if (featurep 'xemacs)
        (redraw-modeline)
       (force-mode-line-update))))