[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] Apply the correct version of the previous
From: |
mwolson |
Subject: |
[Erc-commit] [commit][emacs22] Apply the correct version of the previous fix. |
Date: |
Sun, 14 Oct 2007 00:48:30 -0400 |
commit f73f49d20f9a67cbf12fb065fb3a34eaeaba93e8
Author: Michael Olson <address@hidden>
Date: Mon Sep 11 22:47:40 2006 +0000
Apply the correct version of the previous fix.
git-archimport-id: address@hidden/erc--main--0--patch-54
diff --git a/erc-nicklist.el b/erc-nicklist.el
index 669f055..7a94d2b 100644
--- a/erc-nicklist.el
+++ b/erc-nicklist.el
@@ -207,8 +207,9 @@ Seach for the BBDB record of this contact. If not found,
return nil."
(channels (erc-server-user-buffers server-user))
(op (erc-channel-user-op channel-user))
(voice (erc-channel-user-voice channel-user))
- (bbdb-nick (or (erc-nicklist-search-for-nick (concat login "@" host))
- "")
+ (bbdb-nick (or (erc-nicklist-search-for-nick
+ (concat login "@" host))
+ ""))
(away-status (if voice "" "\n(Away)"))
(balloon-text (concat bbdb-nick (if (string= "" bbdb-nick)
"" "\n")
@@ -225,7 +226,7 @@ Seach for the BBDB record of this contact. If not found,
return nil."
'erc-nicklist-channel channel
'help-echo balloon-text)
"\n")))
- (erc-nicklist-mode)))
+ (erc-nicklist-mode))
(defun erc-nicklist ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][emacs22] Apply the correct version of the previous fix.,
mwolson <=