Changeset 4111 for trunk/lisp/erc/erc.el

Timestamp:

07/16/06 08:36:52 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/erc/erc.el (modified) (28 diffs)

trunk/lisp/erc/erc.el

@@ -12 +12 @@
-;;               Gergely Nagy (algernon@midgard.debian.net)
-;;               David Edmondson (dme@dme.org)
-ario Lang (mlang@delysid
+ichael Olson (mwolson@gnu
-;; Keywords: IRC, chat, client, Internet
-
@@ -37 +37 @@
-
-;; For more information, see the following URLs:
-f.net
+v.gnu.org
-;; * http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
-
-
-
-
+
+
+
+
-
-;; Installation:
@@ -67 +68 @@
-;;; Code:
-
-2
+3
-  "ERC version.  This is used by function `erc-version'.")
-
@@ -78 +79 @@
-
-(defvar erc-official-location
-rc.sf.net (comments mailto://mlang@delysid
+macswiki.org/cgi-bin/wiki/ERC (mailing list: erc-discuss@gnu
-  "Location of the ERC client on the Internet.")
-
-(defgroup erc nil
-  "Emacs Internet Relay Chat client."
-.pl?EmacsIRCClient
+/ERC
-  :prefix "erc-"
-  :group 'applications)
@@ -144 +145 @@
-
-(defcustom erc-server nil
-
+ if one is not provided
-See function `erc-compute-server' for more details on connection
-parameters and authentication."
-  :group 'erc
-
+
+
-
-(defcustom erc-port nil
-
+
+
+
-  :group 'erc
-
+
+
+
-
-(defcustom erc-nick nil
-
-
-C
+ if one is not provided
+
+This c
-In the latter case, if the first nick in the list is already in use,
-other nicks are tried in the list order.
@@ -165 +171 @@
-parameters and authentication."
-  :group 'erc
-
+:tag "None" 
-                 (string :tag "Nickname")
-string
+(string :tag "Nickname")
-
-(defcustom erc-nick-uniquifier "`"
-character
+string
-  :group 'erc
-  :type 'string)
-
-
-
-
-
+
+
+
+
+
-  :group 'erc
-  :type 'boolean)
@@ -183 +190 @@
-(defcustom erc-user-full-name nil
-  "User full name.
+
+This can be either a string or a function to call.
-
-See function `erc-compute-full-name' for more details on connection
-parameters and authentication."
-  :group 'erc
-
+
+
+
-  :set (lambda (sym val)
-         (if (functionp val)
@@ -194 +205 @@
-
-(defvar erc-password nil
-
+
+
+
-
-(defcustom erc-user-mode nil
@@ -872 +885 @@
-        (\"version\" erc-quit-reason-normal)
-        (\"home\" \"Gone home !\")
-
+^$
-If the user types \"/quit zippy\", then a Zippy the Pinhead quotation
-will be used as the quit message."
@@ -896 +909 @@
-        (\"version\" erc-part-reason-normal)
-        (\"home\" \"Gone home !\")
-
+^$
-If the user types \"/part zippy\", then a Zippy the Pinhead quotation
-will be used as the part message."
@@ -1374 +1387 @@
-  "Return the value of `erc-active-buffer' for the current server.
-Defaults to the server buffer."
-
+
+
+
+
-
-(defun erc-set-active-buffer (buffer)
@@ -1596 +1612 @@
-     nil
-     (mapcar (lambda (buf)
-
-
-
-
-
-
+
+
+
+
+
+
+
-             (buffer-list)))))
-
@@ -1761 +1778 @@
-    (const :tag "Set away status automatically" autoaway)
-    (const :tag "Join channels automatically" autojoin)
-    (const :tag "Integrate with Big Brother Database" bbdb)
-    (const :tag "Buttonize URLs, nicknames, and other text" button)
-    (const :tag "Wrap long lines" fill)
+    (const :tag "Launch an identd server on port 8113" identd)
-    (const :tag "Highlight or remove IRC control characters"
-           irccontrols)
+    (const :tag "List channels in a separate buffer" list)
-    (const :tag "Save buffers in logs" log)
-    (const :tag "Highlight pals, fools, and other keywords" match)
@@ -1777 +1795 @@
-           completion)
-    (const :tag "Complete nicknames and commands (old)" hecomplete)
+    (const :tag "Process CTCP PAGE requests from IRC" page)
-    (const :tag "Make displayed lines read-only" readonly)
-    (const :tag "Replace text in messages" replace)
@@ -2064 +2083 @@
-
-That is, if called with
+
-   (erc-select :server \"irc.freenode.net\" :full-name \"Harry S Truman\")
+
-server and full-name will be set to those values, whereas
-erc-compute-port, erc-compute-nick and erc-compute-full-name
-ose parameters' values
+`erc-compute-port', `erc-compute-nick' and `erc-compute-full-name'
+e values of the other parameters.
-  (interactive (erc-select-read-args))
-
@@ -3048 +3069 @@
-     ((functionp res) (funcall res))
-     ((stringp res) res)
-;; hopefully never reached
-s
+(s s)
+t (erc-quit-reason-normal)
-
-(defun erc-part-reason-normal (&optional s)
@@ -3075 +3096 @@
-     ((functionp res) (funcall res))
-     ((stringp res) res)
-
+
+
-
-(defun erc-cmd-QUIT (reason)
@@ -3714 +3736 @@
-
-See also `erc-display-error-notice'."
-erc-manual-set-nick-on-bad-nick-p
+(not erc-try-new-nick-p)
-          ;; how many default-nicks are left + one more try...
-          (eq erc-nick-change-attempt-count
@@ -3736 +3758 @@
-                                 nick
-                                 (if (and erc-server-connected nicklen)
-
+
+
-                                   ;; rfc2812 max nick length = 9
-                                   ;; we must assume this is the
-                                   ;; server's setting if we haven't
-                                   ;; established a connection yet
-8
+(- 9 (length erc-nick-uniquifier))
-                                erc-nick-uniquifier)))
-      (erc-cmd-NICK newnick)
@@ -5099 +5122 @@
-  "Toggle use of flood control on sent messages.
-
-non-nil
-il
+positive
+on-nil and not positive
-
-See `erc-server-flood-margin' for an explanation of the available
-flood control parameters."
-  (interactive "P")
-
+
+
+
+
-  (message "ERC flood control is %s"
-           (cond (erc-flood-protect "ON")
@@ -5131 +5157 @@
-(defun erc-get-channel-mode-from-keypress (key)
-  "Read a key sequence and call the corresponding channel mode function.
-
+,
-
-C-g means quit.
-'
+
-If \"l\" is pressed, `erc-set-channel-limit' gets called.
-If \"k\" is pressed, `erc-set-channel-key' gets called.
@@ -5385 +5411 @@
-  "Return an IRC server name.
-
-ries a number of increasingly more default methods until a non-nil value is
-
-
-
-`erc-server'
+his tries a number of increasingly more default methods until a
+
+
+ (the argument passwd to this function)
+The `erc-server' option
-- The value of the IRCSERVER environment variable
-`erc-default-server'.
+The `erc-default-server' variable
-  (or server
-      erc-server
@@ -5398 +5424 @@
-
-(defun erc-compute-nick (&optional nick)
-NICK
-
-ries a number of increasingly more default methods until a non-nil value is
-
-
-
-`erc-nick'
+IRC nick
+
+his tries a number of increasingly more default methods until a
+
+
+ (the argument passed to this function)
+The `erc-nick' option
-- The value of the IRCNICK environment variable
-via the function `user-login-name'.
+The result from the `user-login-name' function
-  (or nick
-      (if (consp erc-nick) (car erc-nick) erc-nick)
@@ -5414 +5440 @@
-
-(defun erc-compute-full-name (&optional full-name)
-FULL-NAME
-
-ries a number of increasingly more default methods until a non-nil value is
-
-
-
-`erc-user-full-name'
+full name
+
+his tries a number of increasingly more default methods until a
+
+
+ (the argument passed to this function)
+The `erc-user-full-name' option
-- The value of the IRCNAME environment variable
-via the function `user-full-name'.
+The result from the `user-full-name' function
-  (or full-name
-      erc-user-full-name
@@ -5432 +5458 @@
-  "Return a port for an IRC server.
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-;; time routines
@@ -5819 +5846 @@
-        version-string))))
-
-(defun erc-version-modules (&optional here)
-  "Show the version numbers of all loaded ERC modules in the minibuffer.
-If optional argument HERE is non-nil, insert version number at point."
-  (interactive "P")
-  (let ((version-string
-         (mapconcat 'identity
-                    (let (versions (case-fold-search nil))
-                      (dolist (var (apropos-internal "^erc-.*version$"))
-                        (when (and (boundp var)
-                                   (stringp (symbol-value var)))
-                          (setq versions (cons (format "%S: %s"
-                                                       var (symbol-value var))
-                                               versions))))
-                      versions) ", ")))
-    (if here
-        (insert version-string)
-      (if (interactive-p)
-          (message "%s" version-string)
-        version-string))))
-
-(defun erc-modes (&optional here)
-  "Show the active ERC modes in the minibuffer.
@@ -5858 +5865 @@
-          (message "%s" string)
-        string))))
-
-(defun erc-latest-version ()
-  "Retrieve the latest erc.el version from CVS."
-  (interactive)
-  (if (ignore-errors (require 'url))
-      (progn
-        (switch-to-buffer (get-buffer-create "*erc.el latest version*"))
-        (delete-region (point-min) (point-max))
-        (kill-all-local-variables)
-        (url-insert-file-contents (concat
-                                   "http://cvs.sourceforge.net/viewcvs.py/"
-                                   "*checkout*/erc/erc/erc.el?content-type"
-                                   "=text%2Fplain&rev=HEAD"))
-        (emacs-lisp-mode)
-        (current-buffer))
-    (error "URL needs to be installed")))
-
-(defun erc-ediff-latest-version ()
-  "Ediff your installed erc.el with the latest CVS version.
-See also `erc-latest-version'."
-  (interactive)
-  (let ((current (locate-library "erc.el")))
-    (if current
-        (ediff-buffers (find-file current)
-                       (erc-latest-version))
-      (error "You do not appear to have the uncompiled erc.el file"))))
-
-(defun erc-trim-string (s)
@@ -6185 +6166 @@
-       (erc-response.command vect)))
-
+;; Teach url.el how to open irc:// URLs with ERC.
+;; To activate, customize `url-irc-function' to `url-irc-erc'.
+
+;;;###autoload
+(defun erc-handle-irc-url (host port channel user password)
+  "Use ERC to IRC on HOST:PORT in CHANNEL as USER with PASSWORD.
+If ERC is already connected to HOST:PORT, simply /join CHANNEL.
+Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
+  (let ((server-buffer
+         (car (erc-buffer-filter
+               (lambda ()
+                 (and (string-equal erc-session-server host)
+                      (= erc-session-port port)
+                      erc-server-connected
+                      (eq (erc-server-buffer) (current-buffer))))))))
+    (with-current-buffer (or server-buffer (current-buffer))
+      (if (and server-buffer channel)
+          (erc-cmd-JOIN channel)
+        (erc host port (or user (erc-compute-nick)) (erc-compute-full-name)
+             (not server-buffer) password nil channel
+             (when server-buffer
+               (get-buffer-process server-buffer)))))))
+
-(provide 'erc)
-