From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 12 Apr 2004 03:11:10 +0000 (+0000)
Subject: (byte-compile-cond): Fix last change.
X-Git-Tag: ttn-vms-21-2-B4~6905
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d0e09557ffdbad584b3783db4fba99a5b6444ac;p=emacs.git

(byte-compile-cond): Fix last change.
---

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 220a7d8d92d..32d6694b060 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -3377,12 +3377,13 @@ being undefined will be suppressed."
 		 (byte-compile-goto 'byte-goto donetag)
 		 (byte-compile-out-tag nexttag)))))
     ;; Last clause
-    (and (cdr clause) (not (eq (car clause) t))
-	 (progn (byte-compile-maybe-guarded (car clause)
-					    (byte-compile-form (car clause)))
-		(byte-compile-goto-if nil for-effect donetag)
-		(setq clause (cdr clause))))
-    (byte-compile-body-do-effect clause)
+    (let ((guard (car clause)))
+      (and (cdr clause) (not (eq guard t))
+	   (progn (byte-compile-form guard)
+		  (byte-compile-goto-if nil for-effect donetag)
+		  (setq clause (cdr clause))))
+      (byte-compile-maybe-guarded guard
+	(byte-compile-body-do-effect clause)))
     (byte-compile-out-tag donetag)))
 
 (defun byte-compile-and (form)