# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1154936628 0
# Node ID 430a916ae2ba943cfa71a1d415e2a62156dd6d62
# Parent  ddc702799326a5861f22f1fa0e347d8829ad7f5a
Update from erc--emacs--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-388
Creator:  Michael Olson <mwolson@gnu.org>

diff -r ddc702799326 -r 430a916ae2ba lisp/erc/ChangeLog
--- a/lisp/erc/ChangeLog	Mon Aug 07 07:43:37 2006 +0000
+++ b/lisp/erc/ChangeLog	Mon Aug 07 07:43:48 2006 +0000
@@ -1,3 +1,18 @@
+2006-08-07  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-process-sentinel-1): Use erc-display-message
+	in several places instead of inserting text.
+	(erc-process-sentinel): Move to the input-marker before removing
+	the prompt.
+
+	* erc.el (erc-port): Fix customization options.
+	(erc-display-message): Handle null type explicitly.  Previously,
+	this was relying on a chance side-effect.  Cosmetic indentation
+	tweak.
+	(english): Add 'finished and 'terminated entries to the catalog.
+	Add initial and terminal newlines to 'disconnected and
+	'disconnected-noreconnect entries.  Avoid long lines.
+
 2006-08-06  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
diff -r ddc702799326 -r 430a916ae2ba lisp/erc/erc-backend.el
--- a/lisp/erc/erc-backend.el	Mon Aug 07 07:43:37 2006 +0000
+++ b/lisp/erc/erc-backend.el	Mon Aug 07 07:43:48 2006 +0000
@@ -493,11 +493,7 @@
   (if erc-server-quitting
       ;; normal quit
       (progn
-        (let ((string "\n\n*** ERC finished ***\n")
-              (inhibit-read-only t))
-          (erc-put-text-property 0 (length string)
-                                 'face 'erc-error-face string)
-          (insert string))
+        (erc-display-message nil 'error (current-buffer) 'finished)
         (when erc-kill-server-buffer-on-quit
           (set-buffer-modified-p nil)
           (kill-buffer (current-buffer))))
@@ -519,12 +515,8 @@
         (erc erc-session-server erc-session-port erc-server-current-nick
              erc-session-user-full-name t erc-session-password)
       ;; terminate, do not reconnect
-      (let ((string (concat "\n\n*** ERC terminated: " event
-                            "\n"))
-            (inhibit-read-only t))
-        (erc-put-text-property 0 (length string)
-                               'face 'erc-error-face string)
-        (insert string)))))
+      (erc-display-message nil 'error (current-buffer)
+                           'terminated ?e event))))
 
 (defun erc-process-sentinel (cproc event)
   "Sentinel function for ERC process."
@@ -545,6 +537,7 @@
         (run-hook-with-args 'erc-disconnected-hook
                             (erc-current-nick) (system-name) "")
         ;; Remove the prompt
+        (goto-char (or (marker-position erc-input-marker) (point-max)))
         (forward-line 0)
         (erc-remove-text-properties-region (point) (point-max))
         (delete-region (point) (point-max))
diff -r ddc702799326 -r 430a916ae2ba lisp/erc/erc.el
--- a/lisp/erc/erc.el	Mon Aug 07 07:43:37 2006 +0000
+++ b/lisp/erc/erc.el	Mon Aug 07 07:43:48 2006 +0000
@@ -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
@@ -2375,7 +2377,7 @@
     (if (not (erc-response-p parsed))
 	(erc-display-line string buffer)
       (unless (member (erc-response.command parsed) erc-hide-list)
-      (erc-put-text-property 0 (length string) 'erc-parsed parsed string)
+	(erc-put-text-property 0 (length string) 'erc-parsed parsed string)
 	(erc-put-text-property 0 (length string) 'rear-sticky t string)
 	(erc-display-line string buffer)))))
 
@@ -5946,12 +5948,17 @@
    (ctcp-request-to . "==> CTCP request from %n (%u@%h) 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")