; Fix overridden erc--input-split slot definition

* 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.

diff --git a/lisp/erc/erc-common.el b/lisp/erc/erc-common.el
index 28ab6aad4668f237930fbcf43b8ce1cb8c84fe3f..e7e70fffd3a623db02667b188462eb361d054a97 100644 (file)
--- a/lisp/erc/erc-common.el
+++ b/lisp/erc/erc-common.el
@@ -52,7 +52,7 @@
   string insertp sendp)
 
 (cl-defstruct (erc--input-split (:include erc-input
-                                          (string :read-only)
+                                          (string "" :read-only t)
                                           (insertp erc-insert-this)
                                           (sendp (with-suppressed-warnings
                                                      ((obsolete erc-send-this))

diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el
index 2318fed28f24331d83a1c9c1dc6ca6df1fd8f6a5..b3912cab33da6328cb681dff52ec0ec95c70f9fc 100644 (file)
--- a/test/lisp/erc/erc-tests.el
+++ b/test/lisp/erc/erc-tests.el
@@ -849,7 +849,7 @@
   ;; truncation ellipsis when run interactively.  Rather than have
   ;; hard-to-read "nondeterministic" comparisons against sets of
   ;; acceptable values, we use separate tests.
-  (when (display-graphic-p) (ert-pass))
+  (when (char-displayable-p ?…) (ert-pass))
 
   ;; Truncation cache populated and used.
   (let ((cache (erc--channel-mode-types-shortargs erc--channel-mode-types))
@@ -877,7 +877,7 @@
 (ert-deftest erc--channel-modes/graphic-p ()
   :tags `(:unstable ,@(and (getenv "ERC_TESTS_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")
   (setq erc--isupport-params (make-hash-table)