Changeset 4200 for trunk/lisp/erc/erc-backend.el

Timestamp:

04/07/07 15:49:28 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/erc/erc-backend.el (modified) (15 diffs)

trunk/lisp/erc/erc-backend.el

@@ -175 +175 @@
-;;; Server and connection state
-
+(defvar erc-server-ping-timer-alist nil
+  "Mapping of server buffers to their specific ping timer.")
+
-(defvar erc-server-connected nil
-
-
+
+
+
+
+
-(make-variable-buffer-local 'erc-server-connected)
-
@@ -188 +194 @@
-(make-variable-buffer-local 'erc-server-quitting)
-
+(defvar erc-server-reconnecting nil
+  "Non-nil if the user requests an explicit reconnect, and the
+current IRC process is still alive.")
+(make-variable-buffer-local 'erc-server-reconnecting)
+
+(defvar erc-server-timed-out nil
+  "Non-nil if the IRC server failed to respond to a ping.")
+(make-variable-buffer-local 'erc-server-timed-out)
+
-(defvar erc-server-banned nil
-  "Non-nil if the user is denied access because of a server ban.")
-(make-variable-buffer-local 'erc-server-banned)
+
+(defvar erc-server-error-occurred nil
+  "Non-nil if the user triggers some server error.")
+(make-variable-buffer-local 'erc-server-error-occurred)
-
-(defvar erc-server-lines-sent nil
@@ -210 +229 @@
-This is useful for flood protection.")
-(make-variable-buffer-local 'erc-server-last-ping-time)
+
+(defvar erc-server-last-received-time nil
+  "Time the last message was received from the server.
+This is useful for detecting hung connections.")
+(make-variable-buffer-local 'erc-server-last-received-time)
-
-(defvar erc-server-lag nil
@@ -388 +412 @@
-;; Ping handling
-
-9
+3
-  "*Interval of sending pings to the server, in seconds.
-If this is set to nil, pinging the server is disabled."
-  :group 'erc-server
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defvar erc-server-ping-handler nil
@@ -425 +462 @@
-    (buffer-string)))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defun erc-server-process-alive ()
@@ -448 +505 @@
-;;;; Connecting to a server
-
-
-
-current buffer
+ buffer
+ using the specified SERVER and PORT
+buffer given by BUFFER
-  (let ((msg (erc-format-message 'connect ?S server ?p port)))
-    (message "%s" msg)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  (erc-log "\n\n\n********************************************\n")
-
+
+
+
-  ;; wait with script loading until we receive a confirmation (first
-  ;; MOTD line)
@@ -480 +545 @@
-      ;; it's a bit unclear otherwise that it's attempting to establish a
-      ;; connection
-
-
+
-    (erc-login)))
-
@@ -502 +566 @@
-  "The process filter for the ERC server."
-  (with-current-buffer (process-buffer process)
+    (setq erc-server-last-received-time (erc-current-time))
-    ;; If you think this is written in a weird way - please refer to the
-    ;; docstring of `erc-server-processing-p'
@@ -530 +595 @@
-  "Return non-nil if ERC should attempt to reconnect automatically.
-EVENT is the message received from the closed connection process."
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defun erc-process-sentinel-1 (event)
@@ -563 +632 @@
-            (condition-case err
-                (progn
+                  (setq erc-server-reconnecting nil)
-                  (erc-server-reconnect)
-                  (setq erc-server-reconnect-count 0))
@@ -612 +682 @@
-This is determined via `erc-encoding-coding-alist' or
-`erc-server-coding-system'."
+  (unless target (setq target (erc-default-target)))
-  (or (when target
-        (let ((case-fold-search t))
@@ -657 +728 @@
-  (erc-log (concat "erc-server-send: " string "(" (buffer-name) ")"))
-  (setq erc-server-last-sent-time (erc-current-time))
-
-
-
+
-    (when (consp encoding)
-      (setq encoding (car encoding)))
-
-
-
+
+
-          (let ((str (concat string "\r\n")))
-            (if forcep
@@ -904 +972 @@
-                  'erc-default-server-functions)))
-    (run-hook-with-args-until-success hook process message)
-
-
-
-
+
+
-
-(add-hook 'erc-default-server-functions 'erc-handle-unknown-server-response)
@@ -1063 +1129 @@
-(define-erc-response-handler (ERROR)
-  "Handle an ERROR command from the server." nil
+  (setq erc-server-error-occurred t)
-  (erc-display-message
-   parsed 'error nil 'ERROR
@@ -1447 +1514 @@
-  (erc-display-server-message proc parsed))
-
+(define-erc-response-handler (290)
+  "Handle dancer-ircd CAPAB messages." nil nil)
+
-(define-erc-response-handler (301)
-  "AWAY notice." nil