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.

diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 3bd77da90159f8fd90ffe16fee206113d20ee1b4..dbd0ff70fb6864b46cf7affdc44ed14d70e7c5cc 100644 (file)
--- 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 b18448fac8e7afa15f73c95f072e606c3fbb3546..93cc954b39690eb0ea45c5d3b12e89c05f18728e 100644 (file)
--- 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 2579d691bdc789d8508e24a0a51b759e5a559c3d..8cf4e739c2f84afbdb5514bc6e35a749854fefc2 100644 (file)
--- 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 9da9f1544f6e571e8508615f85cc0f082f437ea0..4884d85ccba36bf1bbefa7d45953096495e677bf 100644 (file)
--- 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)