mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Recognize ASCII and strict CASEMAPPINGs in ERC

Browse source 
* lisp/erc/erc.el (erc-downcase, erc--casemapping-rfc1459-strict,
erc--casemapping-rfc1459): Add new translation tables for the latter
two mappings and use them in `erc-downcase'.

* test/lisp/erc/erc-tests.el: Add test for `erc-downcase'.
This commit is contained in:
F. Jason Park 2021-10-05 19:03:56 -07:00
parent c356f86b51
commit ecafe1cbb5
2 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lisp/erc/erc.el
View file

@ -393,18 +393,30 @@ erc-channel-user struct.")
"Hash table of users on the current server.
It associates nicknames with `erc-server-user' struct instances.")
(defconst erc--casemapping-rfc1459
(make-translation-table
'((?\[ . ?\{) (?\] . ?\}) (?\\ . ?\|) (?~ . ?^))
(mapcar (lambda (c) (cons c (+ c 32))) "ABCDEFGHIJKLMNOPQRSTUVWXYZ")))
(defconst erc--casemapping-rfc1459-strict
(make-translation-table
'((?\[ . ?\{) (?\] . ?\}) (?\\ . ?\|))
(mapcar (lambda (c) (cons c (+ c 32))) "ABCDEFGHIJKLMNOPQRSTUVWXYZ")))
(defun erc-downcase (string)
"Convert STRING to IRC standard conforming downcase."
(let ((s (downcase string))
(c '((?\[ . ?\{)
(?\] . ?\})
(?\\ . ?\|)
(?~ . ?^))))
(save-match-data
(while (string-match "[]\\[~]" s)
(aset s (match-beginning 0)
(cdr (assq (aref s (match-beginning 0)) c)))))
s))
"Return a downcased copy of STRING with properties.
Use the CASEMAPPING ISUPPORT parameter to determine the style."
(let* ((mapping (erc--get-isupport-entry 'CASEMAPPING 'single))
(inhibit-read-only t))
(if (equal mapping "ascii")
(downcase string)
(with-temp-buffer
(insert string)
(translate-region (point-min) (point-max)
(if (equal mapping "rfc1459-strict")
erc--casemapping-rfc1459-strict
erc--casemapping-rfc1459))
(buffer-string)))))
(defmacro erc-with-server-buffer (&rest body)
"Execute BODY in the current ERC server buffer.

24
test/lisp/erc/erc-tests.el
View file

@ -442,6 +442,30 @@
(erc-call-hooks nil parsed))
(should (= hooked 2)))))
(ert-deftest erc-downcase ()
(let ((erc--isupport-params (make-hash-table)))
(puthash 'PREFIX '("(ov)@+") erc--isupport-params)
(puthash 'BOT '("B") erc--isupport-params)
(ert-info ("ascii")
(puthash 'CASEMAPPING '("ascii") erc--isupport-params)
(should (equal (erc-downcase "Bob[m]`") "bob[m]`"))
(should (equal (erc-downcase "Tilde~") "tilde~" ))
(should (equal (erc-downcase "\\O/") "\\o/" )))
(ert-info ("rfc1459")
(puthash 'CASEMAPPING '("rfc1459") erc--isupport-params)
(should (equal (erc-downcase "Bob[m]`") "bob{m}`" ))
(should (equal (erc-downcase "Tilde~") "tilde^" ))
(should (equal (erc-downcase "\\O/") "|o/" )))
(ert-info ("rfc1459-strict")
(puthash 'CASEMAPPING '("rfc1459-strict") erc--isupport-params)
(should (equal (erc-downcase "Bob[m]`") "bob{m}`"))
(should (equal (erc-downcase "Tilde~") "tilde~" ))
(should (equal (erc-downcase "\\O/") "|o/" )))))
(ert-deftest erc-ring-previous-command-base-case ()
(ert-info ("Create ring when nonexistent and do nothing")
(let (erc-input-ring