Mercurial > emacs
comparison lisp/erc/erc-join.el @ 69942:45937d0cd26d
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-208
Creator: Michael Olson <mwolson@gnu.org>
Sync from erc--emacs--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 11 Apr 2006 22:09:49 +0000 |
parents | 7010bb070445 |
children | 7a3f13e2dd57 |
comparison
equal
deleted
inserted
replaced
69941:b561f476cb6a | 69942:45937d0cd26d |
---|---|
90 (nick (car (erc-parse-user (erc-response.sender parsed)))) | 90 (nick (car (erc-parse-user (erc-response.sender parsed)))) |
91 (server (with-current-buffer (process-buffer proc) | 91 (server (with-current-buffer (process-buffer proc) |
92 (or erc-server-announced-name erc-session-server)))) | 92 (or erc-server-announced-name erc-session-server)))) |
93 (when (erc-current-nick-p nick) | 93 (when (erc-current-nick-p nick) |
94 (when (and erc-autojoin-domain-only | 94 (when (and erc-autojoin-domain-only |
95 (string-match "[^.]+\\.\\([^.]+\\.[^.]+\\)$" server)) | 95 (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server)) |
96 (setq server (match-string 1 server))) | 96 (setq server (match-string 1 server))) |
97 (let ((elem (assoc server erc-autojoin-channels-alist))) | 97 (let ((elem (assoc server erc-autojoin-channels-alist))) |
98 (if elem | 98 (if elem |
99 (unless (member chnl (cdr elem)) | 99 (unless (member chnl (cdr elem)) |
100 (setcdr elem (cons chnl (cdr elem)))) | 100 (setcdr elem (cons chnl (cdr elem)))) |
113 (nick (car (erc-parse-user (erc-response.sender parsed)))) | 113 (nick (car (erc-parse-user (erc-response.sender parsed)))) |
114 (server (with-current-buffer (process-buffer proc) | 114 (server (with-current-buffer (process-buffer proc) |
115 (or erc-server-announced-name erc-session-server)))) | 115 (or erc-server-announced-name erc-session-server)))) |
116 (when (erc-current-nick-p nick) | 116 (when (erc-current-nick-p nick) |
117 (when (and erc-autojoin-domain-only | 117 (when (and erc-autojoin-domain-only |
118 (string-match "[^.]+\\.\\([^.]+\\.[^.]+\\)$" server)) | 118 (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server)) |
119 (setq server (match-string 1 server))) | 119 (setq server (match-string 1 server))) |
120 (let ((elem (assoc server erc-autojoin-channels-alist))) | 120 (let ((elem (assoc server erc-autojoin-channels-alist))) |
121 (when elem | 121 (when elem |
122 (setcdr elem (delete chnl (cdr elem))) | 122 (setcdr elem (delete chnl (cdr elem))) |
123 (unless (cdr elem) | 123 (unless (cdr elem) |