xemacs-beta: lisp/bytecomp.el comparison

comparison lisp/bytecomp.el @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5

author	cvs
date	Mon, 13 Aug 2007 11:07:10 +0200
parents	6240c7796c7a
children	74fd4e045ea6

comparison

equal deleted inserted replaced

-:76b7d63099ad
+:8626e4521993
 ;;	Hallvard Furuseth <hbf@ulrik.uio.no>
 ;; Keywords: internal
 ;; Subsequently modified by RMS and others.
-(defconst byte-compile-version (purecopy  "2.25 XEmacs; 22-Mar-96."))
+(defconst byte-compile-version (purecopy  "2.26 XEmacs; 1998-10-07."))
 ;; This file is part of XEmacs.
 ;; XEmacs is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;;;				'unused-vars (non-global variables bound but
 ;;;					      not referenced)
 ;;;				'unresolved (calls to unknown functions)
 ;;;				'callargs  (lambda calls with args that don't
 ;;;					    match the lambda's definition)
+;;;				'subr-callargs (calls to subrs with args that
+;;;					    don't match the subr's definition)
 ;;;				'redefine  (function cell redefined from
 ;;;					    a macro to a lambda or vice versa,
 ;;;					    or redefined to take other args)
 ;;;				'obsolete  (obsolete variables and functions)
 ;;;				'pedantic  (references to Emacs-compatible
 ;;;
 ;;;  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
