(byte-compile-file): Undo previous change.

(batch-byte-recompile-directory): Doc fix.

1 files changed, 6 insertions, 13 deletions

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index a78e70dd7b..bbb977d2be 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -102,7 +102,7 @@
 ;;; byte-compile-compatibility	Whether the compiler should
 ;;;				generate .elc files which can be loaded into
 ;;;				generic emacs 18.
-;;; emacs-lisp-file-regexp	Regexp for the extension of elisp source-files;
+;;; emacs-lisp-file-regexp	Regexp for the extension of source-files;
 ;;;				see also the function byte-compile-dest-file.
 
 ;;; New Features:
@@ -143,21 +143,14 @@
 ;;;  o  The form `eval-and-compile' is similar to eval-when-compile, but
 ;;;	the whole form is evalled both at compile-time and at run-time.
 ;;;
-;;;  o  The command Meta-X byte-compile-and-load-file does what you'd think.
-;;;     (This command has been discontinued.)
-;;;
 ;;;  o  The command compile-defun is analogous to eval-defun.
 ;;;
 ;;;  o  If you run byte-compile-file on a filename which is visited in a 
 ;;;     buffer, and that buffer is modified, you are asked whether you want
 ;;;     to save the buffer before compiling.
 ;;;
-;;;  o  You can add this to /etc/magic to make file(1) recognise the files
-;;;     generated by this compiler:
-;;;
-;;;	  0	string		;ELC		GNU Emacs Lisp compiled file,
-;;;	  >4	byte		x		version %d
-;;;
+;;;  o  byte-compiled files now start with the string `;ELC'.
+;;;     Some versions of `file' can be customized to recognize that.
 
 (require 'backquote)
 
@@ -1133,7 +1126,7 @@ With prefix arg (noninteractively: 2nd arg), load the file after compiling."
      (list (read-file-name (if current-prefix-arg
 			       "Byte compile and load file: "
 			     "Byte compile file: ")
-			   file-dir nil nil file-name)
+			   file-dir file-name nil)
 	   current-prefix-arg)))
   ;; Expand now so we get the current buffer's defaults
   (setq filename (expand-file-name filename))
@@ -3028,8 +3021,8 @@ For example, invoke \"emacs -batch -f batch-byte-compile $emacs/ ~/*.el\""
 
 (defun batch-byte-recompile-directory ()
   "Runs `byte-recompile-directory' on the dirs remaining on the command line.
-Must be used only with -batch, and kills emacs on completion.
-For example, invoke \"emacs -batch -f batch-byte-recompile-directory .\""
+Must be used only with `-batch', and kills Emacs on completion.
+For example, invoke `emacs -batch -f batch-byte-recompile-directory .'."
   ;; command-line-args-left is what is left of the command line (startup.el)
   (defvar command-line-args-left)	;Avoid 'free variable' warning
   (if (not noninteractive)