(byte-compile-keep-pending): Handle fset like defalias.

(byte-compile-file-form-defmumble): Fix backward if in prev change.

1 files changed, 4 insertions, 3 deletions

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 4fd911c7671..e3969cf4f85 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1396,7 +1396,8 @@ With argument, insert value in current buffer after the form."
       (let ((for-effect t))
         ;; To avoid consing up monstrously large forms at load time, we split
         ;; the output regularly.
-        (and (eq (car-safe form) 'defalias) (nthcdr 300 byte-compile-output)
+        (and (memq (car-safe form) '(fset defalias))
+             (nthcdr 300 byte-compile-output)
              (byte-compile-flush-pending))
         (funcall handler form)
         (if for-effect
@@ -1580,7 +1581,7 @@ With argument, insert value in current buffer after the form."
             ;; No doc string to make-docfile; insert form in normal code.
             (byte-compile-keep-pending
              (list (if (byte-compile-version-cond byte-compile-compatibility)
-                       'defalias 'fset)
+                       'fset 'defalias)
                    (list 'quote name)
                    (cond ((not macrop)
                           code)
@@ -1593,7 +1594,7 @@ With argument, insert value in current buffer after the form."
           ;; b-c-output-file-form analyze the defalias.
           (byte-compile-flush-pending)
           (princ (if (byte-compile-version-cond byte-compile-compatibility)
-                     "\n(defalias '" "\n(fset '")
+                     "\n(fset '" "\n(defalias '")
                  outbuffer)
           (prin1 name outbuffer)
           (byte-compile-output-docform