[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] Merged from erc--emacs--22
From: |
mwolson |
Subject: |
[Erc-commit] [commit][emacs22] Merged from erc--emacs--22 |
Date: |
Sun, 14 Oct 2007 00:48:33 -0400 |
commit 93c10b61ffa8edbc92308a0177734d7692775074
Merge: 1e95fcd... d4a55ce...
Author: Michael Olson <address@hidden>
Date: Mon Nov 20 02:43:07 2006 +0000
Merged from erc--emacs--22
Patches applied:
* address@hidden/erc--emacs--22--patch-20
Re-add header-line fix
git-archimport-id: address@hidden/erc--main--0--patch-62
diff --cc erc.el
index 931ffc9,98a369f..eb6089a
--- a/erc.el
+++ b/erc.el
@@@ -5817,13 -5712,7 +5817,13 @@@ if `erc-away' is non-nil.
((erc-server-process-alive)
"")
(t
- ": CLOSED"))))
+ ": CLOSED")))
+ (face (cond ((eq erc-header-line-face-method nil)
+ nil)
+ ((functionp erc-header-line-face-method)
+ (funcall erc-header-line-face-method))
+ (t
- erc-header-line))))
++ 'erc-header-line))))
(cond ((featurep 'xemacs)
(setq modeline-buffer-identification
(list (format-spec erc-mode-line-format spec)))
- [Erc-commit] [commit][emacs22] Merged from erc--emacs--22,
mwolson <=
- [Erc-commit] [commit][emacs22] Merged from erc--emacs--22, mwolson, 2007/10/14
- [Erc-commit] [commit][emacs22] Merged from erc--emacs--22, mwolson, 2007/10/17
- [Erc-commit] [commit][emacs22] Merged from erc--emacs--22, mwolson, 2007/10/17
- [Erc-commit] [commit][emacs22] Merged from erc--emacs--22, mwolson, 2007/10/17
- [Erc-commit] [commit][emacs22] Merged from erc--emacs--22, mwolson, 2007/10/17
- [Erc-commit] [commit][emacs22] Merged from erc--emacs--22, mwolson, 2007/10/17