Mercurial > emacs
diff lisp/erc/erc-nicklist.el @ 74093:bc5d69739d5e
Merge from erc--emacs--22
Merge from my ERC Emacs 22 integration branch. The version is now "5.2
stable pre-release". This will probably be the last change to the
version of ERC in Emacs 22 before the release, pending any bugfixes. For
details on the changes, see the lisp/erc/ChangeLog file.
Note that ERC is now invoked with M-x erc, not M-x erc-select. If you
were using the old `erc' function programmatically, use `erc-open'
instead.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-520
Creator: Michael Olson <mwolson@gnu.org>
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 20 Nov 2006 06:50:29 +0000 |
parents | fc745b05e928 |
children | 7a3f13e2dd57 |
line wrap: on
line diff
--- a/lisp/erc/erc-nicklist.el Mon Nov 20 02:48:15 2006 +0000 +++ b/lisp/erc/erc-nicklist.el Mon Nov 20 06:50:29 2006 +0000 @@ -29,7 +29,7 @@ ;; This provides a minimal mIRC style nicklist buffer for ERC. To ;; activate, do M-x erc-nicklist RET in the channel buffer you want ;; the nicklist to appear for. To close and quit the nicklist -;; buffer, do M-x erc-nicklist-quit RET. +;; buffer, do M-x erc-nicklist-quit RET from within the nicklist buffer. ;; ;; TODO: ;; o Somehow associate nicklist windows with channel windows so they @@ -97,7 +97,7 @@ "*Directory of the PNG files for chat icons. Icons are displayed if `erc-nicklist-use-icons' is non-nil." :group 'erc-nicklist - :type 'string) + :type 'directory) (defcustom erc-nicklist-voiced-position 'bottom "*Position of voiced nicks in the nicklist. @@ -207,7 +207,9 @@ (channels (erc-server-user-buffers server-user)) (op (erc-channel-user-op channel-user)) (voice (erc-channel-user-voice channel-user)) - (bbdb-nick (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") @@ -406,6 +408,7 @@ ;; Local Variables: ;; indent-tabs-mode: t ;; tab-width: 8 +;; coding: utf-8 ;; End: ;; arch-tag: db37a256-87a7-4544-bd90-e5f16c9f5ca5