Changeset 4200 for trunk/lisp/erc/erc.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.el (modified) (52 diffs)

trunk/lisp/erc/erc.el

@@ -67 +67 @@
-;;; Code:
-
- stable pre-release
+
-  "ERC version.  This is used by function `erc-version'.")
-
@@ -325 +325 @@
-(defcustom erc-connect-pre-hook '(erc-initialize-log-marker)
-  "Hook called just before `erc' calls `erc-connect'.
-run in the buffer-to-be
+passed a buffer as the first argument
-  :group 'erc-hooks
-  :type 'hook)
@@ -393 +393 @@
-  "Finds the USER corresponding to NICK in the current server's
-`erc-server-users' hash table."
-with-current-buffer (process-buffer erc-server-process)
+erc-with-server-buffer
-    (gethash (erc-downcase nick) erc-server-users)))
-
@@ -400 +400 @@
-
-Adds USER with nickname NICK to the `erc-server-users' hash table."
-with-current-buffer (process-buffer erc-server-process)
+erc-with-server-buffer
-    (puthash (erc-downcase nick) user erc-server-users)))
-
@@ -411 +411 @@
-
-See also: `erc-remove-user'."
-with-current-buffer (process-buffer erc-server-process)
+erc-with-server-buffer
-    (remhash (erc-downcase nick) erc-server-users)))
-
@@ -422 +422 @@
-  (let ((nick (erc-server-user-nickname user)))
-    (setf (erc-server-user-nickname user) new-nick)
-with-current-buffer (process-buffer erc-server-process)
+erc-with-server-buffer
-      (remhash (erc-downcase nick) erc-server-users)
-      (puthash (erc-downcase new-nick) user erc-server-users))
@@ -515 +515 @@
-(defun erc-get-server-nickname-list ()
-  "Returns a list of known nicknames on the current server."
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-(defun erc-get-channel-nickname-list ()
@@ -539 +538 @@
-(defun erc-get-server-nickname-alist ()
-  "Returns an alist of known nicknames on the current server."
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-(defun erc-get-channel-nickname-alist ()
@@ -1294 +1292 @@
-    (error
-     "You should only run `erc-once-with-server-event' in a server buffer"))
-erc-gensym
+make-symbol "fun"
-        (hook (erc-get-hook event)))
-     (put fun 'erc-original-buffer (current-buffer))
@@ -1317 +1315 @@
-When FORMS execute, the current buffer is the server buffer associated with the
-connection over which the data was received that triggered EVENT."
-erc-gensym
+make-symbol "fun"
-        (hook (erc-get-hook event)))
-     (fset fun `(lambda (proc parsed)
@@ -1371 +1369 @@
-  "Return non-nil if NICK is online."
-  (interactive "sNick: ")
-with-current-buffer (erc-server-buffer)
+erc-with-server-buffer
-    (let ((erc-online-p 'unknown))
-      (erc-once-with-server-event
@@ -1421 +1419 @@
-  "Return the value of `erc-active-buffer' for the current server.
-Defaults to the server buffer."
-with-current-buffer (erc-server-buffer)
+erc-with-server-buffer
-    (if (buffer-live-p erc-active-buffer)
-        erc-active-buffer
@@ -1604 +1602 @@
-
-\(fn (TARGET [PROCESS]) BODY...)"
-erc-gensym
-erc-gensym
-erc-gensym
-erc-gensym
+make-symbol "buf"
+make-symbol "proc"
+make-symbol "target"
+make-symbol "process"
-    `(let* ((,target ,(car spec))
-            (,process ,(cadr spec))
@@ -1617 +1615 @@
-                      (if (and ,target ,proc)
-                          (erc-get-buffer ,target ,proc))))))
-,buf
+(buffer-live-p ,buf)
-         (with-current-buffer ,buf
-           ,@body)))))
@@ -1672 +1670 @@
-nil."
-  ;; Make the evaluation have the correct order
-erc-gensym
-erc-gensym
+make-symbol "pre"
+make-symbol "pro"
-    `(let ((,pro ,process)
-           (,pre ,pred))
@@ -1756 +1754 @@
-
-(defvar erc-away nil
-
+
+
+
+
-(make-variable-buffer-local 'erc-away)
-
@@ -1814 +1815 @@
-  '(set
-    :greedy t
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-           irccontrols)
-
-
-
-
-
+log: 
+match: 
+menu: 
+netsplit: 
+noncommands: 
-           noncommands)
-
+
+
-           notify)
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-           services)
-
-
+smiley: 
+sound: 
-           sound)
-
-
-
-
-
+stamp: 
+spelling: 
+track: 
+truncate: 
+unmorse: 
-    (repeat :tag "Others" :inline t symbol))
-  :group 'erc)
@@ -1903 +1904 @@
-(defun erc-open (&optional server port nick full-name
-                           connect passwd tgt-list channel process)
-
-
-
+
-
-If CONNECT is non-nil, connect to the server.  Otherwise assume
@@ -1970 +1969 @@
-    ;; last invitation channel
-    (setq erc-invitation nil)
-    ;; away flag
-    ;; Should only be used in session-buffers
-    (setq erc-away (let ((serverbuf (erc-server-buffer)))
-                     (and serverbuf (with-current-buffer serverbuf erc-away))))
-    ;; Server channel list
-    (setq erc-channel-list ())
@@ -1988 +1983 @@
-          (when erc-log-p
-            (get-buffer-create (concat "*ERC-DEBUG: " server "*"))))
-
-
-
-
-
-
-
-
-
+
-    (unless continued-session
-      (goto-char (point-max))
-      (insert "\n"))
-    (set-marker (process-mark erc-server-process) (point))
-    (if continued-session
-        (goto-char old-point)
@@ -2006 +1992 @@
-      (erc-display-prompt)
-      (goto-char (point-max)))
+
+    (erc-determine-parameters server port nick full-name)
+
+    ;; Saving log file on exit
+    (run-hook-with-args 'erc-connect-pre-hook buffer)
+
+    (when connect
+      (erc-server-connect erc-session-server erc-session-port buffer))
+    (erc-update-mode-line)
-
-    ;; Now display the buffer in a window as per user wishes.
@@ -2017 +2012 @@
-    buffer))
-
-
-
+
+
+
+
-    (setq erc-last-saved-position (make-marker))
-    (move-marker erc-last-saved-position
-
+)
-
-;; interactive startup
@@ -2121 +2118 @@
-                  password
-                  (full-name (erc-compute-full-name)))
-
-
+
+
+
+
+
+
-   (server (erc-compute-server))
-   (port   (erc-compute-port))
@@ -2133 +2134 @@
-   (erc :server \"irc.freenode.net\" :full-name \"Harry S Truman\")
-
-
+then the 
-`erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will
-be invoked for the values of the other parameters."
@@ -2139 +2140 @@
-  (erc-open server port nick full-name t password))
-
+;;;###autoload
-(defalias 'erc-select 'erc)
-
@@ -2429 +2431 @@
-This function relies on the erc-parsed text-property being
-present."
-get-text-property position 'erc-parsed
+erc-get-parsed-vector position
-    (and prop-val (member (erc-response.command prop-val) list))))
-
@@ -2587 +2589 @@
-         (erc-make-notice (format "Now ignoring %s" user))
-         'active)
-
-
-
+
+
-        (erc-display-line (erc-make-notice "Ignore list is empty") 'active)
-      (erc-display-line (erc-make-notice "Ignore list:") 'active)
@@ -2595 +2596 @@
-                (erc-display-line (erc-make-notice item)
-                                  'active))
-with-current-buffer (erc-server-buffer)
+erc-with-server-buffer
-  t)
-
-(defun erc-cmd-UNIGNORE (user)
-  "Remove the user specified in USER from the ignore list."
-with-current-buffer (erc-server-buffer)
+erc-with-server-buffer
-                             (erc-member-ignore-case (regexp-quote user)
-                                                     erc-ignore-list)))))
@@ -2615 +2616 @@
-       (erc-make-notice (format "No longer ignoring %s" user))
-       'active)
-with-current-buffer (erc-server-buffer)
+erc-with-server-buffer
-        (setq erc-ignore-list (delete ignored-nick erc-ignore-list)))))
-  t)
@@ -2674 +2675 @@
-  ;; on all server buffers.
-  (erc-with-all-buffers-of-server nil
-#'erc
-
+ #'erc-open
+ 
-(put 'erc-cmd-GAWAY 'do-not-parse-args t)
-
@@ -2867 +2868 @@
-(defun erc-cmd-IDLE (nick)
-  "Show the length of time NICK has been idle."
-
-
+
-        symlist)
-with-current-buffer serverbuf
+erc-with-server-buffer
-      (add-to-list 'symlist
-                   (cons (erc-once-with-server-event
@@ -3028 +3028 @@
-  "Change current nickname to NICK."
-  (erc-log (format "cmd: NICK: %s (erc-bad-nick: %S)" nick erc-bad-nick))
-with-current-buffer (erc-server-buffer)
-   
+erc-with-server-buffer
+       
-    (and nicklen (> (length nick) (string-to-number nicklen))
-         (erc-display-message
@@ -3168 +3168 @@
-    (let* ((s (match-string 1 reason))
-           (buffer (erc-server-buffer))
-
+
+
-      (with-current-buffer (if (and buffer
-                                    (bufferp buffer))
@@ -3176 +3177 @@
-        (setq erc-server-quitting t)
-        (erc-set-active-buffer (erc-server-buffer))
+        (setq server-proc erc-server-process)
-        (erc-server-send (format "QUIT :%s" reason)))
-erc-server-process
+server-proc
-      (when erc-kill-queries-on-quit
-
+
+
+
+
+
+
+
+
-    t)
-   (t nil)))
@@ -3190 +3199 @@
-(defun erc-cmd-GQUIT (reason)
-  "Disconnect from all servers at once with the same quit REASON."
-
-
-
+
-                                  (erc-cmd-QUIT reason)))
-
@@ -3200 +3207 @@
-(defun erc-cmd-RECONNECT ()
-  "Try to reconnect to the current IRC server."
-
-
+
+
+
+
+
+
+
+
+
+
+
-  t)
-
@@ -3374 +3390 @@
-              erc-channel-banlist nil)
-        ;; fetch the ban list then callback
-with-current-buffer (erc-server-buffer)
+erc-with-server-buffer
-          (erc-once-with-server-event
-           368
@@ -3444 +3460 @@
-        (setq erc-server-367-functions 'erc-banlist-store)
-      ;; fetch the ban list then callback
-with-current-buffer (erc-server-buffer)
+erc-with-server-buffer
-        (erc-once-with-server-event
-         368
@@ -3738 +3754 @@
-    buf))
-
-nil
+'bury
-  "If non-nil, create a query buffer each time you receive a private message.
-
@@ -3812 +3828 @@
-    (let ((newnick (nth 1 erc-default-nicks))
-          (nicklen (cdr (assoc "NICKLEN"
-with-current-buffer (erc-server-buffer)
+erc-with-server-buffer
-                                 erc-server-parameters)))))
-      (setq erc-bad-nick t)
@@ -4102 +4118 @@
-
-Set user modes and run `erc-after-connect' hook."
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defun erc-display-error-notice (parsed string)
@@ -4346 +4367 @@
-        (cond
-         (away-p
-
-
+
-         (t
-          (let ((away-time erc-away))
-            ;; away must be set to NIL BEFORE sending anything to prevent
-            ;; an infinite recursion
-
-
+
-            (save-excursion
-              (set-buffer (erc-active-buffer))
@@ -5038 +5057 @@
-(defun erc-set-current-nick (nick)
-  "Set the current nickname to NICK."
-
-
+
+
+
-    (setq erc-server-current-nick nick)))
-
@@ -5120 +5140 @@
-match, returns that regexp."
-  (catch 'found
-with-current-buffer (erc-server-buffer)
+erc-with-server-buffer
-      (if (string-match ignored spec)
-          (throw 'found ignored)))))
@@ -5674 +5694 @@
-        user))))
-
-p
-t if the current ERC process is set away."
-
-
-
-        erc-away)
+time
+non-nil if the current ERC process is set away.
+
+
+
+  (erc-with-server-buffer erc-away
-
-;; Mode line handling
@@ -5707 +5727 @@
-Only used starting in Emacs 21.
-
+Set this to nil if you do not want the header line to be
+displayed.
+
-See `erc-mode-line-format' for which characters are can be used."
-  :group 'erc-mode-line-and-header
-
+
+
+
+
+
+
-
-(defcustom erc-header-line-uses-help-echo-p t
@@ -5735 +5763 @@
-(defcustom erc-common-server-suffixes
-  '(("openprojects.net$" . "OPN")
-
+
+
-  "Alist of common server name suffixes.
-This variable is used in mode-line display to save screen
@@ -5787 +5816 @@
-  "Return a formatted `erc-mode-line-away-status-format'
-if `erc-away' is non-nil."
-
-
-
+
-    (if a
-        (format-time-string erc-mode-line-away-status-format a)
@@ -5814 +5841 @@
-(defun erc-format-lag-time ()
-  "Return the estimated lag time to server, `erc-server-lag'."
-
-
-
+
-    (cond (lag (format "lag:%.0f" lag))
-          (t ""))))
@@ -6138 +6163 @@
-              nick user host channel
-              (if (not (string= reason ""))
-
+
+
-                "")))))
-
@@ -6233 +6259 @@
-  (text-property-not-all (point-min) (point-max) 'erc-parsed nil))
-
+(defun erc-restore-text-properties ()
+  "Restore the property 'erc-parsed for the region."
+  (let ((parsed-posn (erc-find-parsed-property)))
+    (put-text-property
+     (point-min) (point-max)
+     'erc-parsed (when parsed-posn (erc-get-parsed-vector parsed-posn)))))
+
-(defun erc-get-parsed-vector (point)
-  "Return the whole parsed vector on POINT."
@@ -6264 +6297 @@
-                 (and (string-equal erc-session-server host)
-                      (= erc-session-port port)
-
-
+
-    (with-current-buffer (or server-buffer (current-buffer))
-      (if (and server-buffer channel)