Fix recent test suite regression (bug#80177)HEADmaster

* lisp/emacs-lisp/cl-generic.el (cl--generic-make-function):
Preserve advertised-calling-convention info.

* test/lisp/emacs-lisp/pcase-tests.el (pcase-tests-quote-optimization):
Require `byte-opt` to fix the test when the compiler is not loaded yet.

* lisp/progmodes/elisp-mode.el: Fix some >80column problems.
(elisp--xref-format-extra)
(elisp--xref-format): Make them constant, now that we don't have
the purespace.  Also, use %S since some of the elements
don't necessarily have names and even if they do, we'd want to
escape any funny characters in them to avoid ambiguities.
(elisp--xref-find-definitions): Fix uses of
`elisp--xref-format-extra` accordingly.
Improve heuristic to distinguish proper `cl-defgeneric` from
implicit ones.
(elisp-eldoc-docstring-length-limit)
(elisp-eldoc-funcall-with-docstring-length): Remove redundant `:group`.
* lisp/cedet/mode-local.el (xref-mode-local-overload): Pass the
override symbol rather than its name through `elisp--xref-format-extra`.
* test/lisp/progmodes/elisp-mode-tests.el (find-defs-constructor):
Adjust test to new text.

2 files changed, 2 insertions, 1 deletions

diff --git a/test/lisp/emacs-lisp/pcase-tests.el b/test/lisp/emacs-lisp/pcase-tests.el
index 6b731699a67..e06c1e621c2 100644
--- a/test/lisp/emacs-lisp/pcase-tests.el
+++ b/test/lisp/emacs-lisp/pcase-tests.el
@@ -80,6 +80,7 @@
 (ert-deftest pcase-tests-quote-optimization ()
   ;; FIXME: We could/should also test that we get a corresponding
   ;; "shadowed branch" warning.
+  (require 'byte-opt) ;; FIXME: Needed for pcase to see that `consp' is `pure'.
   (should-not (pcase-tests-grep
                'FOO (macroexpand '(pcase EXP
                                     (`(,_ . ,_) (BAR))
diff --git a/test/lisp/progmodes/elisp-mode-tests.el b/test/lisp/progmodes/elisp-mode-tests.el
index 311d60dae18..8211347ba11 100644
--- a/test/lisp/progmodes/elisp-mode-tests.el
+++ b/test/lisp/progmodes/elisp-mode-tests.el
@@ -407,7 +407,7 @@ to (xref-elisp-test-descr-to-target xref)."
   ;; cl-defstruct location.
   (list
    (cons
-    (xref-make "(cl-defstruct (xref-elisp-location (:constructor xref-make-elisp-location)))"
+    (xref-make "(cl-defstruct xref-elisp-location (:constructor xref-make-elisp-location))"
                (xref-make-elisp-location
                 'xref-elisp-location 'define-type
                 (expand-file-name "../../../lisp/progmodes/elisp-mode.el" emacs-test-dir)))