Merge from origin/emacs-29

6dd3e352f44 Extract common code into ruby-base-mode to derive from
94e330243e1 ruby-ts-mode: Indentation fixes
9b24417dda8 ruby-ts--font-lock-settings: Use more standard faces
9e6536e4d96 ruby-ts-mode: Standardize the string literal highlights
1a9a1fdebf6 Improve fontification in java-ts-mode (bug#60492)
dfdf9c21cbe Fontification improvements in typescript-ts-mode (bug#60500)
68e68dfeefe Improve fontification consistency in js-ts-mode (bug#60503)
aef869e74f4 ; Update tree-sitter manual
4ef12cfb1fc ; Fix tree-sitter manual title case
aab8ddca5e1 ; nt/INSTALL: Update for Emacs 29.
809fbb0e8c4 ; Update copyright notice in tramp-sh.el
f8f5202487c (typescript/tsx-ts-mode): Split font-lock feature list in...
a86a213e1ac js-ts-mode: Move 'string-interpolation' to font-lock level 3
d26b523886e Fix shrinking of the tab-bar
3f7ea621b90 ; Fix typos in ruby-ts-mode.el
9599b054316 ; Skip ruby-ts tests if grammar is not available
ff35ac9dfab Fix default-port regression in erc-select-read-args
b7ad0b40148 ; Clarify doc strings of 'call-process' and 'call-process...

2 files changed, 15 insertions, 15 deletions

diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el
index 6807b24bfc6..85506c3d27e 100644
--- a/test/lisp/erc/erc-tests.el
+++ b/test/lisp/erc/erc-tests.el
@@ -1001,11 +1001,11 @@
 
 (ert-deftest erc-select-read-args ()
 
-  (ert-info ("Defaults to TLS")
+  (ert-info ("Does not default to TLS")
     (should (equal (ert-simulate-keys "\r\r\r\r"
                      (erc-select-read-args))
                    (list :server "irc.libera.chat"
-                         :port 6697
+                         :port 6667
                          :nick (user-login-name)
                          :password nil))))
 
@@ -1036,7 +1036,7 @@
                          :password nil))))
 
   (ert-info ("Address includes nick and password")
-    (should (equal (ert-simulate-keys "nick:sesame@localhost:6667\r"
+    (should (equal (ert-simulate-keys "nick:sesame@localhost:6667\r\r"
                      (erc-select-read-args))
                    (list :server "localhost"
                          :port 6667
diff --git a/test/lisp/progmodes/ruby-ts-mode-tests.el b/test/lisp/progmodes/ruby-ts-mode-tests.el
index f48d0bf6330..aa1ab1e2605 100644
--- a/test/lisp/progmodes/ruby-ts-mode-tests.el
+++ b/test/lisp/progmodes/ruby-ts-mode-tests.el
@@ -44,7 +44,7 @@ The whitespace before and including \"|\" on each line is removed."
   (apply 'format (replace-regexp-in-string "^[ \t]*|" "" s) args))
 
 (ert-deftest ruby-ts-indent-simple ()
-  (skip-unless (treesit-available-p))
+  (skip-unless (treesit-ready-p 'ruby t))
   (ruby-ts-should-indent-buffer
    "if foo
    |  bar
@@ -58,7 +58,7 @@ The whitespace before and including \"|\" on each line is removed."
    |"))
 
 (ert-deftest ruby-ts-align-to-stmt-keywords-t ()
-  (skip-unless (treesit-available-p))
+  (skip-unless (treesit-ready-p 'ruby t))
   (let ((ruby-align-to-stmt-keywords t))
     (ruby-ts-should-indent-buffer
      "foo = if bar?
@@ -94,7 +94,7 @@ The whitespace before and including \"|\" on each line is removed."
     ))
 
 (ert-deftest ruby-ts-align-to-stmt-keywords-case ()
-  (skip-unless (treesit-available-p))
+  (skip-unless (treesit-ready-p 'ruby t))
   (let ((ruby-align-to-stmt-keywords '(case)))
     (ruby-ts-should-indent-buffer
      "b = case a
@@ -111,7 +111,7 @@ The whitespace before and including \"|\" on each line is removed."
      |    end")))
 
 (ert-deftest ruby-ts-add-log-current-method-examples ()
-  (skip-unless (treesit-available-p))
+  (skip-unless (treesit-ready-p 'ruby t))
   (let ((pairs '(("foo" . "#foo")
                  ("C.foo" . ".foo")
                  ("self.foo" . ".foo")
@@ -134,7 +134,7 @@ The whitespace before and including \"|\" on each line is removed."
                            (format "M::C%s" value))))))))
 
 (ert-deftest ruby-ts-add-log-current-method-outside-of-method ()
-  (skip-unless (treesit-available-p))
+  (skip-unless (treesit-ready-p 'ruby t))
   (ruby-ts-with-temp-buffer (ruby-ts-test-string
                              "module M
                              |  class C
@@ -147,7 +147,7 @@ The whitespace before and including \"|\" on each line is removed."
     (should (string= (ruby-ts-add-log-current-function) "M::C"))))
 
 (ert-deftest ruby-ts-add-log-current-method-in-singleton-class ()
-  (skip-unless (treesit-available-p))
+  (skip-unless (treesit-ready-p 'ruby t))
   (ruby-ts-with-temp-buffer (ruby-ts-test-string
                              "class C
                              |  class << self
@@ -160,7 +160,7 @@ The whitespace before and including \"|\" on each line is removed."
     (should (string= (ruby-ts-add-log-current-function) "C.foo"))))
 
 (ert-deftest ruby-ts-add-log-current-method-namespace-shorthand ()
-  (skip-unless (treesit-available-p))
+  (skip-unless (treesit-ready-p 'ruby t))
   (ruby-ts-with-temp-buffer (ruby-ts-test-string
                              "class C::D
                              |  def foo
@@ -171,7 +171,7 @@ The whitespace before and including \"|\" on each line is removed."
     (should (string= (ruby-ts-add-log-current-function) "C::D#foo"))))
 
 (ert-deftest ruby-ts-add-log-current-method-after-inner-class ()
-  (skip-unless (treesit-available-p))
+  (skip-unless (treesit-ready-p 'ruby t))
   (ruby-ts-with-temp-buffer (ruby-ts-test-string
                              "module M
                              |  class C
@@ -186,7 +186,7 @@ The whitespace before and including \"|\" on each line is removed."
     (should (string= (ruby-ts-add-log-current-function) "M::C#foo"))))
 
 (ert-deftest ruby-ts-add-log-current-method-after-inner-class-outside-methods ()
-  (skip-unless (treesit-available-p))
+  (skip-unless (treesit-ready-p 'ruby t))
   (ruby-ts-with-temp-buffer (ruby-ts-test-string
                              "module M
                              |  class C
@@ -201,7 +201,7 @@ The whitespace before and including \"|\" on each line is removed."
     (should (string= (ruby-ts-add-log-current-function) "M::C"))))
 
 (ert-deftest ruby-ts-add-log-current-method-after-inner-class-outside-methods-with-text ()
-  (skip-unless (treesit-available-p))
+  (skip-unless (treesit-ready-p 'ruby t))
   (ruby-ts-with-temp-buffer (ruby-ts-test-string
                              "module M
                              |  class C
@@ -215,7 +215,7 @@ The whitespace before and including \"|\" on each line is removed."
     (should (string= (ruby-ts-add-log-current-function) "M::C"))))
 
 (ert-deftest ruby-ts-add-log-current-method-after-endless-method ()
-  (skip-unless (treesit-available-p))
+  (skip-unless (treesit-ready-p 'ruby t))
   (ruby-ts-with-temp-buffer (ruby-ts-test-string
                              "module M
                              |  class C
@@ -237,7 +237,7 @@ The whitespace before and including \"|\" on each line is removed."
 (defmacro ruby-ts-deftest-indent (file)
   `(ert-deftest ,(intern (format "ruby-ts-indent-test/%s" file)) ()
      ;; :tags '(:expensive-test)
-     (skip-unless (treesit-available-p))
+     (skip-unless (treesit-ready-p 'ruby t))
      (let ((buf (find-file-noselect (ruby-ts-resource-file ,file))))
        (unwind-protect
            (with-current-buffer buf