Revision: emacs@sv.gnu.org/emacs--devo--0--patch-155

Remove nick-abbrevs stuff from rcirc.el

2006-03-13  Miles Bader  <miles@gnu.org>

   * lisp/net/rcirc.el (rcirc-nick-abbrevs): Variable removed.
   (rcirc-abbrev-nick): Function removed.
   (rcirc-format-response-string): Don't call `rcirc-abbrev-nick'.

2 files changed, 7 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36f797ddd6c..55a2b90e085 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-13  Miles Bader  <miles@gnu.org>
+
+        * net/rcirc.el (rcirc-nick-abbrevs): Variable removed.
+        (rcirc-abbrev-nick): Function removed.
+        (rcirc-format-response-string): Don't call `rcirc-abbrev-nick'.
+
 2006-03-13  David Ponce  <david@dponce.com>
 
         * tree-widget.el: Handle themes across all occurrences of the main
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index f5cf1ecb7e0..9d4f91fe17a 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -195,12 +195,6 @@ Use /ignore to list them, use /ignore NICK to add or remove a nick."
   :type '(repeat string)
   :group 'rcirc)
 
-(defcustom rcirc-nick-abbrevs nil
-  "List of short replacements for printing nicks."
-  :type '(alist :key-type (string :tag "Nick")
-                :value-type (string :tag "Abbrev"))
-  :group 'rcirc)
-
 (defvar rcirc-ignore-list-automatic ()
   "List of ignored nicks added to `rcirc-ignore-list' because of renaming.
 When an ignored person renames, their nick is added to both lists.
@@ -493,11 +487,6 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.")
   (with-rcirc-process-buffer process
     rcirc-nick))
 
-(defun rcirc-abbrev-nick (nick)
-  "If NICK has an entry in `rcirc-nick-abbrevs', return its abbreviation,
-otherwise return NICK."
-  (or (cdr (assoc nick rcirc-nick-abbrevs)) nick))
-
 (defvar rcirc-max-message-length 450
   "Messages longer than this value will be split.")
 
@@ -975,7 +964,7 @@ is found by looking up RESPONSE in `rcirc-response-formats'."
                                                         process rcirc-server)
                                                     sender)
                                            ""
-                                         (rcirc-abbrev-nick sender))
+                                         sender)
                                        (and target (concat "," target)))))
                      (rcirc-facify nick
                                    (if (eq key ?n)