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

; Fix overridden erc--input-split slot definition

Browse source 
* lisp/erc/erc-common.el (erc--input-split): Don't set the
default value to `:read-only'.

* test/lisp/erc/erc-tests.el (erc--channel-modes,
erc--channel-modes/graphic-p): Use `char-displayable-p' instead of
`display-graphic-p' to prevent the first test from failing on Unicode
terminal emulators.
This commit is contained in:
F. Jason Park 2024-01-09 14:50:43 -08:00
parent c7c143b019
commit cfa64bdc84
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/erc/erc-common.el
View file

@ -52,7 +52,7 @@
string insertp sendp) string insertp sendp)
(cl-defstruct (erc--input-split (:include erc-input (cl-defstruct (erc--input-split (:include erc-input
(string :read-only) (string "" :read-only t)
(insertp erc-insert-this) (insertp erc-insert-this)
(sendp (with-suppressed-warnings (sendp (with-suppressed-warnings
((obsolete erc-send-this)) ((obsolete erc-send-this))

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

@ -849,7 +849,7 @@
;; truncation ellipsis when run interactively. Rather than have ;; truncation ellipsis when run interactively. Rather than have
;; hard-to-read "nondeterministic" comparisons against sets of ;; hard-to-read "nondeterministic" comparisons against sets of
;; acceptable values, we use separate tests. ;; acceptable values, we use separate tests.
(when (display-graphic-p) (ert-pass)) (when (char-displayable-p ?…) (ert-pass))
;; Truncation cache populated and used. ;; Truncation cache populated and used.
(let ((cache (erc--channel-mode-types-shortargs erc--channel-mode-types)) (let ((cache (erc--channel-mode-types-shortargs erc--channel-mode-types))
@ -877,7 +877,7 @@
(ert-deftest erc--channel-modes/graphic-p () (ert-deftest erc--channel-modes/graphic-p ()
:tags `(:unstable ,@(and (getenv "ERC_TESTS_GRAPHICAL") :tags `(:unstable ,@(and (getenv "ERC_TESTS_GRAPHICAL")
'(:erc--graphical))) '(:erc--graphical)))
(unless (display-graphic-p) (ert-skip "See non-/graphic-p variant")) (unless (char-displayable-p ?…) (ert-skip "See non-/graphic-p variant"))
(erc-tests-common-init-server-proc "sleep" "1") (erc-tests-common-init-server-proc "sleep" "1")
(setq erc--isupport-params (make-hash-table) (setq erc--isupport-params (make-hash-table)