comparison lisp/erc/erc-networks.el @ 76856:2fae574a2382

Release ERC 5.2. I have updated the version of ERC to 5.2, since it fixes a bug with C-c C-SPC being bound globally by default. For the full list of changes in this version, see etc/ERC-NEWS. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-687 Creator: Michael Olson <mwolson@gnu.org>
author Miles Bader <miles@gnu.org>
date Sun, 01 Apr 2007 13:36:38 +0000
parents 7a3f13e2dd57
children 85d67fae9a94
comparison
equal deleted inserted replaced
76855:e6686c0a3d45 76856:2fae574a2382
315 ("Nightstar: Random server" NightStar "irc.nightstar.net" ((6665 6669))) 315 ("Nightstar: Random server" NightStar "irc.nightstar.net" ((6665 6669)))
316 ("NitrousNet: Random server" NitrousNet "irc.nitrousnet.net" 6667) 316 ("NitrousNet: Random server" NitrousNet "irc.nitrousnet.net" 6667)
317 ("Novernet: Random server" Novernet "irc.novernet.com" ((6665 6669) 7000 )) 317 ("Novernet: Random server" Novernet "irc.novernet.com" ((6665 6669) 7000 ))
318 ("Nullrouted: Random server" Nullrouted "irc.nullrouted.org" ((6666 6669) 7000 )) 318 ("Nullrouted: Random server" Nullrouted "irc.nullrouted.org" ((6666 6669) 7000 ))
319 ("NullusNet: Random server" NullusNet "irc.nullus.net" 6667) 319 ("NullusNet: Random server" NullusNet "irc.nullus.net" 6667)
320 ("OFTC: Random server" OFTC "irc.oftc.net" ((6667 6670) 7000))
320 ("OpChat: Random server" OpChat "irc.opchat.org" ((6667 6669))) 321 ("OpChat: Random server" OpChat "irc.opchat.org" ((6667 6669)))
321 ("Othernet: Random server" Othernet "irc.othernet.org" 6667) 322 ("Othernet: Random server" Othernet "irc.othernet.org" 6667)
322 ("Othernet: US, FL, Miami" Othernet "miami.fl.us.othernet.org" 6667) 323 ("Othernet: US, FL, Miami" Othernet "miami.fl.us.othernet.org" 6667)
323 ("Othernet: US, MO, StLouis" Othernet "stlouis.mo.us.othernet.org" 6667) 324 ("Othernet: US, MO, StLouis" Othernet "stlouis.mo.us.othernet.org" 6667)
324 ("Otherside: Random server" OtherSide "irc.othersideirc.net" 6667) 325 ("Otherside: Random server" OtherSide "irc.othersideirc.net" 6667)
609 (NightStar "nightstar.net") 610 (NightStar "nightstar.net")
610 (NitrousNet "nitrousnet.net") 611 (NitrousNet "nitrousnet.net")
611 (Novernet "novernet.com") 612 (Novernet "novernet.com")
612 (Nullrouted "nullrouted.org") 613 (Nullrouted "nullrouted.org")
613 (NullusNet "nullus.net") 614 (NullusNet "nullus.net")
615 (OFTC "oftc.net")
614 (OpChat "opchat.org") 616 (OpChat "opchat.org")
615 (Openprojects "openprojects.net") 617 (Openprojects "openprojects.net")
616 (Othernet "othernet.org") 618 (Othernet "othernet.org")
617 (OtherSide "othersideirc.net") 619 (OtherSide "othersideirc.net")
618 (Outsiderz "outsiderz.com") 620 (Outsiderz "outsiderz.com")
735 do (return name))) 737 do (return name)))
736 'Unknown))) 738 'Unknown)))
737 739
738 (defun erc-network () 740 (defun erc-network ()
739 "Return the value of `erc-network' for the current server." 741 "Return the value of `erc-network' for the current server."
740 (with-current-buffer (erc-server-buffer) erc-network)) 742 (erc-with-server-buffer erc-network))
741 743
742 (defun erc-current-network () 744 (defun erc-current-network ()
743 "Deprecated. Use `erc-network' instead. Return the name of this server's 745 "Deprecated. Use `erc-network' instead. Return the name of this server's
744 network as a symbol." 746 network as a symbol."
745 (with-current-buffer (erc-server-buffer) 747 (erc-with-server-buffer
746 (intern (downcase (symbol-name erc-network))))) 748 (intern (downcase (symbol-name erc-network)))))
747 749
748 (erc-make-obsolete 'erc-current-network 'erc-network 750 (erc-make-obsolete 'erc-current-network 'erc-network
749 "Obsolete since erc-networks 1.5") 751 "Obsolete since erc-networks 1.5")
750 752
751 (defun erc-network-name () 753 (defun erc-network-name ()
752 "Returns the name of the current network as a string." 754 "Returns the name of the current network as a string."
753 (with-current-buffer (erc-server-buffer) (symbol-name erc-network))) 755 (erc-with-server-buffer (symbol-name erc-network)))
754 756
755 (defun erc-set-network-name (proc parsed) 757 (defun erc-set-network-name (proc parsed)
756 "Set `erc-network' to the value returned by `erc-determine-network'." 758 "Set `erc-network' to the value returned by `erc-determine-network'."
757 (unless erc-server-connected 759 (unless erc-server-connected
758 (setq erc-network (erc-determine-network))) 760 (setq erc-network (erc-determine-network)))