XEmacs 21.2.41 "Polyhymnia".

[chise/xemacs-chise.git-] / lisp / byte-optimize.el

diff --git a/lisp/byte-optimize.el b/lisp/byte-optimize.el
index ff6edde..f591e82 100644 (file)
--- a/lisp/byte-optimize.el
+++ b/lisp/byte-optimize.el
@@ -473,12 +473,12 @@
                 (if (and (cdr form) (null backwards))
                     (byte-compile-log
                      "  all subforms of %s called for effect; deleted" form))
-                (and backwards
-                      ;; Now optimize the rest of the forms. We need the return
-                      ;; values. We already did the car.
-                      (setcdr backwards
-                              (mapcar 'byte-optimize-form (cdr backwards)))
-                     (cons fn (nreverse backwards))))
+                (when backwards
+                  ;; Now optimize the rest of the forms. We need the return
+                  ;; values. We already did the car.
+                  (setcdr backwards
+                          (mapcar 'byte-optimize-form (cdr backwards))))
+                (cons fn (nreverse backwards)))
             (cons fn (mapcar 'byte-optimize-form (cdr form)))))
 
          ((eq fn 'interactive)