From 03196fcabd46010b54bfede8ffb37889045a638f Mon Sep 17 00:00:00 2001
From: Alan Mackenzie <acm@muc.de>
Date: Sat, 7 Oct 2023 11:49:48 +0000
Subject: [PATCH] Miscellaneous fixing/tidying up:

* lisp/emacs-lisp/byte-opt.el (byte-optimize--rename-var)
lisp/emacs-lisp/byte-run.el (defun): Correct whitespace errors.

* lisp/emacs-lisp/bytecomp.el
(byte-compile-docstring-style-warn): Remove an obtrusive
setting of NAME to a string; this messed up the position
argument of later calls to byte-compile-warn-x.

* lisp/emacs-lisp/comp.el (comp-spill-lap-function/symbol):
Correct from (cadr f) to (lambda-arglist f) to get F's arglist.
---
 lisp/emacs-lisp/byte-opt.el | 2 +-
 lisp/emacs-lisp/byte-run.el | 2 +-
 lisp/emacs-lisp/bytecomp.el | 1 -
 lisp/emacs-lisp/comp.el     | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 3bd77da9015..dbd0ff70fb6 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -566,7 +566,7 @@ for speeding up processing.")
             `(internal-make-closure ,vars ,env . ,rest)
             (let def nil)))
        `(,fn
-         ,vars ,(byte-optimize--rename-var-body var new-var env) 
+         ,vars ,(byte-optimize--rename-var-body var new-var env)
          ,@(if def `(,def))
          . ,rest))
       (`(defvar ,name . ,rest)
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index b18448fac8e..93cc954b396 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -466,7 +466,7 @@ The return value is undefined.
                      (list 'quote name)
                      (list 'function
                            (cons 'lambda
-                                 (cons 
+                                 (cons
                                   (bare-symbol name)
                                   (cons arglist body)
                                   ))))))
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 2579d691bdc..8cf4e739c2f 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1759,7 +1759,6 @@ It is too wide if it has any lines longer than the largest of
                             docstring)))))
       (when (and (consp name) (eq (car name) 'quote))
         (setq name (cadr name)))
-      (setq name (if name (format " `%s' " name) ""))
       (when (and kind docs (stringp docs))
         (let ((col (max byte-compile-docstring-max-column fill-column)))
           (when (byte-compile--wide-docstring-p docs col)
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 9da9f1544f6..4884d85ccba 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -1356,7 +1356,7 @@ clashes."
             (let ((arg-list (aref (comp-func-byte-func func) 0)))
               (setf (comp-func-l-args func)
                     (comp-decrypt-arg-list arg-list function-name)))
-          (setf (comp-func-d-lambda-list func) (cadr f)))
+          (setf (comp-func-d-lambda-list func) (lambda-arglist f)))
         (setf (comp-func-lap func)
               lap
               (comp-func-frame-size func)
-- 
2.39.5