This commit was generated by cvs2svn to compensate for changes in r50, which

[chise/xemacs-chise.git.1] / lisp / bytecomp.el

diff --git a/lisp/bytecomp.el b/lisp/bytecomp.el
index 4e0bd04..95bce46 100644 (file)
--- a/lisp/bytecomp.el
+++ b/lisp/bytecomp.el
@@ -3125,15 +3125,15 @@ If FORM is a lambda or a macro, byte-compile it as a function."
          (t (byte-compile-normal-call form)))))
 
 (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.
-  (case (length (cdr form))
-    (0 (byte-compile-two-args (append form '(nil nil))))
-    (1 (byte-compile-two-args (append form '(nil))))
-    (2 (byte-compile-two-args form))
-    (3 (byte-compile-normal-call form))
-    (t (byte-compile-subr-wrong-args form "0-3"))))
+  (let ((len (length 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.
+    (cond ((= len 1) (setq form (append form '(nil nil)))
+          (= len 2) (setq form (append form '(nil)))))
+    (cond ((= len 3) (byte-compile-two-args form))
+         ((= len 4) (byte-compile-normal-call form))
+         (t (byte-compile-subr-wrong-args form "0-3")))))
 
 (defun byte-compile-list (form)
   (let ((count (length (cdr form))))