[Erc-commit] [commit][master] Fix error in process filter introduced by recent change.

[mwolson]

commit e87c2617c155f0dedb32f413ec7dda90651afed7
Author: Michael W. Olson <address@hidden>
Date:   Fri Jan 18 21:05:30 2008 -0500

    Fix error in process filter introduced by recent change.

diff --git a/ChangeLog b/ChangeLog
index 66e869b..1ffc02f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-19  Michael Olson  <address@hidden>
+
+       * erc.el (erc-format-network, erc-format-target-and/or-network):
+       Use erc-network-name function instead, and check to see whether
+       that function is bound.  This fixes an error in process filter for
+       people who did not have erc-services or erc-networks loaded.
+
 2008-01-18  Michael Olson  <address@hidden>
 
        * Makefile (EXTRAS): Include erc-list-old.el.
diff --git a/erc.el b/erc.el
index dc6f731..40559be 100644
--- a/erc.el
+++ b/erc.el
@@ -5978,7 +5978,7 @@ This should be a string with substitution variables 
recognized by
 
 (defun erc-format-network ()
   "Return the name of the network we are currently on."
-  (let ((network (erc-with-server-buffer erc-network)))
+  (let ((network (and (fboundp 'erc-network-name) (erc-network-name))))
     (if (and network (symbolp network))
        (symbol-name network)
       "")))
@@ -5987,7 +5987,7 @@ This should be a string with substitution variables 
recognized by
   "Return the network or the current target and network combined.
 If the name of the network is not available, then use the
 shortened server name instead."
-  (let ((network-name (or (erc-with-server-buffer erc-network)
+  (let ((network-name (or (and (fboundp 'erc-network-name) (erc-network-name))
                          (erc-shorten-server-name
                           (or erc-server-announced-name
                               erc-session-server)))))