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

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     06/08/07 07:43:48

Index: erc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/erc/erc.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- erc.el      7 Aug 2006 07:43:37 -0000       1.14
+++ erc.el      7 Aug 2006 07:43:48 -0000       1.15
@@ -157,8 +157,8 @@
 This can be either a string or a number."
   :group 'erc
   :type '(choice (const :tag "None" nil)
-                (const :tag "Port number" number)
-                (const :tag "Port string" string)))
+                (integer :tag "Port number")
+                (string :tag "Port string")))
 
 (defcustom erc-nick nil
   "Nickname to use if one is not provided.
@@ -2363,6 +2363,8 @@
                  msg)))
     (setq string
          (cond
+          ((null type)
+           string)
           ((listp type)
            (mapc (lambda (type)
                    (setq string
@@ -5946,12 +5948,17 @@
    (ctcp-request-to . "==> CTCP request from %n (address@hidden) to %t: %r")
    (ctcp-too-many . "Too many CTCP queries in single message. Ignoring")
    (flood-ctcp-off . "FLOOD PROTECTION: Automatic CTCP responses turned off.")
-   (flood-strict-mode . "FLOOD PROTECTION: Switched to Strict Flood Control 
mode.")
-   (disconnected . "Connection failed!  Re-establishing connection...")
-   (disconnected-noreconnect . "Connection failed!  Not re-establishing 
connection.")
+   (flood-strict-mode
+    . "FLOOD PROTECTION: Switched to Strict Flood Control mode.")
+   (disconnected . "\n\nConnection failed!  Re-establishing connection...\n")
+   (disconnected-noreconnect
+    . "\n\nConnection failed!  Not re-establishing connection.\n")
+   (finished . "\n\n*** ERC finished ***\n")
+   (terminated . "\n\n*** ERC terminated: %e\n")
    (login . "Logging in as \'%n\'...")
    (nick-in-use . "%n is in use. Choose new nickname: ")
-   (nick-too-long . "WARNING: Nick length (%i) exceeds max NICKLEN(%l) defined 
by server")
+   (nick-too-long
+    . "WARNING: Nick length (%i) exceeds max NICKLEN(%l) defined by server")
    (no-default-channel . "No default channel")
    (no-invitation . "You've got no invitation")
    (no-target . "No target")