Show
Ignore:
Timestamp:
04/07/07 15:49:28 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lisp/erc/erc-networks.el

    r4190 r4200  
    318318  ("Nullrouted: Random server" Nullrouted "irc.nullrouted.org" ((6666 6669) 7000 )) 
    319319  ("NullusNet: Random server" NullusNet "irc.nullus.net" 6667) 
     320  ("OFTC: Random server" OFTC "irc.oftc.net" ((6667 6670) 7000)) 
    320321  ("OpChat: Random server" OpChat "irc.opchat.org" ((6667 6669))) 
    321322  ("Othernet: Random server" Othernet "irc.othernet.org" 6667) 
     
    612613    (Nullrouted "nullrouted.org") 
    613614    (NullusNet "nullus.net") 
     615    (OFTC "oftc.net") 
    614616    (OpChat "opchat.org") 
    615617    (Openprojects "openprojects.net") 
     
    738740(defun erc-network () 
    739741  "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)) 
    741743 
    742744(defun erc-current-network () 
    743745  "Deprecated.  Use `erc-network' instead.  Return the name of this server's 
    744746network as a symbol." 
    745   (with-current-buffer (erc-server-buffer) 
     747  (erc-with-server-buffer 
    746748    (intern (downcase (symbol-name erc-network))))) 
    747749 
     
    751753(defun erc-network-name () 
    752754  "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))) 
    754756 
    755757(defun erc-set-network-name (proc parsed)