* lisp/emacs-lisp/byte-run.el (defmacro, defun): Move from C.

(macro-declaration-function): Move var from C code.
(macro-declaration-function): Define function with defalias.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form):
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Don't handle
defun/defmacro any more.
* lisp/emacs-lisp/bytecomp.el (byte-compile-arglist-signature):
Provide fallback for unknown arglist.
(byte-compile-arglist-warn): Change calling convention.
(byte-compile-output-file-form): Move print-vars binding.
(byte-compile-output-docform): Simplify accordingly.
(byte-compile-file-form-defun, byte-compile-file-form-defmacro)
(byte-compile-defmacro-declaration): Remove.
(byte-compile-file-form-defmumble): Generalize to defalias.
(byte-compile-output-as-comment): Return byte-positions.
Simplify callers accordingly.
(byte-compile-lambda): Use `assert'.
(byte-compile-defun, byte-compile-defmacro): Remove.
(byte-compile-file-form-defalias):
Use byte-compile-file-form-defmumble.
(byte-compile-defalias-warn): Remove.
* src/eval.c (Fdefun, Fdefmacro, Vmacro_declaration_function):
Move to byte-run.el.
(Fautoload): Do the hash-doc more carefully.
* src/data.c (Fdefalias): Purify definition, except for keymaps.
(Qdefun): Move from eval.c.
* src/lisp.h (Qdefun): Remove.
* src/lread.c (read1): Tiny simplification.
* lib-src/make-docfile.c: Improve comment style.
(search_lisp_doc_at_eol): New function.
(scan_lisp_file): Use it.

1 files changed, 8 insertions, 9 deletions

diff --git a/src/lread.c b/src/lread.c
index 7aba203d685..38b00a66962 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2982,7 +2982,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
 
         /* If purifying, and string starts with \ newline,
            return zero instead.  This is for doc strings
-           that we are really going to find in etc/DOC.nn.nn  */
+           that we are really going to find in etc/DOC.nn.nn.  */
         if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel)
           return make_number (0);
 
@@ -3095,18 +3095,17 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
                                           nbytes)
                : nbytes);
 
-          if (uninterned_symbol && ! NILP (Vpurify_flag))
-            name = make_pure_string (read_buffer, nchars, nbytes, multibyte);
-          else
-            name = make_specified_string (read_buffer, nchars, nbytes, multibyte);
+          name = ((uninterned_symbol && ! NILP (Vpurify_flag)
+                   ? make_pure_string : make_specified_string)
+                  (read_buffer, nchars, nbytes, multibyte));
           result = (uninterned_symbol ? Fmake_symbol (name)
                     : Fintern (name, Qnil));
 
           if (EQ (Vread_with_symbol_positions, Qt)
               || EQ (Vread_with_symbol_positions, readcharfun))
-            Vread_symbol_positions_list =
-              Fcons (Fcons (result, make_number (start_position)),
-                     Vread_symbol_positions_list);
+            Vread_symbol_positions_list
+              = Fcons (Fcons (result, make_number (start_position)),
+                       Vread_symbol_positions_list);
           return result;
         }
       }
@@ -3520,7 +3519,7 @@ read_list (int flag, register Lisp_Object readcharfun)
                We don't use Fexpand_file_name because that would make
                the directory absolute now.  */
             elt = concat2 (build_string ("../lisp/"),
-                           Ffile_name_nondirectory (elt));
+                         Ffile_name_nondirectory (elt));
         }
       else if (EQ (elt, Vload_file_name)
                && ! NILP (elt)