# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1055781089 0
# Node ID a44b585395b5d0c312807d70f86773d8da29a72c
# Parent  7e55c8dd414bec0d7f0b89608e7516ade472d450
(cl-parse-loop-clause): Use map-keymap.
(defsubst*): Don't put a `cl-whole argument if it's not used.

diff -r 7e55c8dd414b -r a44b585395b5 lisp/emacs-lisp/cl-macs.el
--- a/lisp/emacs-lisp/cl-macs.el	Mon Jun 16 16:27:27 2003 +0000
+++ b/lisp/emacs-lisp/cl-macs.el	Mon Jun 16 16:31:29 2003 +0000
@@ -912,7 +912,7 @@
 		      (setq var (prog1 other (setq other var))))
 		  (setq loop-map-form
 			(list (if (memq word '(key-seq key-seqs))
-				  'cl-map-keymap-recursively 'cl-map-keymap)
+				  'cl-map-keymap-recursively 'map-keymap)
 			      (list 'function (list* 'lambda (list var other)
 						     '--cl-map)) map))))
 
@@ -2497,7 +2497,9 @@
     (list 'progn
 	  (if p nil   ; give up if defaults refer to earlier args
 	    (list 'define-compiler-macro name
-		  (list* '&whole 'cl-whole '&cl-quote args)
+		  (if (memq '&key args)
+		      (list* '&whole 'cl-whole '&cl-quote args)
+		    (cons '&cl-quote args))
 		  (list* 'cl-defsubst-expand (list 'quote argns)
 			 (list 'quote (list* 'block name body))
 			 (not (or unsafe (cl-expr-access-order pbody argns)))