[Emacs-diffs] Changes to emacs/lisp/erc/erc-nicklist.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     06/11/20 06:50:29

Index: lisp/erc/erc-nicklist.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/erc/erc-nicklist.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lisp/erc/erc-nicklist.el    29 Jan 2006 13:08:57 -0000      1.1
+++ lisp/erc/erc-nicklist.el    20 Nov 2006 06:50:29 -0000      1.2
@@ -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