+;;;  o  You can add this to /etc/magic to make file(1) recognize the files
 ;;;     generated by this compiler:
 ;;;
 ;;;	  0	string		;ELC		GNU Emacs Lisp compiled file,
 ;;;	  >4	byte		x		version %d
 ;;;
 (defvar byte-compile-single-version nil
 "If this is true, the choice of emacs version (v19 or v20) byte-codes will
 be hard-coded into bytecomp when it compiles itself.  If the compiler itself
 is compiled with optimization, this causes a speedup.")
-(cond (byte-compile-single-version
+(cond
-	 (defmacro byte-compile-single-version () t)
+(byte-compile-single-version
-	 (defmacro byte-compile-version-cond (cond) (list 'quote (eval cond))))
+(defmacro byte-compile-single-version () t)
-	(t
+(defmacro byte-compile-version-cond (cond) (list 'quote (eval cond))))
-	 (defmacro byte-compile-single-version () nil)
+(t
-	 (defmacro byte-compile-version-cond (cond) cond)))
+(defmacro byte-compile-single-version () nil)
+(defmacro byte-compile-version-cond (cond) cond)))
 )
-(defvar emacs-lisp-file-regexp (if (eq system-type 'vax-vms)
+(defvar emacs-lisp-file-regexp (purecopy "\\.el$")
-				   (purecopy "\\.EL\\(;[0-9]+\\)?$")
-				 (purecopy "\\.el$"))
 "*Regexp which matches Emacs Lisp source files.
 You may want to redefine `byte-compile-dest-file' if you change this.")
 ;; This enables file name handlers such as jka-compr
 ;; to remove parts of the file name that should not be copied
 					 'byte-compiler-base-file-name)))
 (if handler
 	(funcall handler 'byte-compiler-base-file-name filename)
 filename)))
-(or (fboundp 'byte-compile-dest-file)
+(unless (fboundp 'byte-compile-dest-file)
 ;; The user may want to redefine this along with emacs-lisp-file-regexp,
 ;; so only define it if it is undefined.
 (defun byte-compile-dest-file (filename)
 "Convert an Emacs Lisp source file name to a compiled file name."
 (setq filename (byte-compiler-base-file-name filename))
 (setq filename (file-name-sans-versions filename))
-(cond ((eq system-type 'vax-vms)
+(if (string-match emacs-lisp-file-regexp filename)
-		 (concat (substring filename 0 (string-match ";" filename)) "c"))
+	(concat (substring filename 0 (match-beginning 0)) ".elc")
-		((string-match emacs-lisp-file-regexp filename)
+(concat filename ".elc"))))
-		 (concat (substring filename 0 (match-beginning 0)) ".elc"))
-		(t (concat filename ".elc")))))
 ;; This can be the 'byte-compile property of any symbol.
 (autoload 'byte-compile-inline-expand "byte-optimize")
 ;; This is the entrypoint to the lapcode optimizer pass1.
 ;; This is the entry point to the decompiler, which is used by the
 ;; disassembler.  The disassembler just requires 'byte-compile, but
 ;; that doesn't define this function, so this seems to be a reasonable
 ;; thing to do.
-(autoload 'byte-decompile-bytecode "byte-opt")
+(autoload 'byte-decompile-bytecode "byte-optimize")
 (defvar byte-compile-verbose
 (and (not noninteractive) (> (device-baud-rate) search-slow-speed))
 "*Non-nil means print messages describing progress of byte-compiler.")
 (defvar byte-compile-error-on-warn nil
 "*If true, the byte-compiler reports warnings with `error'.")
 ;; byte-compile-warning-types in FSF.
 (defvar byte-compile-default-warnings
-'(redefine callargs free-vars unresolved unused-vars obsolete)
+'(redefine callargs subr-callargs free-vars unresolved unused-vars obsolete)
 "*The warnings used when byte-compile-warnings is t.")
 (defvar byte-compile-warnings t
 "*List of warnings that the compiler should issue (t for the default set).
 Elements of the list may be:
 free-vars	references to variables not in the current lexical scope.
 unused-vars	references to non-global variables bound but not referenced.
 unresolved	calls to unknown functions.
 callargs	lambda calls with args that don't match the definition.
+subr-callargs	calls to subrs with args that don't match the definition.
 redefine	function cell redefined from a macro to a lambda or vice
 		versa, or redefined to take a different number of arguments.
 obsolete	use of an obsolete function or variable.
 pedantic	warn of use of compatible symbols.
 See also the macro `byte-compiler-options'.")
 (defvar byte-compile-generate-call-tree nil
 "*Non-nil means collect call-graph information when compiling.
-This records functions were called and from where.
+This records functions that were called and from where.
 If the value is t, compilation displays the call graph when it finishes.
 If the value is neither t nor nil, compilation asks you whether to display
 the graph.
 The call tree only lists functions called, not macros used. Those functions
 (defconst byte-compile-arglist-bit 4)
 (defconst byte-compile-global-bit 8)
 (defvar byte-compile-free-references)
 (defvar byte-compile-free-assignments)
+(defvar debug-issue-ebola-notices)
 (defvar byte-compiler-error-flag)
 (defconst byte-compile-initial-macro-environment
 (purecopy
 	    "to pop value and jump if it's not nil")
 (byte-defop 133 -1 byte-goto-if-nil-else-pop
 "to examine top-of-stack, jump and don't pop it if it's nil,
 otherwise pop it")
 (byte-defop 134 -1 byte-goto-if-not-nil-else-pop
-"to examine top-of-stack, jump and don't pop it if it's non nil,
+"to examine top-of-stack, jump and don't pop it if it's non-nil,
 otherwise pop it")
 (byte-defop 135 -1 byte-return "to pop a value and return it from `byte-code'")
 (byte-defop 136 -1 byte-discard "to discard one value from stack")
 (byte-defop 137  1 byte-dup     "to duplicate the top of the stack")
 	    off (cdr (car lap)))
 (cond ((not (symbolp op))
 	     (error "Non-symbolic opcode `%s'" op))
 	    ((eq op 'TAG)
 	     (setcar off pc)
-	     (setq patchlist (cons off patchlist)))
+	     (push off patchlist))
 	    ((memq op byte-goto-ops)
 	     (setq pc (+ pc 3))
 	     (setq bytes (cons (cons pc (cdr off))
 			       (cons nil
 				     (cons (symbol-value op) bytes))))
-	     (setq patchlist (cons bytes patchlist)))
+	     (push bytes patchlist))
 	    (t
 	     (setq bytes
 		   (cond ((cond ((consp off)
 				 ;; Variable or constant reference
 				 (setq off (cdr off))
 (defvar byte-compile-current-form nil)
 (defvar byte-compile-current-file nil)
 (defvar byte-compile-dest-file nil)
 (defmacro byte-compile-log (format-string &rest args)
-(list 'and
+`(when (and byte-optimize (memq byte-optimize-log '(t source)))
-	'byte-optimize
+(let ((print-escape-newlines t)
-	'(memq byte-optimize-log '(t source))
+	    (print-level 4)
-	(list 'let '((print-escape-newlines t)
+	    (print-length 4))
-		     (print-level 4)
+	(byte-compile-log-1 (format ,format-string ,@args)))))
-		     (print-length 4))
-	      (list 'byte-compile-log-1
+(defconst byte-compile-last-warned-form 'nothing)
-		    (cons 'format
-		      (cons format-string
-			(mapcar
-			 '(lambda (x)
-			    (if (symbolp x) (list 'prin1-to-string x) x))
-			 args)))))))
-(defconst byte-compile-last-warned-form nil)
 ;; Log a message STRING in *Compile-Log*.
 ;; Also log the current function and file if not already done.
 (defun byte-compile-log-1 (string &optional fill)
-(let ((this-form (or byte-compile-current-form "toplevel forms")))
+(let* ((this-form (or byte-compile-current-form "toplevel forms"))
-(cond
+	 (while-compiling-msg
-(noninteractive
+	  (when (or byte-compile-current-file
-(if (or byte-compile-current-file
+		    (not (eq this-form byte-compile-last-warned-form)))
-	      (and byte-compile-last-warned-form
+	    (format
-		   (not (eq this-form byte-compile-last-warned-form))))
+	     "While compiling %s%s:"
-	  (message
+	     this-form
-	   (format "While compiling %s%s:"
+	     (cond
-		   this-form
+	      ((stringp byte-compile-current-file)
-		   (if byte-compile-current-file
+	       (concat " in file " byte-compile-current-file))
-		       (if (stringp byte-compile-current-file)
+	      ((bufferp byte-compile-current-file)
-			   (concat " in file " byte-compile-current-file)
+	       (concat " in buffer "
-			 (concat " in buffer "
+		       (buffer-name byte-compile-current-file)))
-				 (buffer-name byte-compile-current-file)))
+	      (""))))))
-		     ""))))
+(if noninteractive
-(message "  %s" string))
+	(progn
-(t
+	  (when while-compiling-msg (message "%s" while-compiling-msg))
-(save-excursion
+	  (message "  %s" string))
-	(set-buffer (get-buffer-create "*Compile-Log*"))
+(with-current-buffer (get-buffer-create "*Compile-Log*")
 	(goto-char (point-max))
-	(cond ((or byte-compile-current-file
+	(when byte-compile-current-file
-		   (and byte-compile-last-warned-form
+	  (when (> (point-max) (point-min))
-			(not (eq this-form byte-compile-last-warned-form))))
+	    (insert "\n\^L\n"))
-	       (if byte-compile-current-file
+	  (insert (current-time-string) "\n"))
-		   (insert "\n\^L\n" (current-time-string) "\n"))
+	(when while-compiling-msg (insert while-compiling-msg "\n"))
-	       (insert "While compiling "
-		       (if (stringp this-form) this-form
-			 (format "%s" this-form)))
-	       (if byte-compile-current-file
-		   (if (stringp byte-compile-current-file)
-		       (insert " in file " byte-compile-current-file)
-		     (insert " in buffer "
-			     (buffer-name byte-compile-current-file))))
-	       (insert ":\n")))
 	(insert "  " string "\n")
-	(if (and fill (not (string-match "\n" string)))
+	(when (and fill (not (string-match "\n" string)))
-	    (let ((fill-prefix "     ")
+	  (let ((fill-prefix "     ")
-		  (fill-column 78))
+		(fill-column 78))
-	      (fill-paragraph nil)))
+	    (fill-paragraph nil)))))
-	)))
+(setq byte-compile-current-file nil)
-(setq byte-compile-current-file nil
+(setq byte-compile-last-warned-form this-form)))
-	  byte-compile-last-warned-form this-form)))
 ;; Log the start of a file in *Compile-Log*, and mark it as done.
 ;; But do nothing in batch mode.
 (defun byte-compile-log-file ()
-(and byte-compile-current-file (not noninteractive)
+(when (and byte-compile-current-file (not noninteractive))
-(save-excursion
+(with-current-buffer (get-buffer-create "*Compile-Log*")
-	 (set-buffer (get-buffer-create "*Compile-Log*"))
+(when (> (point-max) (point-min))
-	 (goto-char (point-max))
+	(goto-char (point-max))
-	 (insert "\n\^L\nCompiling "
+	(insert "\n\^L\n"))
-		 (if (stringp byte-compile-current-file)
+(insert "Compiling "
-		     (concat "file " byte-compile-current-file)
+	      (if (stringp byte-compile-current-file)
-		   (concat "buffer " (buffer-name byte-compile-current-file)))
+		  (concat "file " byte-compile-current-file)
-		 " at " (current-time-string) "\n")
+		(concat "buffer " (buffer-name byte-compile-current-file)))
-	 (setq byte-compile-current-file nil))))
+	      " at " (current-time-string) "\n")
+(setq byte-compile-current-file nil))))
 (defun byte-compile-warn (format &rest args)
 (setq format (apply 'format format args))
 (if byte-compile-error-on-warn
 (error "%s" format)		; byte-compile-file catches and logs it
 		 (eq val 'emacs19))
 (delete-errors byte-compile-delete-errors (t nil) val)
 (verbose byte-compile-verbose (t nil) val)
 (new-bytecodes byte-compile-new-bytecodes (t nil) val)
 (warnings byte-compile-warnings
-	      ((callargs redefine free-vars unused-vars unresolved))
+	      ((callargs subr-callargs redefine free-vars unused-vars unresolved))
 	      val)))
 ;; XEmacs addition
 (defconst byte-compiler-obsolete-options
 '((new-bytecodes t)))
 	   (byte-compile-warn "the function %s is not known to be defined."
 	    (car (car byte-compile-unresolved-functions)))))))
 nil)
 (defun byte-compile-defvar-p (var)
-;; Whether the byte compiler thinks that nonexical references to this
+;; Whether the byte compiler thinks that non-lexical references to this
 ;; variable are ok.
 (or (globally-boundp var)
 (let ((rest byte-compile-bound-variables))
 	(while (and rest var)
 	  (if (and (eq var (car-safe (car rest)))
 	       ;; for two reasons: first, the arglist structure
 	       ;; might be imposed by external forces, and we don't
 	       ;; have (declare (ignore x)) yet; and second, inline
 	       ;; expansion produces forms like
 	       ;;   ((lambda (arg) (byte-code "..." [arg])) x)
-	       ;; which we can't (ok, well, don't) recognise as
+	       ;; which we can't (ok, well, don't) recognize as
 	       ;; containing a reference to arg, so every inline
 	       ;; expansion would generate a warning.  (If we had
 	       ;; `ignore' then inline expansion could emit an
 	       ;; ignore declaration.)
 	       (= 0 (logand byte-compile-arglist-bit (cdr cell)))
 (byte-compile-warn
 (format "variable %s bound but not referenced" (car unreferenced)))
 (setq unreferenced (cdr unreferenced)))))
+(defmacro byte-compile-constant-symbol-p (symbol)
+`(or (keywordp ,symbol) (memq ,symbol '(nil t))))
 (defmacro byte-compile-constp (form)
 ;; Returns non-nil if FORM is a constant.
-(` (cond ((consp (, form)) (eq (car (, form)) 'quote))
+`(cond ((consp ,form) (eq (car ,form) 'quote))
-	   ((not (symbolp (, form))))
+	 ((symbolp ,form) (byte-compile-constant-symbol-p ,form))
-	   ((keywordp (, form)))
+	 (t)))
-	   ((memq (, form) '(nil t))))))
 (defmacro byte-compile-close-variables (&rest body)
 `(let
 (;;
 	;; Close over these variables to encapsulate the
 	 byte-compile-dynamic-docstrings)
 	(byte-compile-warnings (if (eq byte-compile-warnings t)
 				   byte-compile-default-warnings
 				 byte-compile-warnings))
 	(byte-compile-file-domain nil)
+	;; We reserve the right to compare ANY objects for equality.
+	(debug-issue-ebola-notices -42)
 	)
 (prog1
 	 (progn ,@body)
 (if (memq 'unused-vars byte-compile-warnings)
 	   ;; done compiling in this scope, warn now.
 	   (byte-compile-warn-about-unused-variables)))))
-(defvar byte-compile-warnings-point-max nil)
 (defmacro displaying-byte-compile-warnings (&rest body)
-`(let ((byte-compile-warnings-point-max byte-compile-warnings-point-max))
+`(let* ((byte-compile-log-buffer (get-buffer-create "*Compile-Log*"))
-;; Log the file name.
+	  (byte-compile-point-max-prev (point-max byte-compile-log-buffer)))
+;; Log the file name or buffer name.
 (byte-compile-log-file)
 ;; Record how much is logged now.
 ;; We will display the log buffer if anything more is logged
 ;; before the end of BODY.
-(or byte-compile-warnings-point-max
+(defvar byte-compile-warnings-beginning)
-	 (save-excursion
+(let ((byte-compile-warnings-beginning
-	   (set-buffer (get-buffer-create "*Compile-Log*"))
+	    (if (boundp 'byte-compile-warnings-beginning)
-	   (setq byte-compile-warnings-point-max (point-max))))
+		byte-compile-warnings-beginning
-(unwind-protect
+	      (point-max byte-compile-log-buffer))))
-	 (condition-case error-info
-	     (progn ,@body)
+(unwind-protect
-	   (error
+	   (condition-case error-info
-	    (byte-compile-report-error error-info)))
+	       (progn ,@body)
-(save-excursion
+	     (error
-	 ;; If there were compilation warnings, display them.
+	      (byte-compile-report-error error-info)))
-	 (set-buffer "*Compile-Log*")
-	 (if (= byte-compile-warnings-point-max (point-max))
+	 ;; Always set point in log to start of interesting output.
-	     nil
+	 (with-current-buffer byte-compile-log-buffer
-	   (if temp-buffer-show-function
+	   (let ((show-begin
-	       (let ((show-buffer (get-buffer-create "*Compile-Log-Show*")))
+		  (progn (goto-char byte-compile-point-max-prev)
-		 (save-excursion
+			 (skip-chars-forward "\^L\n")
-		   (set-buffer show-buffer)
+			 (point))))
-		   (setq buffer-read-only nil)
+	     ;; If there were compilation warnings, display them.
-		   (erase-buffer))
+	     (if temp-buffer-show-function
-		 (copy-to-buffer show-buffer
+		 (let ((show-buffer (get-buffer-create "*Compile-Log-Show*")))
-				 (save-excursion
+		   ;; Always clean show-buffer, even when not displaying it,
-				   (goto-char byte-compile-warnings-point-max)
+		   ;; so that misleading previous messages aren't left around.
-				   (forward-line -1)
+		   (with-current-buffer show-buffer
-				   (point))
+		     (setq buffer-read-only nil)
-				 (point-max))
+		     (erase-buffer))
-		 (funcall temp-buffer-show-function show-buffer))
+		   (copy-to-buffer show-buffer show-begin (point-max))
-(select-window
+		   (when (< byte-compile-warnings-beginning (point-max))
-(prog1 (selected-window)
+		     (funcall temp-buffer-show-function show-buffer)))
-(select-window (display-buffer (current-buffer)))
+	       (when (< byte-compile-warnings-beginning (point-max))
-(goto-char byte-compile-warnings-point-max)
+		 (select-window
-(recenter 1)))))))))
+		  (prog1 (selected-window)
+		    (select-window (display-buffer (current-buffer)))
+		    (goto-char show-begin)
+		    (recenter 1)))))))))))
 ;;;###autoload
 (defun byte-force-recompile (directory)
 "Recompile every `.el' file in DIRECTORY that already has a `.elc' file.
 	       (and force
 		    (or (eq 0 force)
 			(y-or-n-p (concat "Compile " filename "? "))))))
 	(byte-compile-file filename))))
-(defvar kanji-flag nil)
 ;;;###autoload
 (defun byte-compile-file (filename &optional load)
 "Compile a file of Lisp code named FILENAME into a file of byte code.
 The output file's name is made by appending `c' to the end of FILENAME.
 With prefix arg (noninteractively: 2nd arg), load the file after compiling."
 (if (or noninteractive byte-compile-verbose) ; XEmacs change
 (message "Compiling %s..." filename))
 (let (;;(byte-compile-current-file (file-name-nondirectory filename))
 	(byte-compile-current-file filename)
-	(debug-issue-ebola-notices 0) ; Hack -slb
 	target-file input-buffer output-buffer
 	byte-compile-dest-file)
 (setq target-file (byte-compile-dest-file filename))
 (setq byte-compile-dest-file target-file)
 (save-excursion
 (kill-buffer input-buffer)
 (save-excursion
 	(set-buffer output-buffer)
 	(goto-char (point-max))
 	(insert "\n")			; aaah, unix.
-	(let ((vms-stmlf-recfm t))
+	(setq target-file (byte-compile-dest-file filename))
-	  (setq target-file (byte-compile-dest-file filename))
+	(unless byte-compile-overwrite-file
-	  (or byte-compile-overwrite-file
+	  (ignore-file-errors (delete-file target-file)))
-	      (condition-case ()
+	(if (file-writable-p target-file)
-		  (delete-file target-file)
+	    (progn
-		(error nil)))
+	      (when (memq system-type '(ms-dos windows-nt))
-	  (if (file-writable-p target-file)
+		(defvar buffer-file-type)
-	      (let ((kanji-flag nil))	; for nemacs, from Nakagawa Takayuki
+		(setq buffer-file-type t))
-		(if (or (eq system-type 'ms-dos) (eq system-type 'windows-nt))
+	      (write-region 1 (point-max) target-file))
-		    (setq buffer-file-type t))
+	  ;; This is just to give a better error message than write-region
-		(write-region 1 (point-max) target-file))
+	  (signal 'file-error
-	    ;; This is just to give a better error message than write-region
+		  (list "Opening output file"
-	    (signal 'file-error
+			(if (file-exists-p target-file)
-		    (list "Opening output file"
+			    "cannot overwrite file"
-			  (if (file-exists-p target-file)
+			  "directory not writable or nonexistent")
-			      "cannot overwrite file"
+			target-file)))
-			    "directory not writable or nonexistent")
+	(or byte-compile-overwrite-file
-			  target-file)))
+	    (condition-case ()
-	  (or byte-compile-overwrite-file
+		(set-file-modes target-file (file-modes filename))
-	      (condition-case ()
+	      (error nil)))
-		  (set-file-modes target-file (file-modes filename))
-		(error nil))))
 	(kill-buffer (current-buffer)))
 (if (and byte-compile-generate-call-tree
 	       (or (eq t byte-compile-generate-call-tree)
 		   (y-or-n-p (format "Report call tree for %s? " filename))))
 	  (save-excursion
 	(set-buffer byte-compile-inbuffer)
 	(goto-char 1)
 	;; Compile the forms from the input buffer.
 	(while (progn
-		 (while (progn (skip-chars-forward " \t\n\^l")
+		 (while (progn (skip-chars-forward " \t\n\^L")
 			       (looking-at ";"))
 		   (forward-line 1))
 		 (not (eobp)))
 	  (byte-compile-file-form (read byte-compile-inbuffer)))
 ;; file if under Mule.  If there are any extended characters in the
 ;; input file, use `escape-quoted' to make sure that both binary and
 ;; extended characters are output properly and distinguished properly.
 ;; Otherwise, use `no-conversion' for maximum portability with non-Mule
 ;; Emacsen.
-(if (featurep 'mule)
+(when (featurep 'mule)
-(if (save-excursion
+(defvar buffer-file-coding-system)
-	    (set-buffer byte-compile-inbuffer)
+(if (save-excursion
-	    (goto-char (point-min))
-	    ;; mrb- There must be a better way than skip-chars-forward
-	    (skip-chars-forward (concat (char-to-string 0) "-"
-					(char-to-string 255)))
-	    (eq (point) (point-max)))
-	  (setq buffer-file-coding-system 'no-conversion)
-	(insert "(require 'mule)\n;;;###coding system: escape-quoted\n")
-	(setq buffer-file-coding-system 'escape-quoted)
-	;; Lazy loading not yet implemented for MULE files
-	;; mrb - Fix this someday.
-	(save-excursion
 	  (set-buffer byte-compile-inbuffer)
-	  (setq byte-compile-dynamic nil
+	  (goto-char (point-min))
-		byte-compile-dynamic-docstrings nil))
+	  ;; mrb- There must be a better way than skip-chars-forward
-	;;(external-debugging-output (prin1-to-string (buffer-local-variables))))
+	  (skip-chars-forward (concat (char-to-string 0) "-"
-	))
+				      (char-to-string 255)))
+	  (eq (point) (point-max)))
+	(setq buffer-file-coding-system 'no-conversion)
+(insert "(require 'mule)\n;;;###coding system: escape-quoted\n")
+(setq buffer-file-coding-system 'escape-quoted)
+;; #### Lazy loading not yet implemented for MULE files
+;; mrb - Fix this someday.
+(save-excursion
+	(set-buffer byte-compile-inbuffer)
+	(setq byte-compile-dynamic nil
+	      byte-compile-dynamic-docstrings nil))
+;;(external-debugging-output (prin1-to-string (buffer-local-variables))))
+))
 )
 (defun byte-compile-output-file-form (form)
 ;; writes the given form to the output buffer, being careful of docstrings
 	;; the output regularly.
 	(and (memq (car-safe form) '(fset defalias define-function))
 	     (nthcdr 300 byte-compile-output)
 	     (byte-compile-flush-pending))
 	(funcall handler form)
-	(if for-effect
+	(when for-effect
-	    (byte-compile-discard)))
+	  (byte-compile-discard)))
 (byte-compile-form form t))
 nil)
 (defun byte-compile-flush-pending ()
 (if byte-compile-output
 (byte-compile-keep-pending form))
 (t
 (byte-compile-file-form form)))))
 ;; Functions and variables with doc strings must be output separately,
-;; so make-docfile can recognise them.  Most other things can be output
+;; so make-docfile can recognize them.  Most other things can be output
 ;; as byte-code.
 (put 'defsubst 'byte-hunk-handler 'byte-compile-file-form-defsubst)
 (defun byte-compile-file-form-defsubst (form)
 (cond ((assq (nth 1 form) byte-compile-unresolved-functions)
 	(or (assq name byte-compile-call-tree)
 	    (setq byte-compile-call-tree
 		  (cons (list name nil nil) byte-compile-call-tree))))
 (setq byte-compile-current-form name) ; for warnings
-(if (memq 'redefine byte-compile-warnings)
+(when (memq 'redefine byte-compile-warnings)
-	(byte-compile-arglist-warn form macrop))
+(byte-compile-arglist-warn form macrop))
-(if byte-compile-verbose
+(defvar filename) ; #### filename used free
-	(message "Compiling %s... (%s)"
+(when byte-compile-verbose
-		 ;; #### filename used free
+(message "Compiling %s... (%s)"
-		 (if filename (file-name-nondirectory filename) "")
+	       (if filename (file-name-nondirectory filename) "")
-		 (nth 1 form)))
+	       (nth 1 form)))
 (cond (that-one
-	   (if (and (memq 'redefine byte-compile-warnings)
+	   (when (and (memq 'redefine byte-compile-warnings)
-		    ;; hack hack: don't warn when compiling the stubs in
+		      ;; hack hack: don't warn when compiling the stubs in
-		    ;; bytecomp-runtime...
+		      ;; bytecomp-runtime...
-		    (not (assq (nth 1 form)
+		      (not (assq (nth 1 form)
-			       byte-compile-initial-macro-environment)))
+				 byte-compile-initial-macro-environment)))
-	       (byte-compile-warn
+	     (byte-compile-warn
-		 "%s defined multiple times, as both function and macro"
+	      "%s defined multiple times, as both function and macro"
-		 (nth 1 form)))
+	      (nth 1 form)))
 	   (setcdr that-one nil))
 	  (this-one
-	   (if (and (memq 'redefine byte-compile-warnings)
+	   (when (and (memq 'redefine byte-compile-warnings)
-		    ;; hack: don't warn when compiling the magic internal
+		      ;; hack: don't warn when compiling the magic internal
-		    ;; byte-compiler macros in bytecomp-runtime.el...
+		      ;; byte-compiler macros in bytecomp-runtime.el...
-		    (not (assq (nth 1 form)
+		      (not (assq (nth 1 form)
-			       byte-compile-initial-macro-environment)))
+				 byte-compile-initial-macro-environment)))
-	       (byte-compile-warn "%s %s defined multiple times in this file"
+	     (byte-compile-warn "%s %s defined multiple times in this file"
-				  (if macrop "macro" "function")
+				(if macrop "macro" "function")
-				  (nth 1 form))))
+				(nth 1 form))))
 	  ((and (fboundp name)
 		(or (subrp (symbol-function name))
 		    (eq (car-safe (symbol-function name))
 		        (if macrop 'lambda 'macro))))
 	   (if (memq 'redefine byte-compile-warnings)
 				    (if macrop "function" "macro"))
 				  (nth 1 form)
 				  (if macrop "macro" "function")))
 	   ;; shadow existing definition
 	   (set this-kind
-		(cons (cons name nil) (symbol-value this-kind))))
+		(cons (cons name nil) (symbol-value this-kind)))))
-	  )
 (let ((body (nthcdr 3 form)))
 (if (and (stringp (car body))
 	       (symbolp (car-safe (cdr-safe body)))
 	       (car-safe (cdr-safe body))
 	       (stringp (car-safe (cdr-safe (cdr-safe body)))))
 	       (null (cdr (memq tmp fun))))
 	  ;; Generate a make-byte-code call.
 	  (let* ((interactive (assq 'interactive (cdr (cdr fun)))))
 	    (nconc (list 'make-byte-code
 			 (list 'quote (nth 1 fun)) ;arglist
-			 (nth 1 tmp)	;bytes
+			 (nth 1 tmp)	;instructions
-			 (nth 2 tmp)	;consts
+			 (nth 2 tmp)	;constants
-			 (nth 3 tmp))	;depth
+			 (nth 3 tmp))	;stack-depth
 		   (cond ((stringp (nth 2 fun))
-			  (list (nth 2 fun))) ;doc
+			  (list (nth 2 fun))) ;docstring
 			 (interactive
 			  (list nil)))
 		   (cond (interactive
 			  (list (if (or (null (nth 1 interactive))
 					(stringp (nth 1 interactive)))
 (or (eq 'lambda (car-safe fun))
 (error "not a lambda -- %s" (prin1-to-string fun)))
 (let* ((arglist (nth 1 fun))
 	 (byte-compile-bound-variables
 	  (let ((new-bindings
-		 (mapcar (function (lambda (x)
+		 (mapcar #'(lambda (x) (cons x byte-compile-arglist-bit))
-				     (cons x byte-compile-arglist-bit)))
 			 (and (memq 'free-vars byte-compile-warnings)
 			      (delq '&rest (delq '&optional
 						 (copy-sequence arglist)))))))
 	    (nconc new-bindings
 		   (cons 'new-scope byte-compile-bound-variables))))
 	 (body (cdr (cdr fun)))
 	 (doc (if (stringp (car body))
 		  (prog1 (car body)
 		    (setq body (cdr body)))))
 	 (int (assq 'interactive body)))
-(let ((rest arglist))
+(dolist (arg arglist)
-(while rest
+(cond ((not (symbolp arg))
-	(cond ((not (symbolp (car rest)))
+	     (byte-compile-warn "non-symbol in arglist: %S" arg))
-	       (byte-compile-warn "non-symbol in arglist: %s"
+	    ((byte-compile-constant-symbol-p arg)
-				  (prin1-to-string (car rest))))
+	     (byte-compile-warn "constant symbol in arglist: %s" arg))
-	      ((memq (car rest) '(t nil))
+	    ((and (char= ?\& (aref (symbol-name arg) 0))
-	       (byte-compile-warn "constant in arglist: %s" (car rest)))
+		  (not (eq arg '&optional))
-	      ((and (char= ?\& (aref (symbol-name (car rest)) 0))
+		  (not (eq arg '&rest)))
-		    (not (memq (car rest) '(&optional &rest))))
+	     (byte-compile-warn "unrecognized `&' keyword in arglist: %s"
-	       (byte-compile-warn "unrecognised `&' keyword in arglist: %s"
+				arg))))
-				  (car rest))))
-	(setq rest (cdr rest))))
 (cond (int
 	   ;; Skip (interactive) if it is in front (the most usual location).
 	   (if (eq int (car body))
 	       (setq body (cdr body)))
 	   (cond ((consp (cdr int))
 		    ((memq (car (car rest)) '(byte-varref byte-constant))
 		     (setq tmp (car (cdr (car rest))))
 		     (if (if (eq (car (car rest)) 'byte-constant)
 			     (or (consp tmp)
 				 (and (symbolp tmp)
-				      (not (keywordp tmp))
+				      (not (byte-compile-constant-symbol-p tmp)))))
-				      (not (memq tmp '(nil t))))))
 			 (if maycall
 			     (setq body (cons (list 'quote tmp) body)))
 		       (setq body (cons tmp body))))
 		    ((and maycall
 			  ;; Allow a funcall if at most one atom follows it.
 	 (list body))))
 ;; This is the recursive entry point for compiling each subform of an
 ;; expression.
 ;; If for-effect is non-nil, byte-compile-form will output a byte-discard
-;; before terminating (ie no value will be left on the stack).
+;; before terminating (ie. no value will be left on the stack).
 ;; A byte-compile handler may, when for-effect is non-nil, choose output code
 ;; which does not leave a value on the stack, and then set for-effect to nil
 ;; (to prevent byte-compile-form from outputting the byte-discard).
 ;; If a handler wants to call another handler, it should do so via
 ;; byte-compile-form, or take extreme care to handle for-effect correctly.
 ;; (Use byte-compile-form-do-effect to reset the for-effect flag too.)
 ;;
 (defun byte-compile-form (form &optional for-effect)
 (setq form (macroexpand form byte-compile-macro-environment))
 (cond ((not (consp form))
-	 ;; XEmacs addition: keywordp
+	 (cond ((or (not (symbolp form))
-	 (cond ((or (not (symbolp form)) (keywordp form) (memq form '(nil t)))
+		    (byte-compile-constant-symbol-p form))
 		(byte-compile-constant form))
 	       ((and for-effect byte-compile-delete-errors)
 		(setq for-effect nil))
 	       (t (byte-compile-variable-ref 'byte-varref form))))
 	((symbolp (car form))
 	      ;; because it was malformed, and we couldn't unfold it.
 	      (not (eq form (setq form (byte-compile-unfold-lambda form)))))
 	 (byte-compile-form form for-effect)
 	 (setq for-effect nil))
 	((byte-compile-normal-call form)))
-(if for-effect
+(when for-effect
 (byte-compile-discard)))
 (defun byte-compile-normal-call (form)
 (if byte-compile-generate-call-tree
 (byte-compile-annotate-call-tree form))
 (byte-compile-push-constant (car form))
 ;; kludge added to XEmacs to work around the bogosities of a nonlexical lisp.
 (or (fboundp 'globally-boundp) (fset 'globally-boundp 'boundp))
 (defun byte-compile-variable-ref (base-op var &optional varbind-flags)
-(if (or (not (symbolp var)) (keywordp var) (memq var '(nil t)))
+(if (or (not (symbolp var)) (byte-compile-constant-symbol-p var))
-(byte-compile-warn (if (eq base-op 'byte-varbind)
+(byte-compile-warn
-			     "Attempt to let-bind %s %s"
+(case base-op
-			   "Variable reference to %s %s")
+	 (byte-varref "Variable reference to %s %s")
-			 (if (symbolp var) "constant" "nonvariable")
+	 (byte-varset "Attempt to set %s %s")
-			 (prin1-to-string var))
+	 (byte-varbind "Attempt to let-bind %s %s"))
+(if (symbolp var) "constant symbol" "non-symbol")
+var)
 (if (and (get var 'byte-obsolete-variable)
 	     (memq 'obsolete byte-compile-warnings))
 	(let ((ob (get var 'byte-obsolete-variable)))
 	  (byte-compile-warn "%s is an obsolete variable; %s" var
 			     (if (stringp ob)
 	(setq tmp (list var)
 	      byte-compile-variables (cons tmp byte-compile-variables)))
 (byte-compile-out base-op tmp)))
 (defmacro byte-compile-get-constant (const)
-(` (or (if (stringp (, const))
+`(or (if (stringp ,const)
-	     (assoc (, const) byte-compile-constants)
+	   (assoc ,const byte-compile-constants)
-	   (assq (, const) byte-compile-constants))
+	 (assq ,const byte-compile-constants))
-	 (car (setq byte-compile-constants
+(car (setq byte-compile-constants
-		    (cons (list (, const)) byte-compile-constants))))))
+		  (cons (list ,const) byte-compile-constants)))))
 ;; Use this when the value of a form is a constant.  This obeys for-effect.
 (defun byte-compile-constant (const)
 (if for-effect
 (setq for-effect nil)
 (byte-defop-compiler (eql byte-eq) 	2)
 (byte-defop-compiler20 old-eq 	 	2)
 (byte-defop-compiler20 old-memq		2)
 (byte-defop-compiler cons		2)
 (byte-defop-compiler aref		2)
-(byte-defop-compiler (= byte-eqlsign)	byte-compile-one-or-more-args)
-(byte-defop-compiler (< byte-lss)	byte-compile-one-or-more-args)
-(byte-defop-compiler (> byte-gtr)	byte-compile-one-or-more-args)
-(byte-defop-compiler (<= byte-leq)	byte-compile-one-or-more-args)
-(byte-defop-compiler (>= byte-geq)	byte-compile-one-or-more-args)
-(byte-defop-compiler /=			byte-compile-/=)
 (byte-defop-compiler get		2+1)
 (byte-defop-compiler nth		2)
 (byte-defop-compiler substring		2-3)
 (byte-defop-compiler (move-marker byte-set-marker) 2-3)
 (byte-defop-compiler set-marker		2-3)
 (byte-defop-compiler20 old-assq		2)
 (byte-defop-compiler (rplaca byte-setcar) 2)
 (byte-defop-compiler (rplacd byte-setcdr) 2)
 (byte-defop-compiler setcar		2)
 (byte-defop-compiler setcdr		2)
-;; buffer-substring now has its own function.  This used to be
-;; 2+1, but now all args are optional.
-(byte-defop-compiler buffer-substring)
 (byte-defop-compiler delete-region	2+1)
 (byte-defop-compiler narrow-to-region	2+1)
 (byte-defop-compiler (% byte-rem)	2)
 (byte-defop-compiler aset		3)
 ;; former is byte-coded and the latter is not.
 ;;(byte-defop-compiler (mod byte-rem) 2)
 (defun byte-compile-subr-wrong-args (form n)
-(byte-compile-warn "%s called with %d arg%s, but requires %s"
+(when (memq 'subr-callargs byte-compile-warnings)
-		     (car form) (length (cdr form))
+(byte-compile-warn "%s called with %d arg%s, but requires %s"
-		     (if (= 1 (length (cdr form))) "" "s") n)
+		       (car form) (length (cdr form))
+		       (if (= 1 (length (cdr form))) "" "s") n))
 ;; get run-time wrong-number-of-args error.
 (byte-compile-normal-call form))
 (defun byte-compile-no-args (form)
-(if (not (= (length form) 1))
+(case (length (cdr form))
-(byte-compile-subr-wrong-args form "none")
+(0 (byte-compile-out (get (car form) 'byte-opcode) 0))
-(byte-compile-out (get (car form) 'byte-opcode) 0)))
+(t (byte-compile-subr-wrong-args form "none"))))
 (defun byte-compile-one-arg (form)
-(if (not (= (length form) 2))
+(case (length (cdr form))
-(byte-compile-subr-wrong-args form 1)
+(1 (byte-compile-form (car (cdr form)))  ;; Push the argument
-(byte-compile-form (car (cdr form)))  ;; Push the argument
+(byte-compile-out (get (car form) 'byte-opcode) 0))
-(byte-compile-out (get (car form) 'byte-opcode) 0)))
+(t (byte-compile-subr-wrong-args form 1))))
 (defun byte-compile-two-args (form)
-(if (not (= (length form) 3))
+(case (length (cdr form))
-(byte-compile-subr-wrong-args form 2)
+(2 (byte-compile-form (nth 1 form))  ;; Push the arguments
-(byte-compile-form (car (cdr form)))  ;; Push the arguments
+(byte-compile-form (nth 2 form))
-(byte-compile-form (nth 2 form))
+(byte-compile-out (get (car form) 'byte-opcode) 0))
-(byte-compile-out (get (car form) 'byte-opcode) 0)))
+(t (byte-compile-subr-wrong-args form 2))))
 (defun byte-compile-three-args (form)
-(if (not (= (length form) 4))
+(case (length (cdr form))
-(byte-compile-subr-wrong-args form 3)
+(3 (byte-compile-form (nth 1 form))  ;; Push the arguments
-(byte-compile-form (car (cdr form)))  ;; Push the arguments
+(byte-compile-form (nth 2 form))
-(byte-compile-form (nth 2 form))
+(byte-compile-form (nth 3 form))
-(byte-compile-form (nth 3 form))
+(byte-compile-out (get (car form) 'byte-opcode) 0))
-(byte-compile-out (get (car form) 'byte-opcode) 0)))
+(t (byte-compile-subr-wrong-args form 3))))
 (defun byte-compile-zero-or-one-arg (form)
-(let ((len (length form)))
+(case (length (cdr form))
-(cond ((= len 1) (byte-compile-one-arg (append form '(nil))))
+(0 (byte-compile-one-arg (append form '(nil))))
-	  ((= len 2) (byte-compile-one-arg form))
+(1 (byte-compile-one-arg form))
-	  (t (byte-compile-subr-wrong-args form "0-1")))))
+(t (byte-compile-subr-wrong-args form "0-1"))))
 (defun byte-compile-one-or-two-args (form)
-(let ((len (length form)))
+(case (length (cdr form))
-(cond ((= len 2) (byte-compile-two-args (append form '(nil))))
+(1 (byte-compile-two-args (append form '(nil))))
-	  ((= len 3) (byte-compile-two-args form))
+(2 (byte-compile-two-args form))
-	  (t (byte-compile-subr-wrong-args form "1-2")))))
+(t (byte-compile-subr-wrong-args form "1-2"))))
 (defun byte-compile-two-or-three-args (form)
-(let ((len (length form)))
+(case (length (cdr form))
-(cond ((= len 3) (byte-compile-three-args (append form '(nil))))
+(2 (byte-compile-three-args (append form '(nil))))
-	  ((= len 4) (byte-compile-three-args form))
+(3 (byte-compile-three-args form))
-	  (t (byte-compile-subr-wrong-args form "2-3")))))
+(t (byte-compile-subr-wrong-args form "2-3"))))
 ;; from Ben Wing <ben@xemacs.org>: some inlined functions have extra
 ;; optional args added to them in XEmacs 19.12.  Changing the byte
 ;; interpreter to deal with these args would be wrong and cause
 ;; incompatibility, so we generate non-inlined calls for those cases.
 ;; Without the following functions, spurious warnings will be generated;
 ;; however, they would still compile correctly because
 ;; `byte-compile-subr-wrong-args' also converts the call to non-inlined.
 (defun byte-compile-no-args-with-one-extra (form)
-(let ((len (length form)))
+(case (length (cdr form))
-(cond ((= len 1) (byte-compile-no-args form))
+(0 (byte-compile-no-args form))
-	  ((= len 2) (byte-compile-normal-call form))
+(1 (byte-compile-normal-call form))
-	  (t (byte-compile-subr-wrong-args form "0-1")))))
+(t (byte-compile-subr-wrong-args form "0-1"))))
 (defun byte-compile-one-arg-with-one-extra (form)
-(let ((len (length form)))
+(case (length (cdr form))
-(cond ((= len 2) (byte-compile-one-arg form))
+(1 (byte-compile-one-arg form))
-	  ((= len 3) (byte-compile-normal-call form))
+(2 (byte-compile-normal-call form))
-	  (t (byte-compile-subr-wrong-args form "1-2")))))
+(t (byte-compile-subr-wrong-args form "1-2"))))
 (defun byte-compile-two-args-with-one-extra (form)
-(let ((len (length form)))
+(case (length (cdr form))
-(cond ((= len 3) (byte-compile-two-args form))
+(2 (byte-compile-two-args form))
-	  ((= len 4) (byte-compile-normal-call form))
+(3 (byte-compile-normal-call form))
-	  (t (byte-compile-subr-wrong-args form "2-3")))))
+(t (byte-compile-subr-wrong-args form "2-3"))))
 (defun byte-compile-zero-or-one-arg-with-one-extra (form)
-(let ((len (length form)))
+(case (length (cdr form))
-(cond ((= len 1) (byte-compile-one-arg (append form '(nil))))
+(0 (byte-compile-one-arg (append form '(nil))))
-	  ((= len 2) (byte-compile-one-arg form))
+(1 (byte-compile-one-arg form))
-	  ((= len 3) (byte-compile-normal-call form))
+(2 (byte-compile-normal-call form))
-	  (t (byte-compile-subr-wrong-args form "0-2")))))
+(t (byte-compile-subr-wrong-args form "0-2"))))
 (defun byte-compile-one-or-two-args-with-one-extra (form)
-(let ((len (length form)))
+(case (length (cdr form))
-(cond ((= len 2) (byte-compile-two-args (append form '(nil))))
+(1 (byte-compile-two-args (append form '(nil))))
-	  ((= len 3) (byte-compile-two-args form))
+(2 (byte-compile-two-args form))
-	  ((= len 4) (byte-compile-normal-call form))
+(3 (byte-compile-normal-call form))
-	  (t (byte-compile-subr-wrong-args form "1-3")))))
+(t (byte-compile-subr-wrong-args form "1-3"))))
 (defun byte-compile-two-or-three-args-with-one-extra (form)
-(let ((len (length form)))
+(case (length (cdr form))
-(cond ((= len 3) (byte-compile-three-args (append form '(nil))))
+(2 (byte-compile-three-args (append form '(nil))))
-	  ((= len 4) (byte-compile-three-args form))
+(3 (byte-compile-three-args form))
-	  ((= len 5) (byte-compile-normal-call form))
+(4 (byte-compile-normal-call form))
-	  (t (byte-compile-subr-wrong-args form "2-4")))))
+(t (byte-compile-subr-wrong-args form "2-4"))))
 (defun byte-compile-no-args-with-two-extra (form)
-(let ((len (length form)))
+(case (length (cdr form))
-(cond ((= len 1) (byte-compile-no-args form))
+(0     (byte-compile-no-args form))
-	  ((or (= len 2) (= len 3)) (byte-compile-normal-call form))
+((1 2) (byte-compile-normal-call form))
-	  (t (byte-compile-subr-wrong-args form "0-2")))))
+(t     (byte-compile-subr-wrong-args form "0-2"))))
 (defun byte-compile-one-arg-with-two-extra (form)
-(let ((len (length form)))
+(case (length (cdr form))
-(cond ((= len 2) (byte-compile-one-arg form))
+(1     (byte-compile-one-arg form))
-	  ((or (= len 3) (= len 4)) (byte-compile-normal-call form))
+((2 3) (byte-compile-normal-call form))
-	  (t (byte-compile-subr-wrong-args form "1-3")))))
+(t     (byte-compile-subr-wrong-args form "1-3"))))
 ;; XEmacs: used for functions that have a different opcode in v19 than v20.
 ;; this includes `eq', `equal', and other old-ified functions.
 (defun byte-compile-two-args-19->20 (form)
 (if (not (= (length form) 3))
 (byte-compile-constant nil))
 (defun byte-compile-discard ()
 (byte-compile-out 'byte-discard 0))
+;; Compile a function that accepts one or more args and is right-associative.
+;; We do it by left-associativity so that the operations
+;; are done in the same order as in interpreted code.
+;(defun byte-compile-associative (form)
+;  (if (cdr form)
+;      (let ((opcode (get (car form) 'byte-opcode))
+;	    (args (copy-sequence (cdr form))))
+;	(byte-compile-form (car args))
+;	(setq args (cdr args))
+;	(while args
+;	  (byte-compile-form (car args))
+;	  (byte-compile-out opcode 0)
+;	  (setq args (cdr args))))
+;    (byte-compile-constant (eval form))))
 ;; Compile a function that accepts one or more args and is right-associative.
 ;; We do it by left-associativity so that the operations
 ;; are done in the same order as in interpreted code.
 (defun byte-compile-associative (form)
-(if (cdr form)
+(let ((args (cdr form))
-(let ((opcode (get (car form) 'byte-opcode))
+	(opcode (get (car form) 'byte-opcode)))
-	    (args (copy-sequence (cdr form))))
+(case (length args)
-	(byte-compile-form (car args))
+(0 (byte-compile-constant (eval form)))
-	(setq args (cdr args))
+(t (byte-compile-form (car args))
-	(while args
+	 (dolist (arg (cdr args))
-	  (byte-compile-form (car args))
+	   (byte-compile-form arg)
-	  (byte-compile-out opcode 0)
+	   (byte-compile-out opcode 0))))))
-	  (setq args (cdr args))))
-(byte-compile-constant (eval form))))
 ;; more complicated compiler macros
 (byte-defop-compiler list)
 (byte-defop-compiler-1 - byte-compile-minus)
 (byte-defop-compiler (/ byte-quo) byte-compile-quo)
 (byte-defop-compiler nconc)
 (byte-defop-compiler-1 beginning-of-line)
-(defun byte-compile-one-or-more-args (form)
+(byte-defop-compiler (=  byte-eqlsign)	byte-compile-arithcompare)
-(let ((len (length form)))
+(byte-defop-compiler (<  byte-lss)	byte-compile-arithcompare)
-(cond ((= len 1) (byte-compile-subr-wrong-args form "1 or more"))
+(byte-defop-compiler (>  byte-gtr)	byte-compile-arithcompare)
-	  ((= len 2) (byte-compile-constant t))
+(byte-defop-compiler (<= byte-leq)	byte-compile-arithcompare)
-	  ((= len 3) (byte-compile-two-args form))
+(byte-defop-compiler (>= byte-geq)	byte-compile-arithcompare)
-	  (t (byte-compile-normal-call form)))))
+(defun byte-compile-arithcompare (form)
+(case (length (cdr form))
+(0 (byte-compile-subr-wrong-args form "1 or more"))
+(1 (byte-compile-constant t))
+(2 (byte-compile-two-args form))
+(t (byte-compile-normal-call form))))
+(byte-defop-compiler /= byte-compile-/=)
 (defun byte-compile-/= (form)
-(let ((len (length form)))
+(case (length (cdr form))
-(cond ((= len 1) (byte-compile-subr-wrong-args form "1 or more"))
+(0 (byte-compile-subr-wrong-args form "1 or more"))
-	  ((= len 2) (byte-compile-constant t))
+(1 (byte-compile-constant t))
-	  ;; optimize (/= X Y) to (not (= X Y))
+;; optimize (/= X Y) to (not (= X Y))
-	  ((= len 3) (byte-compile-form-do-effect `(not (= ,@(cdr form)))))
+(2 (byte-compile-form-do-effect `(not (= ,@(cdr form)))))
-	  (t (byte-compile-normal-call form)))))
+(t (byte-compile-normal-call form))))
+;; buffer-substring now has its own function.  This used to be
+;; 2+1, but now all args are optional.
+(byte-defop-compiler buffer-substring)
 (defun byte-compile-buffer-substring (form)
 ;; buffer-substring used to take exactly two args, but now takes 0-3.
 ;; convert 0-2 to two args and use special bytecode operand.
 ;; convert 3 args to a normal call.
 (2 (byte-compile-two-args form))
 (3 (byte-compile-normal-call form))
 (t (byte-compile-subr-wrong-args form "0-3"))))
 (defun byte-compile-list (form)
-(let ((count (length (cdr form))))
+(let* ((args (cdr form))
-(cond ((= count 0)
+	 (nargs (length args)))
-	   (byte-compile-constant nil))
+(cond
-	  ((< count 5)
+((= nargs 0)
-	   (mapcar 'byte-compile-form (cdr form))
+(byte-compile-constant nil))
-	   (byte-compile-out
+((< nargs 5)
-	    (aref [byte-list1 byte-list2 byte-list3 byte-list4] (1- count)) 0))
+(mapcar 'byte-compile-form args)
-	  ((< count 256)
+(byte-compile-out
-	   (mapcar 'byte-compile-form (cdr form))
+(aref [byte-list1 byte-list2 byte-list3 byte-list4] (1- nargs))
-	   (byte-compile-out 'byte-listN count))
+0))
-	  (t (byte-compile-normal-call form)))))
+((< nargs 256)
+(mapcar 'byte-compile-form args)
+(byte-compile-out 'byte-listN nargs))
+(t (byte-compile-normal-call form)))))
 (defun byte-compile-concat (form)
-(let ((count (length (cdr form))))
+(let* ((args (cdr form))
-(cond ((and (< 1 count) (< count 5))
+	 (nargs (length args)))
-	   (mapcar 'byte-compile-form (cdr form))
+;; Concat of one arg is not a no-op if arg is not a string.
-	   (byte-compile-out
+(cond
-	    (aref [byte-concat2 byte-concat3 byte-concat4] (- count 2))
+((memq nargs '(2 3 4))
-	    0))
+(mapcar 'byte-compile-form args)
-	  ;; Concat of one arg is not a no-op if arg is not a string.
+(byte-compile-out
-	  ((= count 0)
+(aref [byte-concat2 byte-concat3 byte-concat4] (- nargs 2))
-	   (byte-compile-form ""))
+0))
-	  ((< count 256)
+((eq nargs 0)
-	   (mapcar 'byte-compile-form (cdr form))
+(byte-compile-form ""))
-	   (byte-compile-out 'byte-concatN count))
+((< nargs 256)
-	  ((byte-compile-normal-call form)))))
+(mapcar 'byte-compile-form args)
+(byte-compile-out 'byte-concatN nargs))
+((byte-compile-normal-call form)))))
 (defun byte-compile-minus (form)
-(if (null (setq form (cdr form)))
+(let ((args (cdr form)))
-(byte-compile-constant 0)
+(case (length args)
-(byte-compile-form (car form))
+(0 (byte-compile-subr-wrong-args form "1 or more"))
-(if (cdr form)
+(1 (byte-compile-form (car args))
-	(while (setq form (cdr form))
+	 (byte-compile-out 'byte-negate 0))
-	  (byte-compile-form (car form))
+(t (byte-compile-form (car args))
-	  (byte-compile-out 'byte-diff 0))
+	 (dolist (elt (cdr args))
-(byte-compile-out 'byte-negate 0))))
+	   (byte-compile-form elt)
+	   (byte-compile-out 'byte-diff 0))))))
 (defun byte-compile-quo (form)
-(let ((len (length form)))
+(let ((args (cdr form)))
-(cond ((<= len 2)
+(case (length args)
-	   (byte-compile-subr-wrong-args form "2 or more"))
+(0 (byte-compile-subr-wrong-args form "1 or more"))
-	  (t
+(1 (byte-compile-constant 1)
-	   (byte-compile-form (car (setq form (cdr form))))
+	 (byte-compile-form (car args))
-	   (while (setq form (cdr form))
+	 (byte-compile-out 'byte-quo 0))
-	     (byte-compile-form (car form))
+(t (byte-compile-form (car args))
-	     (byte-compile-out 'byte-quo 0))))))
+	 (dolist (elt (cdr args))
+	   (byte-compile-form elt)
+	   (byte-compile-out 'byte-quo 0))))))
 (defun byte-compile-nconc (form)
-(let ((len (length form)))
+(let ((args (cdr form)))
-(cond ((= len 1)
+(case (length args)
-	   (byte-compile-constant nil))
+(0 (byte-compile-constant nil))
-	  ((= len 2)
+;; nconc of one arg is a noop, even if that arg isn't a list.
-	   ;; nconc of one arg is a noop, even if that arg isn't a list.
+(1 (byte-compile-form (car args)))
-	   (byte-compile-form (nth 1 form)))
+(t (byte-compile-form (car args))
-	  (t
+	 (dolist (elt (cdr args))
-	   (byte-compile-form (car (setq form (cdr form))))
+	   (byte-compile-form elt)
-	   (while (setq form (cdr form))
+	   (byte-compile-out 'byte-nconc 0))))))
-	     (byte-compile-form (car form))
-	     (byte-compile-out 'byte-nconc 0))))))
 (defun byte-compile-fset (form)
 ;; warn about forms like (fset 'foo '(lambda () ...))
 ;; (where the lambda expression is non-trivial...)
 ;; Except don't warn if the first argument is 'make-byte-code, because
 ;; I'm sick of getting mail asking me whether that warning is a problem.
 (let ((fn (nth 2 form))
 	body)
-(if (and (eq (car-safe fn) 'quote)
+(when (and (eq (car-safe fn) 'quote)
-	     (eq (car-safe (setq fn (nth 1 fn))) 'lambda)
+	       (eq (car-safe (setq fn (nth 1 fn))) 'lambda)
-	     (not (eq (car-safe (cdr-safe (nth 1 form))) 'make-byte-code)))
+	       (not (eq (car-safe (cdr-safe (nth 1 form))) 'make-byte-code)))
-	(progn
+(setq body (cdr (cdr fn)))
-	  (setq body (cdr (cdr fn)))
+(if (stringp (car body)) (setq body (cdr body)))
-	  (if (stringp (car body)) (setq body (cdr body)))
+(if (eq 'interactive (car-safe (car body))) (setq body (cdr body)))
-	  (if (eq 'interactive (car-safe (car body))) (setq body (cdr body)))
+(if (and (consp (car body))
-	  (if (and (consp (car body))
+	       (not (eq 'byte-code (car (car body)))))
-		   (not (eq 'byte-code (car (car body)))))
+	  (byte-compile-warn
-	      (byte-compile-warn
+"A quoted lambda form is the second argument of fset.  This is probably
-"A quoted lambda form is the second argument of fset.  This is probably
 not what you want, as that lambda cannot be compiled.  Consider using
-the syntax (function (lambda (...) ...)) instead.")))))
+the syntax (function (lambda (...) ...)) instead."))))
 (byte-compile-two-args form))
 (defun byte-compile-funarg (form)
 ;; (mapcar '(lambda (x) ..) ..) ==> (mapcar (function (lambda (x) ..)) ..)
 ;; for cases where it's guaranteed that first arg will be used as a lambda.
 	;; We can split it; there is no function call after inserting 1st arg.
 	(t
 	 (while (setq form (cdr form))
 	   (byte-compile-form (car form))
 	   (byte-compile-out 'byte-insert 0)
-	   (if (cdr form)
+	   (when (cdr form)
-	       (byte-compile-discard))))))
+	     (byte-compile-discard))))))
 ;; alas, the old (pre-19.12, and all existing versions of FSFmacs 19)
 ;; byte compiler will generate incorrect code for
 ;; (beginning-of-line nil buffer) because it buggily doesn't
 ;; check the number of arguments passed to beginning-of-line.
 (byte-defop-compiler-1 quote)
 (byte-defop-compiler-1 quote-form)
 (defun byte-compile-setq (form)
-(let ((args (cdr form)))
+(let ((args (cdr form)) var val)
-(if args
+(if (null args)
-	(while args
+	;; (setq), with no arguments.
-	  (byte-compile-form (car (cdr args)))
+	(byte-compile-form nil for-effect)
-	  (or for-effect (cdr (cdr args))
+(while args
+	(setq var (pop args))
+	(if (null args)
+	    ;; Odd number of args?  Let `set' get the error.
+	    (byte-compile-form `(set ',var) for-effect)
+	  (setq val (pop args))
+	  (if (keywordp var)
+	      ;; (setq :foo ':foo) compatibility kludge
+	      (byte-compile-form `(set ',var ,val) (if args t for-effect))
+	    (byte-compile-form val)
+	    (unless (or args for-effect)
 	      (byte-compile-out 'byte-dup 0))
-	  (byte-compile-variable-ref 'byte-varset (car args))
+	    (byte-compile-variable-ref 'byte-varset var))))))
-	  (setq args (cdr (cdr args))))
+(setq for-effect nil))
-;; (setq), with no arguments.
-(byte-compile-form nil for-effect))
-(setq for-effect nil)))
 (defun byte-compile-set (form)
 ;; Compile (set 'foo x) as (setq foo x) for trivially better code and so
 ;; that we get applicable warnings.  Compile everything else (including
 ;; malformed calls) like a normal 2-arg byte-coded function.
-(if (or (not (eq (car-safe (nth 1 form)) 'quote))
+(let ((symform (nth 1 form))
-	  (not (= (length form) 3))
+	(valform (nth 2 form))
-	  (not (= (length (nth 1 form)) 2)))
+	sym)
-(byte-compile-two-args form)
+(if (and (= (length form) 3)
-(byte-compile-setq (list 'setq (nth 1 (nth 1 form)) (nth 2 form)))))
+	     (= (safe-length symform) 2)
+	     (eq (car symform) 'quote)
+	     (symbolp (setq sym (car (cdr symform))))
+	     (not (byte-compile-constant-symbol-p sym)))
+	(byte-compile-setq `(setq ,sym ,valform))
+(byte-compile-two-args form))))
 (defun byte-compile-setq-default (form)
-(let ((rest (cdr form)))
+(let ((args (cdr form)))
-;; emit multiple calls to set-default if necessary
+(if (null args)
-(while rest
+	;; (setq-default), with no arguments.
-(byte-compile-form
+	(byte-compile-form nil for-effect)
-(list 'set-default (list 'quote (car rest)) (car (cdr rest)))
+;; emit multiple calls to `set-default' if necessary
-(not (null (cdr (cdr rest)))))
+(while args
-(setq rest (cdr (cdr rest))))))
+	(byte-compile-form
+	 ;; Odd number of args?  Let `set-default' get the error.
+	 `(set-default ',(pop args) ,@(if args (list (pop args)) nil))
+	 (if args t for-effect)))))
+(setq for-effect nil))
 (defun byte-compile-set-default (form)
-(let ((rest (cdr form)))
+(let* ((args (cdr form))
-(if (cdr (cdr (cdr form)))
+	 (nargs (length args))
-	;; emit multiple calls to set-default if necessary; all but last
+	 (var (car args)))
-	;; for-effect (this recurses.)
+(when (and (= (safe-length var) 2)
-	(while rest
+	       (eq (car var) 'quote))
-	  (byte-compile-form
+(let ((sym (nth 1 var)))
-	   (list 'set-default (car rest) (car (cdr rest)))
+	(cond
-	   (not (null (cdr rest))))
+	 ((not (symbolp sym))
-	  (setq rest (cdr (cdr rest))))
+	  (byte-compile-warn "Attempt to set-globally non-symbol %s" sym))
-;; else, this is the one-armed version
+	 ((byte-compile-constant-symbol-p sym)
-(let ((var (nth 1 form))
+	  (byte-compile-warn "Attempt to set-globally constant symbol %s" sym))
-	    ;;(val (nth 2 form))
+	 ((let ((cell (assq sym byte-compile-bound-variables)))
-	    )
+	    (and cell
-	;; notice calls to set-default/setq-default for variables which
+		 (setcdr cell (logior (cdr cell) byte-compile-assigned-bit))
-	;; have not been declared with defvar/defconst.
+		 t)))
-	(if (and (memq 'free-vars byte-compile-warnings)
+	 ;; notice calls to set-default/setq-default for variables which
-		 (or (null var)
+	 ;; have not been declared with defvar/defconst.
-		     (and (eq (car-safe var) 'quote)
+	 ((globally-boundp sym))	; OK
-			  (= 2 (length var)))))
+	 ((not (memq 'free-vars byte-compile-warnings))) ; warnings suppressed?
-	    (let ((sym (nth 1 var))
+	 ((memq sym byte-compile-free-assignments)) ; already warned about sym
-		  cell)
+	 (t
-	      (or (and sym (symbolp sym) (globally-boundp sym))
+	  (byte-compile-warn "assignment to free variable %s" sym)
-		  (and (setq cell (assq sym byte-compile-bound-variables))
+	  (push sym byte-compile-free-assignments)))))
-		       (setcdr cell (logior (cdr cell)
+(if (= nargs 2)
-					    byte-compile-assigned-bit)))
+	;; now emit a normal call to set-default
-		  (memq sym byte-compile-free-assignments)
+	(byte-compile-normal-call form)
-		  (if (or (not (symbolp sym)) (memq sym '(t nil)))
+(byte-compile-subr-wrong-args form 2))))
-		      (progn
-			(byte-compile-warn
-			 "Attempt to set-globally %s %s"
-			 (if (symbolp sym) "constant" "nonvariable")
-			 (prin1-to-string sym)))
-		    (progn
-		      (byte-compile-warn "assignment to free variable %s" sym)
-		      (setq byte-compile-free-assignments
-			    (cons sym byte-compile-free-assignments)))))))
-	;; now emit a normal call to set-default (or possibly multiple calls)
-	(byte-compile-normal-call form)))))
 (defun byte-compile-quote (form)
 (byte-compile-constant (car (cdr form))))
 (defun byte-compile-progn (form)
 (byte-compile-body-do-effect (cdr form)))
 (defun byte-compile-prog1 (form)
-(byte-compile-form-do-effect (car (cdr form)))
+(setq form (cdr form))
-(byte-compile-body (cdr (cdr form)) t))
+(byte-compile-form-do-effect (pop form))
+(byte-compile-body form t))
 (defun byte-compile-prog2 (form)
-(byte-compile-form (nth 1 form) t)
+(setq form (cdr form))
-(byte-compile-form-do-effect (nth 2 form))
+(byte-compile-form (pop form) t)
-(byte-compile-body (cdr (cdr (cdr form))) t))
+(byte-compile-form-do-effect (pop form))
+(byte-compile-body form t))
 (defmacro byte-compile-goto-if (cond discard tag)
-(` (byte-compile-goto
+`(byte-compile-goto
-(if (, cond)
+(if ,cond
-	  (if (, discard) 'byte-goto-if-not-nil 'byte-goto-if-not-nil-else-pop)
+	(if ,discard 'byte-goto-if-not-nil 'byte-goto-if-not-nil-else-pop)
-	(if (, discard) 'byte-goto-if-nil 'byte-goto-if-nil-else-pop))
+(if ,discard 'byte-goto-if-nil 'byte-goto-if-nil-else-pop))
-(, tag))))
+,tag))
 (defun byte-compile-if (form)
 (byte-compile-form (car (cdr form)))
 (if (null (nthcdr 3 form))
 ;; No else-forms
 (defun byte-compile-make-tag ()
 (list 'TAG (setq byte-compile-tag-number (1+ byte-compile-tag-number))))
 (defun byte-compile-out-tag (tag)
-(setq byte-compile-output (cons tag byte-compile-output))
+(push tag byte-compile-output)
 (if (cdr (cdr tag))
 (progn
 	;; ## remove this someday
 	(and byte-compile-depth
 	  (not (= (cdr (cdr tag)) byte-compile-depth))
 	  (error "Compiler bug: depth conflict at tag %d" (car (cdr tag))))
 	(setq byte-compile-depth (cdr (cdr tag))))
 (setcdr (cdr tag) byte-compile-depth)))
 (defun byte-compile-goto (opcode tag)
-(setq byte-compile-output (cons (cons opcode tag) byte-compile-output))
+(push (cons opcode tag) byte-compile-output)
 (setcdr (cdr tag) (if (memq opcode byte-goto-always-pop-ops)
 			(1- byte-compile-depth)
 		      byte-compile-depth))
 (setq byte-compile-depth (and (not (eq opcode 'byte-goto))
 				(1- byte-compile-depth))))
 (defun byte-compile-out (opcode offset)
-(setq byte-compile-output (cons (cons opcode offset) byte-compile-output))
+(push (cons opcode offset) byte-compile-output)
-(cond ((eq opcode 'byte-call)
+(case opcode
-	 (setq byte-compile-depth (- byte-compile-depth offset)))
+(byte-call
-	((eq opcode 'byte-return)
+(setq byte-compile-depth (- byte-compile-depth offset)))
-	 ;; This is actually an unnecessary case, because there should be
+(byte-return
-	 ;; no more opcodes behind byte-return.
+;; This is actually an unnecessary case, because there should be
-	 (setq byte-compile-depth nil))
+;; no more opcodes behind byte-return.
-	(t
+(setq byte-compile-depth nil))
-	 (setq byte-compile-depth (+ byte-compile-depth
+(t
-				     (or (aref byte-stack+-info
+(setq byte-compile-depth (+ byte-compile-depth
-					       (symbol-value opcode))
+				 (or (aref byte-stack+-info
-					 (- (1- offset))))
+					   (symbol-value opcode))
-	       byte-compile-maxdepth (max byte-compile-depth
+				     (- (1- offset))))
-					  byte-compile-maxdepth))))
+	   byte-compile-maxdepth (max byte-compile-depth
+				      byte-compile-maxdepth))))
 ;;(if (< byte-compile-depth 0) (error "Compiler error: stack underflow"))
 )
 ;;; call tree stuff
 ;; annotate the current call
 (if (setq entry (assq (car form) byte-compile-call-tree))
 	(or (memq byte-compile-current-form (nth 1 entry)) ;callers
 	    (setcar (cdr entry)
 		    (cons byte-compile-current-form (nth 1 entry))))
-(setq byte-compile-call-tree
+(push (list (car form) (list byte-compile-current-form) nil)
-	    (cons (list (car form) (list byte-compile-current-form) nil)
+	    byte-compile-call-tree))
-		  byte-compile-call-tree)))
 ;; annotate the current function
 (if (setq entry (assq byte-compile-current-form byte-compile-call-tree))
 	(or (memq (car form) (nth 2 entry)) ;called
 	    (setcar (cdr (cdr entry))
 		    (cons (car form) (nth 2 entry))))
-(setq byte-compile-call-tree
+(push (list byte-compile-current-form nil (list (car form)))
-	    (cons (list byte-compile-current-form nil (list (car form)))
+	    byte-compile-call-tree))))
-		  byte-compile-call-tree)))
-))
 ;; Renamed from byte-compile-report-call-tree
 ;; to avoid interfering with completion of byte-compile-file.
 ;;;###autoload
 (defun display-call-tree (&optional filename)
 (if byte-compile-call-tree-sort
 	(setq byte-compile-call-tree
 	      (sort byte-compile-call-tree
 		    (cond
 		     ((eq byte-compile-call-tree-sort 'callers)
-		      (function (lambda (x y) (< (length (nth 1 x))
+		      #'(lambda (x y) (< (length (nth 1 x))
-						 (length (nth 1 y))))))
+					 (length (nth 1 y)))))
 		     ((eq byte-compile-call-tree-sort 'calls)
-		      (function (lambda (x y) (< (length (nth 2 x))
+		      #'(lambda (x y) (< (length (nth 2 x))
-						 (length (nth 2 y))))))
+					 (length (nth 2 y)))))
 		     ((eq byte-compile-call-tree-sort 'calls+callers)
-		      (function (lambda (x y) (< (+ (length (nth 1 x))
+		      #'(lambda (x y) (< (+ (length (nth 1 x))
-						    (length (nth 2 x)))
+					    (length (nth 2 x)))
-						 (+ (length (nth 1 y))
+					 (+ (length (nth 1 y))
-						    (length (nth 2 y)))))))
+					    (length (nth 2 y))))))
 		     ((eq byte-compile-call-tree-sort 'name)
-		      (function (lambda (x y) (string< (car x)
+		      #'(lambda (x y) (string< (car x)
-						       (car y)))))
+					       (car y))))
 		     (t (error
 		      "`byte-compile-call-tree-sort': `%s' - unknown sort mode"
 			       byte-compile-call-tree-sort))))))
 (message "Generating call tree...")
 (let ((rest byte-compile-call-tree)
 ;; command-line-args-left is what is left of the command line (from
 ;; startup.el)
 (defvar command-line-args-left)	;Avoid 'free variable' warning
 (if (not noninteractive)
 (error "`batch-byte-compile' is to be used only with -batch"))
-(let ((error nil)
+(let ((error nil))
-	(debug-issue-ebola-notices 0)) ; Hack -slb
 (while command-line-args-left
 (if (file-directory-p (expand-file-name (car command-line-args-left)))
 	  (let ((files (directory-files (car command-line-args-left)))
 		source dest)
 	    (while files
 (princ file)
 (princ ": ")
 (if (fboundp 'display-error) ; XEmacs 19.8+
 	 (display-error err nil)
 (princ (or (get (car err) 'error-message) (car err)))
-(mapcar '(lambda (x) (princ " ") (prin1 x)) (cdr err)))
+(mapcar #'(lambda (x) (princ " ") (prin1 x)) (cdr err)))
 (princ "\n")
 nil)))
 ;;;###autoload
 (defun batch-byte-recompile-directory-norecurse ()
 (defvar command-line-args-left)	;Avoid 'free variable' warning
 (if (not noninteractive)
 (error "batch-byte-recompile-directory is to be used only with -batch"))
 (or command-line-args-left
 (setq command-line-args-left '(".")))
-(let ((byte-recompile-directory-ignore-errors-p t)
+(let ((byte-recompile-directory-ignore-errors-p t))
-	(debug-issue-ebola-notices 0))
 (while command-line-args-left
 (byte-recompile-directory (car command-line-args-left))
 (setq command-line-args-left (cdr command-line-args-left))))
 (kill-emacs 0))
 (eval-when-compile
 (or (compiled-function-p (symbol-function 'byte-compile-form))
 (assq 'byte-code (symbol-function 'byte-compile-form))
 (let ((byte-optimize nil) ; do it fast
 	   (byte-compile-warnings nil))
-(mapcar '(lambda (x)
+(mapcar #'(lambda (x)
-		  (or noninteractive (message "compiling %s..." x))
+		   (or noninteractive (message "compiling %s..." x))
-		  (byte-compile x)
+		   (byte-compile x)
-		  (or noninteractive (message "compiling %s...done" x)))
+		   (or noninteractive (message "compiling %s...done" x)))
 	       '(byte-compile-normal-call
 		 byte-compile-form
 		 byte-compile-body
 		 ;; Inserted some more than necessary, to speed it up.
 		 byte-compile-top-level

Mercurial > hg > xemacs-beta

comparison lisp/bytecomp.el @ 380:8626e4521993 r21-2-5