Mercurial > emacs
changeset 96081:116dc7c6e345
ERC: Upstream updates.
- New response handler for '328'.
- Update nickserv regexps for freenode.
- Back out changes to erc-put-text-properties in favor of upstream
changes to that same effect.
- Fix arguments to erc-put-text-properties in erc-display-line-1.
| author | Michael Olson <mwolson@gnu.org> |
|---|---|
| date | Thu, 19 Jun 2008 04:59:11 +0000 |
| parents | 2b046bd8b819 |
| children | c506399f3c92 |
| files | lisp/erc/ChangeLog lisp/erc/erc-backend.el lisp/erc/erc-services.el lisp/erc/erc.el |
| diffstat | 4 files changed, 31 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/erc/ChangeLog Thu Jun 19 02:17:16 2008 +0000 +++ b/lisp/erc/ChangeLog Thu Jun 19 04:59:11 2008 +0000 @@ -3,6 +3,17 @@ * erc/erc-autoaway.el, erc/erc-ibuffer.el, erc/erc-menu.el: * erc/erc-stamp.el, erc/erc.el: Remove unnecessary eval-when-compiles. +2008-05-30 Diane Murray <disumu@x3y2z1.net> + + * erc-backend.el (328): New response handler. + + * erc.el (english): Added 328 to catalog. + +2008-05-29 Diane Murray <disumu@x3y2z1.net> + + * erc-services.el (erc-nickserv-alist): Updated REGEXP and + SUCCESS-REGEXP for freenode. + 2008-05-05 Juanma Barranquero <lekktu@gmail.com> * erc-goodies.el (erc-noncommands-list, noncommands) @@ -10,9 +21,11 @@ (erc-interpret-mirc-color): Fix typos in docstrings. (erc-controls-highlight): Reflow docstring. -2008-04-27 Glenn Morris <rgm@gnu.org> +2008-04-26 Johan Bockgård <bojohan@gnu.org> - * erc.el (erc-put-text-properties): Replace use of cl mapcar*. + * erc.el (erc-put-text-properties): Don't use mapcar*. + (erc-display-line-1): Fix argument order in call to + erc-put-text-properties. 2008-04-14 Michael Olson <mwolson@gnu.org>
--- a/lisp/erc/erc-backend.el Thu Jun 19 02:17:16 2008 +0000 +++ b/lisp/erc/erc-backend.el Thu Jun 19 04:59:11 2008 +0000 @@ -1684,6 +1684,13 @@ parsed 'notice (erc-get-buffer channel proc) 's324 ?c channel ?m modes))) +(define-erc-response-handler (328) + "Channel URL (on freenode network)." nil + (let ((channel (second (erc-response.command-args parsed))) + (url (erc-response.contents parsed))) + (erc-display-message parsed 'notice (erc-get-buffer channel proc) + 's328 ?c channel ?u url))) + (define-erc-response-handler (329) "Channel creation date." nil (let ((channel (second (erc-response.command-args parsed)))
--- a/lisp/erc/erc-services.el Thu Jun 19 02:17:16 2008 +0000 +++ b/lisp/erc/erc-services.el Thu Jun 19 04:59:11 2008 +0000 @@ -232,10 +232,11 @@ "NickServ!NickServ@services." ;; freenode also accepts a password at login, see the `erc' ;; :password argument. - "/msg\\s-NickServ\\s-IDENTIFY\\s-<password>" + "This\\s-nickname\\s-is\\s-registered.\\s-Please\\s-choose" "NickServ" "IDENTIFY" nil nil - "Password\\s-accepted\\s--\\s-you\\s-are\\s-now\\s-recognized") + ;; See also the 901 response code message. + "You\\s-are\\s-now\\s-identified\\s-for\\s-") (GalaxyNet "NS!nickserv@galaxynet.org" "Please\\s-change\\s-nicks\\s-or\\s-authenticate."
--- a/lisp/erc/erc.el Thu Jun 19 02:17:16 2008 +0000 +++ b/lisp/erc/erc.el Thu Jun 19 04:59:11 2008 +0000 @@ -2368,8 +2368,8 @@ (unless (string-match "\n$" string) (setq string (concat string "\n")) (when (erc-string-invisible-p string) - (erc-put-text-properties 0 (length string) string - '(invisible intangible)))) + (erc-put-text-properties 0 (length string) + '(invisible intangible) string))) (erc-log (concat "erc-display-line: " string (format "(%S)" string) " in buffer " (format "%s" buffer))) @@ -5040,9 +5040,9 @@ (setq value-list (mapcar (lambda (x) t) properties))) - (dotimes (i (min (length properties) (length value-list))) - (erc-put-text-property start end (nth i properties) - (nth i value-list) object))) + (while (and properties value-list) + (erc-put-text-property + start end (pop properties) (pop value-list) object))) ;;; Input area handling: @@ -6312,6 +6312,7 @@ (s321 . "Channel Users Topic") (s322 . "%c [%u] %t") (s324 . "%c modes: %m") + (s328 . "%c URL: %u") (s329 . "%c was created on %t") (s330 . "%n %a %i") (s331 . "No topic is set for %c")