mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

ERC: Upstream updates.

Browse source 
- 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.
This commit is contained in:
Michael Olson 2008-06-19 04:59:11 +00:00
parent dced1efdff
commit 40ef824252
4 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lisp/erc/ChangeLog
View file

@ -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>

7
lisp/erc/erc-backend.el
View file

@ -1684,6 +1684,13 @@ See `erc-display-server-message'." nil
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)))

5
lisp/erc/erc-services.el
View file

@ -232,10 +232,11 @@ Example of use:
"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."

11
lisp/erc/erc.el
View file

@ -2368,8 +2368,8 @@ If STRING is nil, the function does nothing."
(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 @@ each property to the corresponding value in VALUE-LIST."
(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 @@ All windows are opened in the current frame."
(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")